X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5afb019a0c84f48fca79e99446b52866e41c379d..7d6a4d96961eac84d05db8bb24c64d39003f6e54:/src/generic/spinctlg.cpp?ds=sidebyside diff --git a/src/generic/spinctlg.cpp b/src/generic/spinctlg.cpp index 56f39de773..9a2a5eb4e4 100644 --- a/src/generic/spinctlg.cpp +++ b/src/generic/spinctlg.cpp @@ -6,7 +6,7 @@ // Created: 29.01.01 // RCS-ID: $Id$ // Copyright: (c) 2001 Vadim Zeitlin -// License: wxWindows licence +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// // ============================================================================ @@ -29,6 +29,7 @@ #endif //WX_PRECOMP #include "wx/spinctrl.h" +#include "wx/tooltip.h" #if wxUSE_SPINCTRL @@ -46,8 +47,12 @@ IMPLEMENT_DYNAMIC_CLASS(wxSpinDoubleEvent, wxNotifyEvent) // constants // ---------------------------------------------------------------------------- -// the margin between the text control and the spin -static const wxCoord MARGIN = 2; +// The margin between the text control and the spin: the value here is the same +// as the margin between the spin button and its "buddy" text control in wxMSW +// so the generic control looks similarly to the native one there, we might +// need to use different value for the other platforms (and maybe even +// determine it dynamically?). +static const wxCoord MARGIN = 1; #define SPINCTRLBUT_MAX 32000 // large to avoid wrap around trouble @@ -60,7 +65,7 @@ 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 ) | wxTE_NOHIDESEL | wxTE_PROCESS_ENTER) + style & wxALIGN_MASK) { m_spin = spin; @@ -77,25 +82,16 @@ public: m_spin = NULL; } - void OnTextEnter(wxCommandEvent& event) - { - if (m_spin) - m_spin->OnTextEnter(event); - } - void OnChar( wxKeyEvent &event ) { if (m_spin) - m_spin->OnTextChar(event); + m_spin->ProcessWindowEvent(event); } void OnKillFocus(wxFocusEvent& event) { if (m_spin) - { - m_spin->SyncSpinToText(); - m_spin->DoSendEvent(); - } + m_spin->ProcessWindowEvent(event); event.Skip(); } @@ -107,8 +103,6 @@ private: }; BEGIN_EVENT_TABLE(wxSpinCtrlTextGeneric, wxTextCtrl) - EVT_TEXT_ENTER(wxID_ANY, wxSpinCtrlTextGeneric::OnTextEnter) - EVT_CHAR(wxSpinCtrlTextGeneric::OnChar) EVT_KILL_FOCUS(wxSpinCtrlTextGeneric::OnKillFocus) @@ -199,6 +193,10 @@ 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()); +#endif // wxUSE_TOOLTIPS m_spin_value = m_spinButton->GetValue(); @@ -248,8 +246,7 @@ wxSpinCtrlGenericBase::~wxSpinCtrlGenericBase() delete text; } - delete m_spinButton; - m_spinButton = NULL; + wxDELETE(m_spinButton); } // ---------------------------------------------------------------------------- @@ -271,7 +268,7 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) // position the subcontrols inside the client area wxSize sizeBtn = m_spinButton->GetSize(); - wxCoord wText = width - sizeBtn.x; + wxCoord wText = width - sizeBtn.x - MARGIN; m_textCtrl->SetSize(x, y, wText, height); m_spinButton->SetSize(x + wText + MARGIN, y, wxDefaultCoord, height); } @@ -280,9 +277,28 @@ void wxSpinCtrlGenericBase::DoMoveWindow(int x, int y, int width, int height) // operations forwarded to the subcontrols // ---------------------------------------------------------------------------- +void wxSpinCtrlGenericBase::SetFocus() +{ + if ( m_textCtrl ) + m_textCtrl->SetFocus(); +} + +#ifdef __WXMSW__ + +void wxSpinCtrlGenericBase::DoEnable(bool enable) +{ + // 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 ) + wxSpinCtrlBase::DoEnable(enable); +} + +#endif // __WXMSW__ + bool wxSpinCtrlGenericBase::Enable(bool enable) { - if ( !wxControl::Enable(enable) ) + if ( !wxSpinCtrlBase::Enable(enable) ) return false; m_spinButton->Enable(enable); @@ -307,29 +323,49 @@ bool wxSpinCtrlGenericBase::Show(bool show) return true; } -bool wxSpinCtrlGenericBase::Reparent(wxWindowBase *newParent) +#if wxUSE_TOOLTIPS +void wxSpinCtrlGenericBase::DoSetToolTip(wxToolTip *tip) { + // Notice that we must check for the subcontrols not being NULL (as they + // could be if we were created with the default ctor and this is called + // before Create() for some reason) and that we can't call SetToolTip(tip) + // because this would take ownership of the wxToolTip object (twice). + if ( m_textCtrl ) + { + if ( tip ) + m_textCtrl->SetToolTip(tip->GetTip()); + else + m_textCtrl->SetToolTip(NULL); + } + if ( m_spinButton ) { - m_spinButton->Reparent(newParent); - m_textCtrl->Reparent(newParent); + if( tip ) + m_spinButton->SetToolTip(tip->GetTip()); + else + m_spinButton->SetToolTip(NULL); } - return true; + wxWindowBase::DoSetToolTip(tip); } +#endif // wxUSE_TOOLTIPS // ---------------------------------------------------------------------------- // Handle sub controls events // ---------------------------------------------------------------------------- +BEGIN_EVENT_TABLE(wxSpinCtrlGenericBase, wxSpinCtrlBase) + EVT_CHAR(wxSpinCtrlGenericBase::OnTextChar) + EVT_KILL_FOCUS(wxSpinCtrlGenericBase::OnTextLostFocus) +END_EVENT_TABLE() + void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) { event.Skip(); // Sync the textctrl since the user expects that the button will modify // what they see in the textctrl. - if ( m_textCtrl && m_textCtrl->IsModified() ) - SyncSpinToText(); + SyncSpinToText(); int spin_value = event.GetPosition(); double step = (event.GetEventType() == wxEVT_SCROLL_LINEUP) ? 1 : -1; @@ -354,10 +390,11 @@ void wxSpinCtrlGenericBase::OnSpinButton(wxSpinEvent& event) DoSendEvent(); } -void wxSpinCtrlGenericBase::OnTextEnter(wxCommandEvent& event) +void wxSpinCtrlGenericBase::OnTextLostFocus(wxFocusEvent& event) { SyncSpinToText(); DoSendEvent(); + event.Skip(); } @@ -395,8 +432,7 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) value = AdjustToFitInRange(value); - if ( m_textCtrl && m_textCtrl->IsModified() ) - SyncSpinToText(); + SyncSpinToText(); if ( DoSetValue(value) ) DoSendEvent(); @@ -406,10 +442,10 @@ void wxSpinCtrlGenericBase::OnTextChar(wxKeyEvent& event) // Textctrl functions // ---------------------------------------------------------------------------- -void wxSpinCtrlGenericBase::SyncSpinToText() +bool wxSpinCtrlGenericBase::SyncSpinToText() { - if (!m_textCtrl) - return; + if ( !m_textCtrl || !m_textCtrl->IsModified() ) + return false; double textValue; if ( m_textCtrl->GetValue().ToDouble(&textValue) ) @@ -418,17 +454,17 @@ void wxSpinCtrlGenericBase::SyncSpinToText() textValue = m_max; else if (textValue < m_min) textValue = m_min; - - // we must always set the value here, even if it's equal to m_value, as - // otherwise we could be left with an out of range value when leaving - // the text control and the current value is already m_max for example - DoSetValue(textValue); } - else + else // text contents is not a valid number at all { - // textctrl is out of sync, discard and reset - DoSetValue(m_value); + // replace its contents with the last valid value + textValue = m_value; } + + // we must always set the value here, even if it's equal to m_value, as + // otherwise we could be left with an out of range value when leaving the + // text control and the current value is already m_max for example + return DoSetValue(textValue); } // ---------------------------------------------------------------------------- @@ -527,8 +563,6 @@ void wxSpinCtrlGenericBase::SetSelection(long from, long to) // wxSpinCtrl //----------------------------------------------------------------------------- -IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxSpinCtrlGenericBase) - void wxSpinCtrl::DoSendEvent() { wxSpinEvent event( wxEVT_COMMAND_SPINCTRL_UPDATED, GetId()); @@ -559,6 +593,11 @@ void wxSpinCtrlDouble::SetDigits(unsigned digits) { wxCHECK_RET( digits <= 20, "too many digits for wxSpinCtrlDouble" ); + if ( digits == m_digits ) + return; + + m_digits = digits; + m_format.Printf(wxT("%%0.%ulf"), digits); DoSetValue(m_value);