Change GtkNotebookPage in switch-page into GtkWidget

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index bb4650ec9fcfcc78636a0c71878ab6bf3171d37b..05f26062602c6face465f8c66cb6bf48c52c6e91 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -398,7 +398,7 @@ static void gtk_notebook_calc_tabs           (GtkNotebook      *notebook,
 
 /*** GtkNotebook Page Switch Methods ***/
 static void gtk_notebook_real_switch_page    (GtkNotebook      *notebook,
-                                             GtkNotebookPage  *child,
+                                             GtkWidget        *child,
                                              guint             page_num);
 
 /*** GtkNotebook Page Switch Functions ***/
@@ -810,7 +810,7 @@ gtk_notebook_class_init (GtkNotebookClass *class)
                  NULL, NULL,
                  _gtk_marshal_VOID__POINTER_UINT,
                  G_TYPE_NONE, 2,
-                 G_TYPE_POINTER,
+                 GTK_TYPE_WIDGET,
                  G_TYPE_UINT);
   notebook_signals[FOCUS_TAB] = 
     g_signal_new (I_("focus-tab"),
@@ -6019,7 +6019,7 @@ gtk_notebook_update_tab_states (GtkNotebook *notebook)
  */
 static void
 gtk_notebook_real_switch_page (GtkNotebook     *notebook,
-                              GtkNotebookPage* child,
+                              GtkWidget*       child,
                               guint            page_num)
 {
   GList *list = gtk_notebook_find_child (notebook, GTK_WIDGET (child), NULL);

diff --git a/gtk/gtknotebook.h b/gtk/gtknotebook.h
index 0f8dec401d488c5c6034c58e4e1c596fc2ba9ab9..0c55223935d93d7556e260fa15834e19a325eb7b 100644 (file)
--- a/gtk/gtknotebook.h
+++ b/gtk/gtknotebook.h
@@ -103,11 +103,7 @@ struct _GtkNotebookClass
   GtkContainerClass parent_class;
 
   void (* switch_page)       (GtkNotebook     *notebook,
-#if !defined (GTK_DISABLE_DEPRECATED) || defined (GTK_COMPILATION)
-                              GtkNotebookPage *page,
-#else
-                              gpointer         page,
-#endif
+                              GtkWidget       *page,
                              guint            page_num);
 
   /* Action signals for keybindings */