Various VC++ 1.5 and other corrections

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

diff --git a/include/wx/motif/private.h b/include/wx/motif/private.h
index f8dbeba90dc2ed5115320a9307bf07e3229dd246..23737aecba2a2ee04ed8f00fc0cbc71d43eb4420 100644 (file)
--- a/include/wx/motif/private.h
+++ b/include/wx/motif/private.h
@@ -39,9 +39,15 @@ extern void wxDeleteWindowFromTable(Widget w);
 extern wxWindow *wxGetWindowFromTable(Widget w);
 extern bool wxAddWindowToTable(Widget w, wxWindow *win);
 
+// ----------------------------------------------------------------------------
+// key events related functions
+// ----------------------------------------------------------------------------
+
 extern char wxFindMnemonic(const char* s);
-extern char * wxFindAccelerator (char *s);
-extern XmString wxFindAcceleratorText (char *s);
+
+extern char * wxFindAccelerator (const char *s);
+extern XmString wxFindAcceleratorText (const char *s);
+
 extern int wxCharCodeXToWX(KeySym keySym);
 extern KeySym wxCharCodeWXToX(int id);
 
@@ -72,5 +78,43 @@ extern XColor itemColors[5] ;
 #define wxTOPS_INDEX 3
 #define wxBOTS_INDEX 4
 
+// ----------------------------------------------------------------------------
+// utility classes
+// ----------------------------------------------------------------------------
+
+// XmString made easy to use in wxWindows (and has an added benefit of
+// cleaning up automatically)
+class wxXmString
+{
+public:
+    wxXmString(const wxString& str)
+    {
+        m_string = XmStringCreateLtoR((char *)str.c_str(),
+                                      XmSTRING_DEFAULT_CHARSET);
+    }
+
+    ~wxXmString() { XmStringFree(m_string); }
+
+    // semi-implicit conversion to XmString (shouldn't rely on implicit
+    // conversion because many of Motif functions are macros)
+    XmString operator()() const { return m_string; }
+
+private:
+    XmString m_string;
+};
+
+// ----------------------------------------------------------------------------
+// macros to avoid casting WXFOO to Foo all the time
+// ----------------------------------------------------------------------------
+
+// argument is of type "wxWindow *"
+#define GetWidget(w)    ((Widget)(w)->GetHandle())
+
+// ----------------------------------------------------------------------------
+// accessors for C modules
+// ----------------------------------------------------------------------------
+
+extern "C" XtAppContext wxGetAppContext();
+
 #endif
     // _WX_PRIVATE_H_