Don't always maximize top-level windows on Smartphone

[wxWidgets.git] / src / unix / utilsx11.cpp

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index a5e49b887093eef4336c616f5f056b23866f3f7b..ec9e3cb1f68a632917007f331e0b43f4d9c4b438 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -29,7 +29,7 @@
 #pragma message enable nosimpint
 #endif
 
 #pragma message enable nosimpint
 #endif
 

-#ifdef __WXGTK20__
+#ifdef __WXGTK__

 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #endif
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #endif


@@ -65,12 +65,15 @@ static bool IsMapped(Display *display, Window window)
 
 // Suspends X11 errors. Used when we expect errors but they are not fatal
 // for us.
 
 // Suspends X11 errors. Used when we expect errors but they are not fatal
 // for us.

+extern "C" {
+    static int wxX11ErrorsSuspender_handler(Display*, XErrorEvent*) { return 0; }
+}

 class wxX11ErrorsSuspender
 {
 public:
     wxX11ErrorsSuspender(Display *d) : m_display(d)
     {
 class wxX11ErrorsSuspender
 {
 public:
     wxX11ErrorsSuspender(Display *d) : m_display(d)
     {

-        m_old = XSetErrorHandler(handler);
+        m_old = XSetErrorHandler(wxX11ErrorsSuspender_handler);

     }
     ~wxX11ErrorsSuspender()
     {
     }
     ~wxX11ErrorsSuspender()
     {


@@ -81,7 +84,6 @@ public:
 private:
     Display *m_display;
     int (*m_old)(Display*, XErrorEvent *);
 private:
     Display *m_display;
     int (*m_old)(Display*, XErrorEvent *);

-    static int handler(Display *, XErrorEvent *) { return 0; }

 };
 
 
 };
 
 


@@ -764,10 +766,15 @@ KeySym wxCharCodeWXToX(int id)
 
 bool wxGetKeyState(wxKeyCode key)
 {
 
 bool wxGetKeyState(wxKeyCode key)
 {

+    wxASSERT_MSG(key != WXK_LBUTTON && key != WXK_RBUTTON && key !=
+        WXK_MBUTTON, wxT("can't use wxGetKeyState() for mouse buttons"));
+

 #if defined(__WXX11__)
 #if defined(__WXX11__)

-    Display *pDisplay = wxApp::GetDisplay();
+    Display *pDisplay = (Display*) wxApp::GetDisplay();

 #elif defined(__WXGTK__)
     Display *pDisplay = GDK_DISPLAY();
 #elif defined(__WXGTK__)
     Display *pDisplay = GDK_DISPLAY();

+#elif defined(__WXMOTIF__)
+    Display *pDisplay = (Display*) (wxTheApp ? wxTheApp->GetInitialDisplay() : NULL);

 #else
 #error  Add code to get the DISPLAY for this platform
 #endif
 #else
 #error  Add code to get the DISPLAY for this platform
 #endif