X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c81394808bf7efd84e4294e44a9a9a7b7f6dd8a9..07aaf32633ecf18ec3edfbb41793a112914792d0:/src/generic/spinctlg.cpp?ds=sidebyside diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index e9a7a32a37..0e13113779 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -64,8 +64,12 @@ class wxSpinCtrlTextGeneric : public wxTextCtrl { public: wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0) - : wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize, - style & wxALIGN_MASK) + : wxTextCtrl(spin, wxID_ANY, value, wxDefaultPosition, wxDefaultSize, + // This is tricky: we want to honour any alignment flags + // but not wxALIGN_CENTER_VERTICAL because it's the same + // as wxTE_PASSWORD and we definitely don't want to show + // asterisks in spin control. + style & (wxALIGN_MASK | wxTE_PROCESS_ENTER) & ~wxTE_PASSWORD) { m_spin = spin; @@ -84,8 +88,16 @@ public: void OnChar( wxKeyEvent &event ) { - if (m_spin) - m_spin->ProcessWindowEvent(event); + if ( !m_spin->ProcessWindowEvent(event) ) + event.Skip(); + } + + void OnTextEvent(wxCommandEvent& event) + { + wxCommandEvent eventCopy(event); + eventCopy.SetEventObject(m_spin); + eventCopy.SetId(m_spin->GetId()); + m_spin->ProcessWindowEvent(eventCopy); } void OnKillFocus(wxFocusEvent& event) @@ -105,6 +117,15 @@ private: BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl) EVT_CHAR(wxSpinCtrlTextGeneric::OnChar) + // Forward the text events to wxSpinCtrl itself adjusting them slightly in + // the process. + EVT_TEXT(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent) + + // And we need to forward this one too as wxSpinCtrl is supposed to + // generate it if wxTE_PROCESS_ENTER is used with it (and if it isn't, + // we're never going to get EVT_TEXT_ENTER in the first place). + EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEvent) + EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus) END_EVENT_TABLE() @@ -116,7 +137,7 @@ class wxSpinCtrlButtonGeneric : public wxSpinButton { public: wxSpinCtrlButtonGeneric(wxSpinCtrlGenericBase *spin, int style) - : wxSpinButton(spin->GetParent(), wxID_ANY, wxDefaultPosition, + : wxSpinButton(spin, wxID_ANY, wxDefaultPosition, wxDefaultSize, style | wxSP_VERTICAL) { m_spin = spin; @@ -159,7 +180,6 @@ void wxSpinCtrlGenericBase::Init() m_max = 100; m_increment = 1; m_snap_to_ticks = false; - m_format = wxS("%g"); m_spin_value = 0; @@ -193,6 +213,7 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent, m_textCtrl = new wxSpinCtrlTextGeneric(this, value, style); m_spinButton = new wxSpinCtrlButtonGeneric(this, style); + #if wxUSE_TOOLTIPS m_textCtrl->SetToolTip(GetToolTipText()); m_spinButton->SetToolTip(GetToolTipText()); @@ -207,26 +228,16 @@ bool wxSpinCtrlGenericBase::Create(wxWindow *parent, if ( !value.empty() ) { double d; - if ( value.ToDouble(&d) ) + if ( DoTextToValue(value, &d) ) { m_value = d; - m_textCtrl->SetValue(wxString::Format(m_format, m_value)); + m_textCtrl->SetValue(DoValueToText(m_value)); } } SetInitialSize(size); Move(pos); - // have to disable this window to avoid interfering it with message - // processing to the text and the button... but pretend it is enabled to - // make IsEnabled() return true - wxControl::Enable(false); // don't use non virtual Disable() here! - m_isEnabled = true; - - // we don't even need to show this window itself - and not doing it avoids - // that it overwrites the text control - wxControl::Show(false); - m_isShown = true; return true; } @@ -249,16 +260,40 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase() wxDELETE(m_spinButton); } +wxWindowList wxSpinCtrlGenericBase::GetCompositeWindowParts() const +{ + wxWindowList parts; + parts.push_back(m_textCtrl); + parts.push_back(m_spinButton); + return parts; +} + // ---------------------------------------------------------------------------- // geometry // ---------------------------------------------------------------------------- wxSize wxSpinCtrlGenericBase::DoGetBestSize() const { - wxSize sizeBtn = m_spinButton->GetBestSize(), - sizeText = m_textCtrl->GetBestSize(); + return DoGetSizeFromTextSize(m_textCtrl->GetBestSize().x, -1); +} + +wxSize wxSpinCtrlGenericBase::DoGetSizeFromTextSize(int xlen, int ylen) const +{ + wxSize sizeBtn = m_spinButton->GetBestSize(); + wxSize totalS( m_textCtrl->GetBestSize() ); + + wxSize tsize(xlen + sizeBtn.x + MARGIN, totalS.y); +#if defined(__WXMSW__) + tsize.IncBy(0.4 * totalS.y + 4, 0); +#elif defined(__WXGTK__) + tsize.IncBy(totalS.y + 10, 0); +#endif // MSW GTK + + // Check if the user requested a non-standard height. + if ( ylen > 0 ) + tsize.IncBy(0, ylen - GetCharHeight()); - return wxSize(sizeBtn.x + sizeText.x + MARGIN, sizeText.y); + return tsize; } void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) @@ -269,8 +304,8 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) wxSize sizeBtn = m_spinButton->GetSize(); wxCoord wText = width - sizeBtn.x - MARGIN; - m_textCtrl->SetSize(x, y, wText, height); - m_spinButton->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height); + m_textCtrl->SetSize(0, 0, wText, height); + m_spinButton->SetSize(0 + wText + MARGIN, 0, wxDefaultCoord, height); } // ---------------------------------------------------------------------------- @@ -283,16 +318,20 @@ void wxSpinCtrlGenericBase::SetFocus() m_textCtrl->SetFocus(); } +#ifdef __WXMSW__ + +void wxSpinCtrlGenericBase::DoEnable(bool enable) +{ + wxSpinCtrlBase::DoEnable(enable); +} + +#endif // __WXMSW__ + bool wxSpinCtrlGenericBase::Enable(bool enable) { - // Notice that we never enable this control itself, it must stay disabled - // to avoid interfering with the siblings event handling (see e.g. #12045 - // for the kind of problems which arise otherwise). - if ( enable == m_isEnabled ) + if ( !wxSpinCtrlBase::Enable(enable) ) return false; - m_isEnabled = enable; - m_spinButton->Enable(enable); m_textCtrl->Enable(enable); @@ -315,17 +354,6 @@ bool wxSpinCtrlGenericBase::Show(bool show) return true; } -bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent) -{ - if ( m_spinButton ) - { - m_spinButton->Reparent(newParent); - m_textCtrl->Reparent(newParent); - } - - return true; -} - #if wxUSE_TOOLTIPS void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip) { @@ -353,6 +381,17 @@ void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip) } #endif // wxUSE_TOOLTIPS +bool wxSpinCtrlGenericBase::SetBackgroundColour(const wxColour& colour) +{ + // We need to provide this otherwise the entire composite window + // background and therefore the between component spaces + // will be changed. + if ( m_textCtrl ) + return m_textCtrl->SetBackgroundColour(colour); + + return true; +} + // ---------------------------------------------------------------------------- // Handle sub controls events // ---------------------------------------------------------------------------- @@ -451,7 +490,7 @@ bool wxSpinCtrlGenericBase::SyncSpinToText() return false; double textValue; - if ( m_textCtrl->GetValue().ToDouble(&textValue) ) + if ( DoTextToValue(m_textCtrl->GetValue(), &textValue) ) { if (textValue > m_max) textValue = m_max; @@ -479,15 +518,14 @@ void wxSpinCtrlGenericBase::SetValue(const wxString& text) wxCHECK_RET( m_textCtrl, wxT("invalid call to wxSpinCtrl::SetValue") ); double val; - if ( text.ToDouble(&val) && InRange(val) ) + if ( DoTextToValue(text, &val) && InRange(val) ) { DoSetValue(val); } else // not a number at all or out of range { m_textCtrl->SetValue(text); - m_textCtrl->SetSelection(0, -1); - m_textCtrl->SetInsertionPointEnd(); + m_textCtrl->SelectAll(); } } @@ -511,14 +549,14 @@ bool wxSpinCtrlGenericBase::DoSetValue(double val) } } - wxString str(wxString::Format(m_format.c_str(), val)); + wxString str(DoValueToText(val)); if ((val != m_value) || (str != m_textCtrl->GetValue())) { - m_value = val; - str.ToDouble( &m_value ); // wysiwyg for textctrl + if ( !DoTextToValue(str, &m_value ) ) // wysiwyg for textctrl + m_value = val; m_textCtrl->SetValue( str ); - m_textCtrl->SetInsertionPointEnd(); + m_textCtrl->SelectAll(); m_textCtrl->DiscardEdits(); return true; } @@ -566,6 +604,30 @@ void wxSpinCtrlGenericBase::SetSelection(long from, long to) // wxSpinCtrl //----------------------------------------------------------------------------- +bool wxSpinCtrl::SetBase(int base) +{ + // Currently we only support base 10 and 16. We could add support for base + // 8 quite easily but wxMSW doesn't support it natively so don't bother. + if ( base != 10 && base != 16 ) + return false; + + if ( base == m_base ) + return true; + + // Update the current control contents to show in the new base: be careful + // to call DoTextToValue() before changing the base... + double val; + const bool hasValidVal = DoTextToValue(m_textCtrl->GetValue(), &val); + + m_base = base; + + // ... but DoValueToText() after doing it. + if ( hasValidVal ) + m_textCtrl->SetValue(DoValueToText(val)); + + return true; +} + void wxSpinCtrl::DoSendEvent() { wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId()); @@ -575,6 +637,34 @@ void wxSpinCtrl::DoSendEvent() GetEventHandler()->ProcessEvent( event ); } +bool wxSpinCtrl::DoTextToValue(const wxString& text, double *val) +{ + long lval; + if ( !text.ToLong(&lval, GetBase()) ) + return false; + + *val = static_cast(lval); + + return true; +} + +wxString wxSpinCtrl::DoValueToText(double val) +{ + switch ( GetBase() ) + { + case 16: + return wxPrivate::wxSpinCtrlFormatAsHex(static_cast(val), + GetMax()); + + default: + wxFAIL_MSG( wxS("Unsupported spin control base") ); + // Fall through + + case 10: + return wxString::Format("%ld", static_cast(val)); + } +} + #endif // !wxHAS_NATIVE_SPINCTRL //----------------------------------------------------------------------------- @@ -592,6 +682,16 @@ void wxSpinCtrlDouble::DoSendEvent() GetEventHandler()->ProcessEvent( event ); } +bool wxSpinCtrlDouble::DoTextToValue(const wxString& text, double *val) +{ + return text.ToDouble(val); +} + +wxString wxSpinCtrlDouble::DoValueToText(double val) +{ + return wxString::Format(m_format, val); +} + void wxSpinCtrlDouble::SetDigits(unsigned digits) { wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" );