[pan] remove #define GtkNotebookPage void



commit af7eaaf72765c01808d5a3ba4a1a607170712985
Author: Dominique Dumont <dod debian org>
Date:   Sun Jun 19 15:20:34 2022 +0200

    remove #define GtkNotebookPage void
    
    port to Gtk3

 pan/gui/gtk-compat.h | 6 ------
 pan/gui/gui.cc       | 2 +-
 pan/gui/gui.h        | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/pan/gui/gtk-compat.h b/pan/gui/gtk-compat.h
index dc93e93..3d2a50d 100644
--- a/pan/gui/gtk-compat.h
+++ b/pan/gui/gtk-compat.h
@@ -79,12 +79,6 @@ static inline GdkWindow * gdk_window_get_device_position (GdkWindow *window,
 #endif
   }
 
-#if defined(GTK_DISABLE_DEPRECATED) || GTK_CHECK_VERSION(3,0,0)
-#if GTK_CHECK_VERSION(2,22,0)
-#define GtkNotebookPage void
-#endif
-#endif
-
 #if !GTK_CHECK_VERSION(3, 0, 0)
   #include <gdk/gdkkeysyms.h>
 #endif
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 55110ad..c5f337f 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -1752,7 +1752,7 @@ namespace
 }
 
 void
-GUI :: notebook_page_switched_cb (GtkNotebook *, GtkNotebookPage *, gint page_num, gpointer user_data)
+GUI :: notebook_page_switched_cb (GtkNotebook *, void *, gint page_num, gpointer user_data)
 {
   GUI * gui = static_cast<GUI*>(user_data);
   GtkWidget * w;
diff --git a/pan/gui/gui.h b/pan/gui/gui.h
index e4a7aec..2c0717f 100644
--- a/pan/gui/gui.h
+++ b/pan/gui/gui.h
@@ -290,7 +290,7 @@ namespace pan
 
       void score_add (int);
 
-      static void notebook_page_switched_cb (GtkNotebook*, GtkNotebookPage*, gint, gpointer);
+      static void notebook_page_switched_cb (GtkNotebook*, void *, gint, gpointer);
 
       static void root_realized_cb (GtkWidget*, gpointer self_gpointer);
 


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