File 0003-Don-t-use-frame-extents-when-not-using-X11... of Package wxWidgets-3_0

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Don-t-use-frame-extents-when-not-using-X11-in-wxGTK.patch of Package wxWidgets-3_0 (Revision 8e3c94323e7512d36fd94df5c17df647)

Currently displaying revision 8e3c94323e7512d36fd94df5c17df647 , Show latest

From 015206314b707e6dc1737f116fe951be967d3d3f Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 19 Nov 2014 13:29:18 +0000
Subject: [PATCH 3/5] Don't use frame extents when not using X11 in wxGTK.

See #16688.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@78159 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/gtk/toplevel.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index 386b739..511324a 100644
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -452,8 +452,12 @@ gtk_frame_window_state_callback( GtkWidget* WXUNUSED(widget),
 bool wxGetFrameExtents(GdkWindow* window, int* left, int* right, int* top, int* bottom)
 {
 #ifdef GDK_WINDOWING_X11
-    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     GdkDisplay* display = gdk_window_get_display(window);
+
+    if (!GDK_IS_X11_DISPLAY(display))
+        return false;
+
+    static GdkAtom property = gdk_atom_intern("_NET_FRAME_EXTENTS", false);
     Atom xproperty = gdk_x11_atom_to_xatom_for_display(display, property);
     Atom type;
     int format;
-- 
2.7.0

Places

File 0003-Don-t-use-frame-extents-when-not-using-X11-in-wxGTK.patch of Package wxWidgets-3_0 (Revision 8e3c94323e7512d36fd94df5c17df647)

Places