Rename wxWebNavigationError to wxWebViewNavigationError and wxWebNavigationEvent...

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

diff --git a/src/motif/control.cpp b/src/motif/control.cpp
index 13b8146af7117f15044a8e3bd7a549e5c4fc6a63..0924e49ef4385d181b3db6f0263a15f08cd50f0c 100644 (file)
--- a/src/motif/control.cpp
+++ b/src/motif/control.cpp
@@ -37,9 +37,6 @@ END_EVENT_TABLE()
 // Item members
 wxControl::wxControl()
 {
-    m_backgroundColour = *wxWHITE;
-    m_foregroundColour = *wxBLACK;
-
     m_inSetValue = false;
 }
 
@@ -72,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;
 }
 
@@ -85,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(),
@@ -109,7 +102,7 @@ wxString wxControl::GetLabel() const
 
 bool wxControl::ProcessCommand(wxCommandEvent & event)
 {
-    return GetEventHandler()->ProcessEvent(event);
+    return HandleWindowEvent(event);
 }
 
 wxSize wxControl::DoGetBestSize() const