From: Christian Dywan <christian@twotoasts.de>
Date: Tue, 13 Jul 2010 15:05:22 +0000 (+0200)
Subject: Change GtkNotebookPage in switch-page into GtkWidget
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=828f5cbe2e04b60ec013df6fc33f7a5b537e6efd;p=~andy%2Fgtk

Change GtkNotebookPage in switch-page into GtkWidget
---

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index bb4650ec9..05f260626 100644
--- 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 0f8dec401..0c5522393 100644
--- 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 */