Fixes for wxMotif

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp
index 6fd4988224e566181363b60bed78761557ab9184..f6b0179f115000803174b219c32a02796304a07c 100644 (file)
--- a/src/motif/utils.cpp
+++ b/src/motif/utils.cpp
@@ -634,6 +634,9 @@ wxWindow* wxFindWindowAtPoint(const wxPoint& pt)
     return wxGenericFindWindowAtPoint(pt);
 }
 
+// Now in utilsx11.cpp
+#if 0
+
 // ----------------------------------------------------------------------------
 // keycode translations
 // ----------------------------------------------------------------------------
@@ -876,6 +879,7 @@ KeySym wxCharCodeWXToX(int id)
 
     return keySym;
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // Some colour manipulation routines

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 8f2f8eb8ad6e7ca90015f6d422c6e3222c1c23c2..1f62bea9e969a8c87675dce91cbc428029dd4aea 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -768,6 +768,8 @@ bool wxGetKeyState(wxKeyCode key)
     Display *pDisplay = 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