X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..24a39c0dd5b46ad2de22da1c21758e651a24bd9b:/src/motif/control.cpp?ds=sidebyside

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index e783854df5..3d6cdf909c 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        control.cpp
+// Name:        src/motif/control.cpp
 // Purpose:     wxControl class
 // Author:      Julian Smart
 // Modified by:
@@ -12,11 +12,12 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/defs.h"
-
 #include "wx/control.h"
-#include "wx/panel.h"
-#include "wx/utils.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/utils.h"
+    #include "wx/panel.h"
+#endif
 
 #ifdef __VMS__
 #pragma message disable nosimpint
@@ -36,9 +37,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-
     m_inSetValue = false;
 }
 
@@ -71,10 +69,6 @@ bool wxControl::CreateControl(wxWindow *parent,
                                        validator, name ) )
         return false;
 
-    m_backgroundColour = parent->GetBackgroundColour();
-    m_foregroundColour = parent->GetForegroundColour();
-    m_font = parent->GetFont();
-
     return true;
 }
 
@@ -84,7 +78,7 @@ void wxControl::SetLabel(const wxString& label)
     if (!widget)
         return;
 
-    wxXmString label_str(wxStripMenuCodes(label));
+    wxXmString label_str(GetLabelText(label));
 
     XtVaSetValues (widget,
         XmNlabelString, label_str(),