diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-22 22:27:35 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2012-05-22 22:27:35 +0000 |
| commit | 2c9a5721cf6dd4f10ebfb2a06eb7663c4fc120d9 (patch) | |
| tree | 1f47f1368dc01404db69f443e76fe847700e3047 /src | |
| parent | Dutch translation update (diff) | |
| download | inkscape-2c9a5721cf6dd4f10ebfb2a06eb7663c4fc120d9.tar.gz inkscape-2c9a5721cf6dd4f10ebfb2a06eb7663c4fc120d9.zip | |
Drop deprecated GtkNotebookPage usage
(bzr r11401)
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/param/notebook.cpp | 11 | ||||
| -rw-r--r-- | src/ui/dialog/transformation.cpp | 7 | ||||
| -rw-r--r-- | src/ui/dialog/transformation.h | 8 |
3 files changed, 20 insertions, 6 deletions
diff --git a/src/extension/param/notebook.cpp b/src/extension/param/notebook.cpp index ee7f15004..b4d4cbd16 100644 --- a/src/extension/param/notebook.cpp +++ b/src/extension/param/notebook.cpp @@ -352,7 +352,11 @@ public: // hook function this->signal_switch_page().connect(sigc::mem_fun(this, &ParamNotebookWdg::changed_page)); }; +#if WITH_GTKMM_3_0 + void changed_page(Gtk::Widget *page, guint pagenum); +#else void changed_page(GtkNotebookPage *page, guint pagenum); +#endif bool activated; }; @@ -363,8 +367,11 @@ public: * is actually visible. This to exclude 'fake' changes when the * notebookpages are added or removed. */ -void ParamNotebookWdg::changed_page(GtkNotebookPage */*page*/, - guint pagenum) +#if WITH_GTKMM_3_0 +void ParamNotebookWdg::changed_page(Gtk::Widget * /*page*/, guint pagenum) +#else +void ParamNotebookWdg::changed_page(GtkNotebookPage * /*page*/, guint pagenum) +#endif { if (get_visible()) { _pref->set((int)pagenum, _doc, _node); diff --git a/src/ui/dialog/transformation.cpp b/src/ui/dialog/transformation.cpp index 1951dc92a..cae2ec131 100644 --- a/src/ui/dialog/transformation.cpp +++ b/src/ui/dialog/transformation.cpp @@ -431,8 +431,11 @@ void Transformation::updateSelection(PageType page, Inkscape::Selection *selecti selection && !selection->isEmpty()); } -void Transformation::onSwitchPage(GtkNotebookPage */*page*/, - guint pagenum) +#if WITH_GTKMM_3_0 +void Transformation::onSwitchPage(Gtk::Widget * /*page*/, guint pagenum) +#else +void Transformation::onSwitchPage(GtkNotebookPage * /*page*/, guint pagenum) +#endif { updateSelection((PageType)pagenum, sp_desktop_selection(getDesktop())); } diff --git a/src/ui/dialog/transformation.h b/src/ui/dialog/transformation.h index 901a807a5..5df9fd57e 100644 --- a/src/ui/dialog/transformation.h +++ b/src/ui/dialog/transformation.h @@ -167,8 +167,12 @@ protected: virtual void _apply(); void presentPage(PageType page); - void onSwitchPage(GtkNotebookPage *page, - guint pagenum); + +#if WITH_GTKMM_3_0 + void onSwitchPage(Gtk::Widget *page, guint pagenum); +#else + void onSwitchPage(GtkNotebookPage *page, guint pagenum); +#endif /** * Callbacks for when a user changes values on the panels |
