X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea19087eec7e491376d1a666b3eb450c4cdd8c96..e2a5251d0109a1be6b9ce5c818d89f56ebfaeae1:/src/motif/control.cpp?ds=sidebyside

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 1dc7e344c5..e488c043aa 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -64,14 +64,32 @@ bool wxControl::Create( wxWindow *parent,
     return ret;
 }
 
+bool wxControl::CreateControl(wxWindow *parent,
+                              wxWindowID id,
+                              const wxPoint& pos,
+                              const wxSize& size,
+                              long style,
+                              const wxValidator& validator,
+                              const wxString& name)
+{
+    if( !wxControlBase::CreateControl( parent, id, pos, size, style,
+                                       validator, name ) )
+        return FALSE;
+
+    m_backgroundColour = parent->GetBackgroundColour();
+    m_foregroundColour = parent->GetForegroundColour();
+    m_font = parent->GetFont();
+
+    return TRUE;
+}
+
 void wxControl::SetLabel(const wxString& label)
 {
     Widget widget = (Widget) GetLabelWidget() ;
     if (!widget)
         return;
 
-    wxString buf(wxStripMenuCodes(label));
-    wxXmString label_str(buf);
+    wxXmString label_str(wxStripMenuCodes(label));
 
     XtVaSetValues (widget,
         XmNlabelString, label_str(),
@@ -86,23 +104,11 @@ wxString wxControl::GetLabel() const
         return wxEmptyString;
 
     XmString text;
-    char *s;
     XtVaGetValues (widget,
         XmNlabelString, &text,
         NULL);
 
-    if (XmStringGetLtoR (text, XmSTRING_DEFAULT_CHARSET, &s))
-    {
-        wxString str(s);
-        XtFree (s);
-        XmStringFree(text);
-        return str;
-    }
-    else
-    {
-      //        XmStringFree(text);
-        return wxEmptyString;
-    }
+    return wxXmStringToString( text );
 }
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)