X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e609c82594a57104ff5e0d4044b2e2697a4b576..12bb29f5432174ecbd65549bda832d70d34a98ae:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index 13b8146af7..0924e49ef4 100644 --- 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