From b73465550b9f15a27e30e924d316501344c8ed86 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 6 Nov 2012 14:04:21 +0100 Subject: [PATCH] QGtkStyle: GTK3 compatible type checking - GtkType -> GType - GTK_CHECK_TYPE -> G_TYPE_CHECK_INSTANCE_TYPE Both are deprecated aliases in GTK2 and do not exist in GTK3. Change-Id: If2dc4ba09451cabb6730f8b23e15db7554a9f829 Reviewed-by: J-P Nurmi Reviewed-by: Jens Bache-Wiig --- src/widgets/styles/qgtkstyle_p.cpp | 2 +- src/widgets/styles/qgtkstyle_p.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/widgets/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp index be0dbdb..93c1bef 100644 --- a/src/widgets/styles/qgtkstyle_p.cpp +++ b/src/widgets/styles/qgtkstyle_p.cpp @@ -829,7 +829,7 @@ void QGtkStylePrivate::addAllSubWidgets(GtkWidget *widget, gpointer v) { Q_UNUSED(v); addWidgetToMap(widget); - if (GTK_CHECK_TYPE ((widget), gtk_container_get_type())) + if (G_TYPE_CHECK_INSTANCE_TYPE ((widget), gtk_container_get_type())) gtk_container_forall((GtkContainer*)widget, addAllSubWidgets, NULL); } diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h index 6283ff4..762d779 100644 --- a/src/widgets/styles/qgtkstyle_p.h +++ b/src/widgets/styles/qgtkstyle_p.h @@ -72,7 +72,7 @@ typedef unsigned long XID; #undef GTK_OBJECT_FLAGS #define GTK_OBJECT_FLAGS(obj)(((GtkObject*)(obj))->flags) -#define Q_GTK_IS_WIDGET(widget) widget && GTK_CHECK_TYPE ((widget), QGtkStylePrivate::gtk_widget_get_type()) +#define Q_GTK_IS_WIDGET(widget) widget && G_TYPE_CHECK_INSTANCE_TYPE ((widget), QGtkStylePrivate::gtk_widget_get_type()) #define QLS(x) QLatin1String(x) @@ -213,9 +213,9 @@ typedef void (*Ptr_gtk_widget_path) (GtkWidget *, guint *, gchar **, gchar**); typedef void (*Ptr_gtk_toolbar_insert) (GtkToolbar *toolbar, GtkToolItem *item, int pos); typedef void (*Ptr_gtk_menu_shell_append)(GtkMenuShell *, GtkWidget *); -typedef GtkType (*Ptr_gtk_container_get_type) (void); -typedef GtkType (*Ptr_gtk_window_get_type) (void); -typedef GtkType (*Ptr_gtk_widget_get_type) (void); +typedef GType (*Ptr_gtk_container_get_type) (void); +typedef GType (*Ptr_gtk_window_get_type) (void); +typedef GType (*Ptr_gtk_widget_get_type) (void); typedef GtkWidget* (*Ptr_gtk_widget_get_parent) (GtkWidget *); typedef gboolean (*Ptr_gtk_widget_is_toplevel) (GtkWidget *); typedef GtkWidget* (*Ptr_gtk_widget_get_toplevel) (GtkWidget *); -- 2.7.4