X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..c0f984728e5cac4d20f004aa962b15e9a30d91e6:/src/motif/control.cpp diff --git a/src/motif/control.cpp b/src/motif/control.cpp index c972668ad1..e6d45853c9 100644 --- a/src/motif/control.cpp +++ b/src/motif/control.cpp @@ -40,10 +40,6 @@ wxControl::wxControl() m_backgroundColour = *wxWHITE; m_foregroundColour = *wxBLACK; -#if WXWIN_COMPATIBILITY - m_callback = 0; -#endif // WXWIN_COMPATIBILITY - m_inSetValue = FALSE; } @@ -103,7 +99,7 @@ wxString wxControl::GetLabel() const if (!widget) return wxEmptyString; - XmString text; + XmString text = NULL; XtVaGetValues (widget, XmNlabelString, &text, NULL); @@ -113,15 +109,5 @@ wxString wxControl::GetLabel() const bool wxControl::ProcessCommand(wxCommandEvent & event) { -#if WXWIN_COMPATIBILITY - if ( m_callback ) - { - (void)(*m_callback)(this, event); - - return TRUE; - } - else -#endif // WXWIN_COMPATIBILITY - return GetEventHandler()->ProcessEvent(event); }