X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b46b1d59d6f69ad80dcf5955375578a6504d100a..302acc453d3fd2b80cfff4af2b8a49a39aaef677:/include/wx/motif/private.h

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 09f072e520..871497df94 100644
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -13,14 +13,15 @@
 #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 WXDLLEXPORT wxFont;
-class WXDLLEXPORT wxWindow;
-class WXDLLEXPORT wxSize;
-class WXDLLEXPORT wxBitmap;
-class WXDLLEXPORT wxColour;
+class WXDLLIMPEXP_FWD_CORE wxFont;
+class WXDLLIMPEXP_FWD_CORE wxWindow;
+class WXDLLIMPEXP_FWD_CORE wxSize;
+class WXDLLIMPEXP_FWD_CORE wxBitmap;
+class WXDLLIMPEXP_FWD_CORE wxColour;
 
 #include "wx/x11/privx.h"
 
@@ -128,8 +129,11 @@ extern XColor itemColors[5] ;
 // ----------------------------------------------------------------------------
 
 wxString wxXmStringToString( const XmString& xmString );
-XmString wxStringToXmString( const wxString& string );
 XmString wxStringToXmString( const char* string );
+inline XmString wxStringToXmString( const wxCharBuffer& string )
+    { return wxStringToXmString(string.data()); }
+inline XmString wxStringToXmString( const wxString& string )
+    { return wxStringToXmString((const char*)string.mb_str()); }
 
 // XmString made easy to use in wxWidgets (and has an added benefit of
 // cleaning up automatically)
@@ -146,6 +150,11 @@ public:
         Init(str);
     }
 
+    wxXmString(const wchar_t* str)
+    {
+        Init(wxConvLibc.cWC2MB(str));
+    }
+
     wxXmString(const wxString& str)
     {
         Init(str.mb_str());