X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..d23849361d92342efb1ec3af84064570e1b749d7:/src/univ/control.cpp diff --git a/src/univ/control.cpp b/src/univ/control.cpp index a719d491fa..8a692bf840 100644 --- a/src/univ/control.cpp +++ b/src/univ/control.cpp @@ -13,10 +13,6 @@ // declarations // ============================================================================ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "control.h" -#endif - // ---------------------------------------------------------------------------- // headers // ---------------------------------------------------------------------------- @@ -29,9 +25,10 @@ #if wxUSE_CONTROLS +#include "wx/control.h" + #ifndef WX_PRECOMP #include "wx/app.h" - #include "wx/control.h" #include "wx/dcclient.h" #endif @@ -58,8 +55,6 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxControl) void wxControl::Init() { m_indexAccel = -1; - - m_inputHandler = (wxInputHandler *)NULL; } bool wxControl::Create(wxWindow *parent, @@ -73,10 +68,10 @@ bool wxControl::Create(wxWindow *parent, if ( !wxControlBase::Create(parent, id, pos, size, style, validator, name) ) { // underlying window creation failed? - return FALSE; + return false; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -127,6 +122,14 @@ int wxControl::FindAccelIndex(const wxString& label, wxString *labelOnly) } void wxControl::SetLabel(const wxString& label) +{ + // save original label + wxControlBase::SetLabel(label); + + UnivDoSetLabel(label); +} + +void wxControl::UnivDoSetLabel(const wxString& label) { wxString labelOld = m_label; m_indexAccel = FindAccelIndex(label, &m_label); @@ -137,9 +140,4 @@ void wxControl::SetLabel(const wxString& label) } } -wxString wxControl::GetLabel() const -{ - return m_label; -} - #endif // wxUSE_CONTROLS