diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-10-08 14:43:03 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-09 00:46:09 +0200 |
| commit | b9a2a0141f4c8f0608f905a733621ebb436958e4 (patch) | |
| tree | ffcc761faa50eb4aa4ecd03d8c5e9b238c8a77f4 /src/widgets/styles | |
| parent | 8f9346dd663d65f5030d4fb590564a8661a634d8 (diff) | |
QGtkStyle: cleanup unused gdk_drawable_get_depth() (not avail in GTK3)
Change-Id: Ifc04c768dcadc48d459eeb8dd95325823cc44dcd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qgtkstyle_p.cpp | 5 | ||||
| -rw-r--r-- | src/widgets/styles/qgtkstyle_p.h | 2 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/styles/qgtkstyle_p.cpp b/src/widgets/styles/qgtkstyle_p.cpp index 2d890c58ec..a8358259d2 100644 --- a/src/widgets/styles/qgtkstyle_p.cpp +++ b/src/widgets/styles/qgtkstyle_p.cpp @@ -92,7 +92,6 @@ QT_BEGIN_NAMESPACE -static bool displayDepth = -1; Q_GLOBAL_STATIC(QGtkStyleUpdateScheduler, styleScheduler) Ptr_gtk_container_forall QGtkStylePrivate::gtk_container_forall = 0; @@ -204,7 +203,6 @@ Ptr_gdk_pixbuf_get_from_drawable QGtkStylePrivate::gdk_pixbuf_get_from_drawable Ptr_gdk_draw_rectangle QGtkStylePrivate::gdk_draw_rectangle = 0; Ptr_gdk_pixbuf_unref QGtkStylePrivate::gdk_pixbuf_unref = 0; Ptr_gdk_drawable_unref QGtkStylePrivate::gdk_drawable_unref = 0; -Ptr_gdk_drawable_get_depth QGtkStylePrivate::gdk_drawable_get_depth = 0; Ptr_gdk_color_free QGtkStylePrivate::gdk_color_free = 0; Ptr_gdk_x11_window_set_user_time QGtkStylePrivate::gdk_x11_window_set_user_time = 0; Ptr_gdk_x11_drawable_get_xid QGtkStylePrivate::gdk_x11_drawable_get_xid = 0; @@ -357,7 +355,6 @@ void QGtkStylePrivate::resolveGtk() const gdk_draw_rectangle = (Ptr_gdk_draw_rectangle)libgtk.resolve("gdk_draw_rectangle"); gdk_pixbuf_unref = (Ptr_gdk_pixbuf_unref)libgtk.resolve("gdk_pixbuf_unref"); gdk_drawable_unref = (Ptr_gdk_drawable_unref)libgtk.resolve("gdk_drawable_unref"); - gdk_drawable_get_depth = (Ptr_gdk_drawable_get_depth)libgtk.resolve("gdk_drawable_get_depth"); gdk_color_free = (Ptr_gdk_color_free)libgtk.resolve("gdk_color_free"); gdk_x11_window_set_user_time = (Ptr_gdk_x11_window_set_user_time)libgtk.resolve("gdk_x11_window_set_user_time"); gdk_x11_drawable_get_xid = (Ptr_gdk_x11_drawable_get_xid)libgtk.resolve("gdk_x11_drawable_get_xid"); @@ -536,8 +533,6 @@ void QGtkStylePrivate::initGtkWidgets() const // make a window GtkWidget* gtkWindow = QGtkStylePrivate::gtk_window_new(GTK_WINDOW_POPUP); QGtkStylePrivate::gtk_widget_realize(gtkWindow); - if (displayDepth == -1) - displayDepth = QGtkStylePrivate::gdk_drawable_get_depth(gtkWindow->window); QHashableLatin1Literal widgetPath = QHashableLatin1Literal::fromData(strdup("GtkWindow")); removeWidgetFromMap(widgetPath); gtkWidgetMap()->insert(widgetPath, gtkWindow); diff --git a/src/widgets/styles/qgtkstyle_p.h b/src/widgets/styles/qgtkstyle_p.h index d12824d5b5..a9f7ccfd0d 100644 --- a/src/widgets/styles/qgtkstyle_p.h +++ b/src/widgets/styles/qgtkstyle_p.h @@ -254,7 +254,6 @@ typedef void (*Ptr_gdk_draw_rectangle) (GdkDrawable *drawable, GdkGC *gc, gboolean filled, gint x, gint y, gint width, gint height); typedef void (*Ptr_gdk_pixbuf_unref)(GdkPixbuf *); typedef void (*Ptr_gdk_drawable_unref)(GdkDrawable *); -typedef gint (*Ptr_gdk_drawable_get_depth)(GdkDrawable *); typedef void (*Ptr_gdk_x11_window_set_user_time) (GdkWindow *window, guint32); typedef XID (*Ptr_gdk_x11_drawable_get_xid) (GdkDrawable *); typedef Display* (*Ptr_gdk_x11_drawable_get_xdisplay) ( GdkDrawable *); @@ -469,7 +468,6 @@ public: static Ptr_gdk_draw_rectangle gdk_draw_rectangle; static Ptr_gdk_pixbuf_unref gdk_pixbuf_unref; static Ptr_gdk_drawable_unref gdk_drawable_unref; - static Ptr_gdk_drawable_get_depth gdk_drawable_get_depth; static Ptr_gdk_color_free gdk_color_free; static Ptr_gdk_x11_window_set_user_time gdk_x11_window_set_user_time; static Ptr_gdk_x11_drawable_get_xid gdk_x11_drawable_get_xid; |