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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 18f8bbeb68..0924e49ef4 100644
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -13,8 +13,11 @@
 #include "wx/wxprec.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
@@ -34,9 +37,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-
     m_inSetValue = false;
 }
 
@@ -69,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;
 }
 
@@ -82,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(),
@@ -106,7 +102,7 @@ wxString wxControl::GetLabel() const
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 wxSize wxControl::DoGetBestSize() const