Revert r62598 which removed "unnecessary wxOSX_USE_COCOA checks."

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index 871497df9487faff01ef6c54ec86f8de16f955cb..5b05c6e249aaa6211adf6ebe10654268606b5a81 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -44,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


@@ -130,7 +130,7 @@ extern XColor itemColors[5] ;
 
 wxString wxXmStringToString( const XmString& xmString );
 XmString wxStringToXmString( const char* string );
 
 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()); }
     { return wxStringToXmString(string.data()); }
 inline XmString wxStringToXmString( const wxString& string )
     { return wxStringToXmString((const char*)string.mb_str()); }


@@ -141,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: