Fix deprecated Gtkmm symbols in preferences widget

(bzr r12178)

1 files changed, 29 insertions, 3 deletions

diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h
index 646a8b2fa..e3968045d 100644
--- a/src/ui/widget/preferences-widget.h
+++ b/src/ui/widget/preferences-widget.h
@@ -25,14 +25,26 @@
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/drawingarea.h>
-#include <gtkmm/scale.h>
+
+#if WITH_GTKMM_3_0
+#include <gtkmm/grid.h>
+#else
 #include <gtkmm/table.h>
+#endif
 
 #include "ui/widget/color-picker.h"
 #include "ui/widget/unit-menu.h"
 #include "ui/widget/spinbutton.h"
 #include "ui/widget/scalar-unit.h"
 
+namespace Gtk {
+#if WITH_GTKMM_3_0
+class Scale;
+#else
+class HScale;
+#endif
+}
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
@@ -137,7 +149,11 @@ private:
 
     Inkscape::UI::Widget::SpinButton _sb;
     UnitMenu        _unit;
-    Gtk::HScale     _slider;
+#if WITH_GTKMM_3_0
+    Gtk::Scale*      _slider;
+#else
+    Gtk::HScale*     _slider;
+#endif
     ZoomCorrRuler   _ruler;
     bool freeze; // used to block recursive updates of slider and spinbutton
 };
@@ -155,7 +171,13 @@ private:
 
     Glib::ustring _prefs_path;
     Inkscape::UI::Widget::SpinButton _sb;
-    Gtk::HScale     _slider;
+
+#if WITH_GTKMM_3_0
+    Gtk::Scale*     _slider;
+#else
+    Gtk::HScale*    _slider;
+#endif
+
     bool freeze; // used to block recursive updates of slider and spinbutton
 };
 
@@ -251,7 +273,11 @@ protected:
     void on_changed();
 };
 
+#if WITH_GTKMM_3_0
+class DialogPage : public Gtk::Grid
+#else
 class DialogPage : public Gtk::Table
+#endif
 {
 public:
     DialogPage();