Fix wrong tab order in wxAuiNotebook after dragging.

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 816fc71fcceb84e609be4c7435a7ff838c3d6a70..5b05c6e249aaa6211adf6ebe10654268606b5a81 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


@@ -128,8 +129,11 @@ extern XColor itemColors[5] ;
 // ----------------------------------------------------------------------------
 
 wxString wxXmStringToString( const XmString& xmString );
 // ----------------------------------------------------------------------------
 
 wxString wxXmStringToString( const XmString& xmString );

-XmString wxStringToXmString( const wxString& string );

 XmString wxStringToXmString( const char* string );
 XmString wxStringToXmString( const char* string );

+inline XmString wxStringToXmString( const wxScopedCharBuffer& 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)
 
 // XmString made easy to use in wxWidgets (and has an added benefit of
 // cleaning up automatically)


@@ -137,7 +141,11 @@ class wxXmString
 {
     void Init(const char *str)
     {
 {
     void Init(const char *str)
     {

-        m_string = XmStringCreateLtoR((char *)str, XmSTRING_DEFAULT_CHARSET);
+        m_string = XmStringCreateLtoR
+                   (
+                    const_cast<char *>(str),
+                    const_cast<char *>(XmSTRING_DEFAULT_CHARSET)
+                   );

     }
 
 public:
     }
 
 public:


@@ -146,6 +154,11 @@ public:
         Init(str);
     }
 
         Init(str);
     }
 

+    wxXmString(const wchar_t* str)
+    {
+        Init(wxConvLibc.cWC2MB(str));
+    }
+

     wxXmString(const wxString& str)
     {
         Init(str.mb_str());
     wxXmString(const wxString& str)
     {
         Init(str.mb_str());