fixed crash in wxKill() introduced by 1.116 patch (ironically named "proper

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

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index fec01d61631fb5bb5c7bcdbcb941803559e1417f..8d400126c660603c0a30818813df572f6cd44387 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -6,7 +6,7 @@
 // Created:     25.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team
 // Created:     25.03.02
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWidgets team

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__)
 /////////////////////////////////////////////////////////////////////////////
 
 #if defined(__WXX11__) || defined(__WXGTK__) || defined(__WXMOTIF__)


@@ -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


@@ -765,9 +765,11 @@ KeySym wxCharCodeWXToX(int id)
 bool wxGetKeyState(wxKeyCode key)
 {
 #if defined(__WXX11__)
 bool wxGetKeyState(wxKeyCode key)
 {
 #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