public:
wxSpinCtrlTextGeneric(wxSpinCtrlGenericBase *spin, const wxString& value, long style=0)
: wxTextCtrl(spin->GetParent(), wxID_ANY, value, wxDefaultPosition, wxDefaultSize,
- style & wxALIGN_MASK)
+ // 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;
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)
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()
m_max = 100;
m_increment = 1;
m_snap_to_ticks = false;
- m_format = wxS("%g");
m_spin_value = 0;
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));
}
}
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)
{
- // 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);
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)
{
return false;
double textValue;
- if ( m_textCtrl->GetValue().ToDouble(&textValue) )
+ if ( DoTextToValue(m_textCtrl->GetValue(), &textValue) )
{
if (textValue > m_max)
textValue = m_max;
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);
}
}
}
- 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->DiscardEdits();
// 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());
GetEventHandler()->ProcessEvent( event );
}
+bool wxSpinCtrl::DoTextToValue(const wxString& text, double *val)
+{
+ long lval;
+ if ( !text.ToLong(&lval, GetBase()) )
+ return false;
+
+ *val = static_cast<double>(lval);
+
+ return true;
+}
+
+wxString wxSpinCtrl::DoValueToText(double val)
+{
+ switch ( GetBase() )
+ {
+ case 16:
+ return wxPrivate::wxSpinCtrlFormatAsHex(static_cast<long>(val),
+ GetMax());
+
+ default:
+ wxFAIL_MSG( wxS("Unsupported spin control base") );
+ // Fall through
+
+ case 10:
+ return wxString::Format("%ld", static_cast<long>(val));
+ }
+}
+
#endif // !wxHAS_NATIVE_SPINCTRL
//-----------------------------------------------------------------------------
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" );
projects / wxWidgets.git / blobdiff