From 6655c15632371f272d9d1536ef0e5558e1437c27 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Tue, 25 May 2004 10:20:51 +0000 Subject: [PATCH] Fixes for wxMotif git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27426 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/motif/utils.cpp | 4 ++++ src/unix/utilsx11.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/motif/utils.cpp b/src/motif/utils.cpp index 6fd4988224..f6b0179f11 100644 --- 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 8f2f8eb8ad..1f62bea9e9 100644 --- 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 -- 2.45.2