diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2011-06-27 23:15:56 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@gmail.com> | 2011-06-27 23:15:56 +0000 |
| commit | c7ab8e7579d5eaa7fd1e46992a9a975ac2e84ba7 (patch) | |
| tree | 13c6567535dfc7b06e1c635c87387c2291ea75b1 /src/libgdl | |
| parent | Gtk cleanup: gtk_signal_connect_while_alive (diff) | |
| download | inkscape-c7ab8e7579d5eaa7fd1e46992a9a975ac2e84ba7.tar.gz inkscape-c7ab8e7579d5eaa7fd1e46992a9a975ac2e84ba7.zip | |
Rm a few instances of deprecated GtkNotebookPage. gtkmm-2.4 still uses it
(bzr r10350.1.10)
Diffstat (limited to 'src/libgdl')
| -rw-r--r-- | src/libgdl/gdl-dock-notebook.c | 6 | ||||
| -rw-r--r-- | src/libgdl/gdl-switcher.c | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/libgdl/gdl-dock-notebook.c b/src/libgdl/gdl-dock-notebook.c index 6fb931ac7..79bebd1f2 100644 --- a/src/libgdl/gdl-dock-notebook.c +++ b/src/libgdl/gdl-dock-notebook.c @@ -60,7 +60,7 @@ static void gdl_dock_notebook_dock (GdlDockObject *object, GValue *other_data); static void gdl_dock_notebook_switch_page_cb (GtkNotebook *nb, - GtkNotebookPage *page, + GtkWidget *page, gint page_num, gpointer data); @@ -261,7 +261,7 @@ gdl_dock_notebook_destroy (GtkObject *object) static void gdl_dock_notebook_switch_page_cb (GtkNotebook *nb, - GtkNotebookPage *page, + GtkWidget *page, gint page_num, gpointer data) { @@ -281,7 +281,7 @@ gdl_dock_notebook_switch_page_cb (GtkNotebook *nb, /* activate new label */ tablabel = gtk_notebook_get_tab_label ( - nb, gtk_notebook_get_nth_page (nb, page_num)); + nb, page); if (tablabel && GDL_IS_DOCK_TABLABEL (tablabel)) gdl_dock_tablabel_activate (GDL_DOCK_TABLABEL (tablabel)); diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c index 65e8b98fe..779895056 100644 --- a/src/libgdl/gdl-switcher.c +++ b/src/libgdl/gdl-switcher.c @@ -615,15 +615,12 @@ gdl_switcher_notify_cb (GObject *g_object, GParamSpec *pspec, } static void -gdl_switcher_switch_page_cb (GtkNotebook *nb, GtkNotebookPage *page, +gdl_switcher_switch_page_cb (GtkNotebook *nb, GtkWidget *page_widget, gint page_num, GdlSwitcher *switcher) { - GtkWidget *page_widget; - GtkWidget *tablabel; gint switcher_id; /* Change switcher button */ - page_widget = gtk_notebook_get_nth_page (nb, page_num); switcher_id = gdl_switcher_get_page_id (page_widget); gdl_switcher_select_button (GDL_SWITCHER (switcher), switcher_id); } |