routing native events first to the wx class and only if skipped call native handler

[wxWidgets.git] / include / wx / motif / private.h

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 3301bbfc3999aafea46c5b432c7c35f92074cbc6..89b3e70e2e48136e103d862e95e93dcc49767540 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -13,7 +13,8 @@
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"
 #define _WX_PRIVATE_H_
 
 #include "wx/defs.h"

-#include "X11/Xlib.h"
+#include <X11/Xlib.h>
+#include <Xm/Xm.h>

 #include "wx/evtloop.h"
 
 class WXDLLIMPEXP_FWD_CORE wxFont;
 #include "wx/evtloop.h"
 
 class WXDLLIMPEXP_FWD_CORE wxFont;


@@ -43,7 +44,7 @@ class WXDLLIMPEXP_FWD_CORE wxColour;
 // (non const) "char *" but many Motif functions take "char *" parameters which
 // are really "const char *" so use this macro to suppress the warnings when we
 // know it's ok
 // (non const) "char *" but many Motif functions take "char *" parameters which
 // are really "const char *" so use this macro to suppress the warnings when we
 // know it's ok

-#define wxMOTIF_STR(x) wx_const_cast(char *, x)
+#define wxMOTIF_STR(x) const_cast<char *>(x)

 
 // ----------------------------------------------------------------------------
 // Miscellaneous functions
 
 // ----------------------------------------------------------------------------
 // Miscellaneous functions