Don't try to typedef off_t twice (eVC++)

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

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 8f2f8eb8ad6e7ca90015f6d422c6e3222c1c23c2..9df6307cc3fc530faf9d7b559f28dcc8a594cf59 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -762,12 +762,14 @@ KeySym wxCharCodeWXToX(int id)
 
 #include <wx/app.h>
 
-bool wxGetKeyState(wxKeyCode key)
+bool wxGetKeyState(const wxKeyCode& key)
 {
 #if defined(__WXX11__)
-    Display *pDisplay = wxApp::GetDisplay();
+    Display *pDisplay = (Display*) wxApp::GetDisplay();
 #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