redraw changes

[wxWidgets.git] / src / motif / control.cpp

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 0a5e6377f102b7020af67e940a1f91be1c45a1bc..af57174fe6e3a7d404ee4107ce91ae7a564e8d71 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -27,6 +27,8 @@
 #pragma message enable nosimpint
 #endif
 
+#include "wx/motif/private.h"
+
 IMPLEMENT_ABSTRACT_CLASS(wxControl, wxWindow)
 
 BEGIN_EVENT_TABLE(wxControl, wxWindow)
@@ -62,17 +64,36 @@ 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());
+    wxString buf(wxStripMenuCodes(label));
     wxXmString label_str(buf);
 
     XtVaSetValues (widget,
-        XmNlabelString, label_str,
+        XmNlabelString, label_str(),
         XmNlabelType, XmSTRING,
         NULL);
 }