X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/483561c5684e0c21a0112dec59c9ca5c38718906..2187eef5bb7a81ee3b2738a312f4ecfceb49bded:/include/wx/motif/private.h diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h index b58c0ed7f7..2f6270776c 100644 --- a/include/wx/motif/private.h +++ b/include/wx/motif/private.h @@ -15,6 +15,10 @@ #include "wx/defs.h" #include "X11/Xlib.h" +class WXDLLEXPORT wxFont; +class WXDLLEXPORT wxWindow; +class WXDLLEXPORT wxSize; + #include "wx/x11/privx.h" // Put any private declarations here: native Motif types may be used because @@ -94,6 +98,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 +117,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 +131,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