[gimp] Fix the bulid after GtkNotebookPage got deprecated in gtk-2-22



commit 8b31211639d4507182270591d68436f30d3e6550
Author: Michael Natterer <mitch gimp org>
Date:   Fri Jul 16 15:24:25 2010 +0200

    Fix the bulid after GtkNotebookPage got deprecated in gtk-2-22
    
    In all GtkNotebook::switch_page() callbacks, simply replace
    GtkNotebookPage* by gpointer.

 app/dialogs/preferences-dialog.c        |    4 ++--
 app/display/gimpimagewindow.c           |    4 ++--
 app/widgets/gimpdeviceeditor.c          |    4 ++--
 libgimpwidgets/gimpcolornotebook.c      |    4 ++--
 libgimpwidgets/gimpcolorselection.c     |    4 ++--
 plug-ins/imagemap/imap_edit_area_info.c |    2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index 39feb42..4e20716 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -90,7 +90,7 @@ static void        prefs_message                  (GtkMessageType  type,
                                                    const gchar    *message);
 
 static void   prefs_notebook_page_callback        (GtkNotebook      *notebook,
-                                                   GtkNotebookPage  *page,
+                                                   gpointer          page,
                                                    guint             page_num,
                                                    GtkTreeSelection *sel);
 static void   prefs_resolution_source_callback    (GtkWidget  *widget,
@@ -801,7 +801,7 @@ prefs_tree_select_callback (GtkTreeSelection *sel,
 
 static void
 prefs_notebook_page_callback (GtkNotebook      *notebook,
-                              GtkNotebookPage  *page,
+                              gpointer          page,
                               guint             page_num,
                               GtkTreeSelection *sel)
 {
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index ff8dfc2..1282613 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -163,7 +163,7 @@ static gboolean  gimp_image_window_shell_events        (GtkWidget           *wid
                                                         GimpImageWindow     *window);
 
 static void      gimp_image_window_switch_page         (GtkNotebook         *notebook,
-                                                        GtkNotebookPage     *page,
+                                                        gpointer             page,
                                                         gint                 page_num,
                                                         GimpImageWindow     *window);
 static void      gimp_image_window_page_removed        (GtkNotebook         *notebook,
@@ -1236,7 +1236,7 @@ gimp_image_window_shell_events (GtkWidget       *widget,
 
 static void
 gimp_image_window_switch_page (GtkNotebook     *notebook,
-                               GtkNotebookPage *page,
+                               gpointer         page,
                                gint             page_num,
                                GimpImageWindow *window)
 {
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index 03d00b0..ad47544 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -98,7 +98,7 @@ static void      gimp_device_editor_select_device  (GimpContainerView     *view,
                                                     GimpDeviceEditor      *editor);
 
 static void      gimp_device_editor_switch_page    (GtkNotebook           *notebook,
-                                                    GtkNotebookPage       *page,
+                                                    gpointer               page,
                                                     guint                  page_num,
                                                     GimpDeviceEditor      *editor);
 static void      gimp_device_editor_delete_clicked (GtkWidget             *button,
@@ -398,7 +398,7 @@ gimp_device_editor_select_device (GimpContainerView *view,
 
 static void
 gimp_device_editor_switch_page (GtkNotebook      *notebook,
-                                GtkNotebookPage  *page,
+                                gpointer          page,
                                 guint             page_num,
                                 GimpDeviceEditor *editor)
 {
diff --git a/libgimpwidgets/gimpcolornotebook.c b/libgimpwidgets/gimpcolornotebook.c
index 55b2d3d..620fc80 100644
--- a/libgimpwidgets/gimpcolornotebook.c
+++ b/libgimpwidgets/gimpcolornotebook.c
@@ -72,7 +72,7 @@ static void   gimp_color_notebook_set_config      (GimpColorSelector *selector,
 
 
 static void   gimp_color_notebook_switch_page     (GtkNotebook       *gtk_notebook,
-                                                   GtkNotebookPage   *page,
+                                                   gpointer           page,
                                                    guint              page_num,
                                                    GimpColorNotebook *notebook);
 
@@ -319,7 +319,7 @@ gimp_color_notebook_set_config (GimpColorSelector *selector,
 
 static void
 gimp_color_notebook_switch_page (GtkNotebook       *gtk_notebook,
-                                 GtkNotebookPage   *page,
+                                 gpointer           page,
                                  guint              page_num,
                                  GimpColorNotebook *notebook)
 {
diff --git a/libgimpwidgets/gimpcolorselection.c b/libgimpwidgets/gimpcolorselection.c
index f4d94b8..4f50853 100644
--- a/libgimpwidgets/gimpcolorselection.c
+++ b/libgimpwidgets/gimpcolorselection.c
@@ -87,7 +87,7 @@ static void   gimp_color_selection_set_property      (GObject            *object
                                                       GParamSpec         *pspec);
 
 static void   gimp_color_selection_switch_page       (GtkWidget          *widget,
-                                                      GtkNotebookPage    *page,
+                                                      gpointer            page,
                                                       guint               page_num,
                                                       GimpColorSelection *selection);
 static void   gimp_color_selection_notebook_changed  (GimpColorSelector  *selector,
@@ -539,7 +539,7 @@ gimp_color_selection_set_config (GimpColorSelection *selection,
 
 static void
 gimp_color_selection_switch_page (GtkWidget          *widget,
-                                  GtkNotebookPage    *page,
+                                  gpointer            page,
                                   guint               page_num,
                                   GimpColorSelection *selection)
 {
diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c
index 7b4e8a6..2c360ab 100644
--- a/plug-ins/imagemap/imap_edit_area_info.c
+++ b/plug-ins/imagemap/imap_edit_area_info.c
@@ -433,7 +433,7 @@ edit_area_cancel_cb(gpointer data)
 }
 
 static void
-switch_page(GtkWidget *widget, GtkNotebookPage *page, gint page_num,
+switch_page(GtkWidget *widget, gpointer page, gint page_num,
 	    gpointer data)
 {
    AreaInfoDialog_t *param = (AreaInfoDialog_t*) data;



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]