X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6991087b08355e652866e97d3a8211103864ed8f..cbeda384e51acb82e13994cb67ac1714669cae10:/include/wx/motif/private.h?ds=sidebyside

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 3301bbfc39..9895862d9d 100644
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -13,7 +13,8 @@
 #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;
@@ -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
-#define wxMOTIF_STR(x) wx_const_cast(char *, x)
+#define wxMOTIF_STR(x) const_cast<char *>(x)
 
 // ----------------------------------------------------------------------------
 // Miscellaneous functions
@@ -129,7 +130,7 @@ extern XColor itemColors[5] ;
 
 wxString wxXmStringToString( const XmString& xmString );
 XmString wxStringToXmString( const char* string );
-inline XmString wxStringToXmString( const wxCharBuffer& string )
+inline XmString wxStringToXmString( const wxScopedCharBuffer& string )
     { return wxStringToXmString(string.data()); }
 inline XmString wxStringToXmString( const wxString& string )
     { return wxStringToXmString((const char*)string.mb_str()); }