X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..d485bda109d5ef0fef36a3f737549e9b9f54baab:/src/univ/control.cpp?ds=sidebyside diff --git a/src/univ/control.cpp b/src/univ/control.cpp index 1cf171e97a..fa8ae7b384 100644 --- a/src/univ/control.cpp +++ b/src/univ/control.cpp @@ -25,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 @@ -54,8 +55,6 @@ WX_FORWARD_TO_INPUT_CONSUMER(wxControl) void wxControl::Init() { m_indexAccel = -1; - - m_inputHandler = (wxInputHandler *)NULL; } bool wxControl::Create(wxWindow *parent, @@ -79,50 +78,15 @@ bool wxControl::Create(wxWindow *parent, // mnemonics handling // ---------------------------------------------------------------------------- -/* static */ -int wxControl::FindAccelIndex(const wxString& label, wxString *labelOnly) +void wxControl::SetLabel(const wxString& label) { - // the character following MNEMONIC_PREFIX is the accelerator for this - // control unless it is MNEMONIC_PREFIX too - this allows to insert - // literal MNEMONIC_PREFIX chars into the label - static const wxChar MNEMONIC_PREFIX = _T('&'); + // save original label + wxControlBase::SetLabel(label); - if ( labelOnly ) - { - labelOnly->Empty(); - labelOnly->Alloc(label.length()); - } - - int indexAccel = -1; - for ( const wxChar *pc = label; *pc != wxT('\0'); pc++ ) - { - if ( *pc == MNEMONIC_PREFIX ) - { - pc++; // skip it - if ( *pc != MNEMONIC_PREFIX ) - { - if ( indexAccel == -1 ) - { - // remember it (-1 is for MNEMONIC_PREFIX itself - indexAccel = pc - label.c_str() - 1; - } - else - { - wxFAIL_MSG(_T("duplicate accel char in control label")); - } - } - } - - if ( labelOnly ) - { - *labelOnly += *pc; - } - } - - return indexAccel; + UnivDoSetLabel(label); } -void wxControl::SetLabel(const wxString& label) +void wxControl::UnivDoSetLabel(const wxString& label) { wxString labelOld = m_label; m_indexAccel = FindAccelIndex(label, &m_label); @@ -133,9 +97,4 @@ void wxControl::SetLabel(const wxString& label) } } -wxString wxControl::GetLabel() const -{ - return m_label; -} - #endif // wxUSE_CONTROLS