#pragma hdrstop
#endif
-#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || defined(__WXMAC__) || \
- defined(__WXUNIVERSAL__)
+#if !(defined(__WXMSW__) || defined(__WXGTK__) || defined(__WXPM__)) || \
+ defined(__WXMAC__) || defined(__WXUNIVERSAL__)
#ifndef WX_PRECOMP
#include "wx/textctrl.h"
#endif //WX_PRECOMP
+#if wxUSE_SPINCTRL
+
#include "wx/spinbutt.h"
#include "wx/spinctrl.h"
event.Skip();
}
-
+
bool ProcessEvent(wxEvent &event)
{
// Hand button down events to wxSpinCtrl. Doesn't work.
if (event.GetEventType() == wxEVT_LEFT_DOWN && m_spin->ProcessEvent( event ))
return TRUE;
-
+
return wxTextCtrl::ProcessEvent( event );
}
{
m_spin = spin;
- SetWindowStyle(style);
+ SetWindowStyle(style | wxSP_VERTICAL);
}
protected:
- void OnSpinButton(wxSpinEvent& event)
+ void OnSpinButton(wxSpinEvent& eventSpin)
{
- m_spin->SetTextValue(event.GetPosition());
+#ifdef __WXMAC__
+ m_spin->SetTextValue(eventSpin.GetPosition());
- event.Skip();
+ wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId());
+ event.SetEventObject(m_spin);
+ event.SetInt(eventSpin.GetPosition());
+
+ m_spin->GetEventHandler()->ProcessEvent(event);
+#else
+ m_spin->SetTextValue(eventSpin.GetPosition());
+ eventSpin.Skip();
+#endif
}
private:
END_EVENT_TABLE()
IMPLEMENT_DYNAMIC_CLASS(wxSpinCtrl, wxControl)
-
+
// ============================================================================
// implementation
// ============================================================================
int initial,
const wxString& name)
{
- if ( !wxControl::Create(parent, id, pos, size, style,
+ if ( !wxControl::Create(parent, id, wxDefaultPosition, wxDefaultSize, style,
wxDefaultValidator, name) )
{
return FALSE;
}
+ // the string value overrides the numeric one (for backwards compatibility
+ // reasons and also because it is simpler to satisfy the string value which
+ // comes much sooner in the list of arguments and leave the initial
+ // parameter unspecified)
+ if ( !value.empty() )
+ {
+ long l;
+ if ( value.ToLong(&l) )
+ initial = l;
+ }
+
SetBackgroundColour(*wxRED);
m_text = new wxSpinCtrlText(this, value);
m_btn = new wxSpinCtrlButton(this, style);
{
wxControl::DoMoveWindow(x, y, width, height);
+ wxPoint p = GetParent() ?
+ GetParent()->GetClientAreaOrigin() : wxPoint(0,0);
+
// position the subcontrols inside the client area
wxSize sizeBtn = m_btn->GetSize();
wxCoord wText = width - sizeBtn.x;
- m_text->SetSize(x, y, wText, height);
- m_btn->SetSize(x + wText + MARGIN, y, -1, height);
+ m_text->SetSize(x-p.x, y-p.y, wText, height);
+#ifdef __WXMAC__
+ m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, -1);
+#else
+ m_btn->SetSize(x-p.x + wText + MARGIN, y-p.y, -1, height);
+#endif
}
// ----------------------------------------------------------------------------
m_btn->SetRange(min, max);
}
+#endif // wxUSE_SPINCTRL
#endif // !wxPort-with-native-spinctrl