wxKeysym problem for wxMOTIF fixed

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

diff --git a/include/wx/unix/utilsx11.h b/include/wx/unix/utilsx11.h
index 11bb7b7b9e0440c7ce6271f75215d055e6763990..cf6e1dddd1b8c0749f1f9428796c9b9974c01280 100644 (file)
--- a/include/wx/unix/utilsx11.h
+++ b/include/wx/unix/utilsx11.h
@@ -26,8 +26,8 @@
 #if defined(__WXGTK__)
 typedef void WXDisplay;
 typedef void* WXWindow;
 #if defined(__WXGTK__)
 typedef void WXDisplay;
 typedef void* WXWindow;

-typedef unsigned long WXKeySym;

 #endif
 #endif

+typedef unsigned long WXKeySym;

 
 int wxCharCodeXToWX(WXKeySym keySym);
 WXKeySym wxCharCodeWXToX(int id);
 
 int wxCharCodeXToWX(WXKeySym keySym);
 WXKeySym wxCharCodeWXToX(int id);

diff --git a/src/motif/window.cpp b/src/motif/window.cpp
index aca5e608d3587ba30cd5da1fa3e8225e7d7843c3..c539b36fbad41db7aef9b7b0ef1d8c0cf642d793 100644 (file)
--- a/src/motif/window.cpp
+++ b/src/motif/window.cpp
@@ -35,6 +35,7 @@
     #include "wx/layout.h"
     #include "wx/menuitem.h"
     #include "wx/module.h"
     #include "wx/layout.h"
     #include "wx/menuitem.h"
     #include "wx/module.h"

+    #include "wx/unix/utilsx11.h"

 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"