removed wxUSE_IMAGE_LOADING_IN_MSW and wxUSE_RESOURCE_LOADING_IN_MSW settings, they...

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index b58c0ed7f73e690bbecc9c2a0eb2e3e5e5ddc429..f93dc7b81e5e8158921ea38ea6b327aa6d3b364b 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -94,6 +94,10 @@ extern XColor itemColors[5] ;
 // utility classes
 // ----------------------------------------------------------------------------
 
+wxString wxXmStringToString( const XmString& xmString );
+XmString wxStringToXmString( const wxString& string );
+XmString wxStringToXmString( const char* string );
+
 // XmString made easy to use in wxWindows (and has an added benefit of
 // cleaning up automatically)
 class wxXmString
@@ -109,7 +113,10 @@ public:
         m_string = XmStringCreateLtoR((char *)str.c_str(),
             XmSTRING_DEFAULT_CHARSET);
     }
-    
+
+    // just to avoid calling XmStringFree()
+    wxXmString(const XmString& string) { m_string = string; }
+
     ~wxXmString() { XmStringFree(m_string); }
     
     // semi-implicit conversion to XmString (shouldn't rely on implicit
@@ -120,8 +127,6 @@ private:
     XmString m_string;
 };
 
-wxString wxXmStringToString( const XmString& xmString );
-
 // ----------------------------------------------------------------------------
 // Routines used in both wxTextCtrl/wxListBox and nativa wxComboBox
 // (defined in src/motif/listbox.cpp or src/motif/textctrl.cpp