X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/caea98973222b3f02904c276a66ab090c2d7f522..8064223b7b1b3657363b7a635c381b9269d95e55:/src/mac/carbon/spinctrl.cpp diff --git a/src/mac/carbon/spinctrl.cpp b/src/mac/carbon/spinctrl.cpp index a9c852b7a5..47c2332911 100644 --- a/src/mac/carbon/spinctrl.cpp +++ b/src/mac/carbon/spinctrl.cpp @@ -57,7 +57,7 @@ public: } protected: - void OnKillFocus(wxFocusEvent &event) + void OnKillFocus(wxFocusEvent& WXUNUSED(event)) { long l; if ( !GetValue().ToLong(&l) ) @@ -65,35 +65,35 @@ protected: // not a number at all return; } - + // is within range if (l < m_spin->GetMin()) l = m_spin->GetMin(); if (l > m_spin->GetMax()) l = m_spin->GetMax(); - + // Update text control wxString str; str.Printf( wxT("%d"), (int)l ); if (str != GetValue()) SetValue( str ); - + if (l != m_spin->m_oldValue) { // set value in spin button // does that trigger an event? m_spin->m_btn->SetValue( l ); - + // if not wxCommandEvent event(wxEVT_COMMAND_SPINCTRL_UPDATED, m_spin->GetId()); event.SetEventObject(m_spin); event.SetInt(l); - m_spin->GetEventHandler()->ProcessEvent(event); - + m_spin->HandleWindowEvent(event); + m_spin->m_oldValue = l; - } + } } - + void OnTextChange(wxCommandEvent& event) { int val; @@ -116,7 +116,7 @@ protected: event.SetString(m_spin->GetText()->GetValue()); event.SetInt(val); - m_spin->GetEventHandler()->ProcessEvent(event); + m_spin->HandleWindowEvent(event); } event.Skip(); @@ -166,7 +166,7 @@ protected: event.SetEventObject(m_spin); event.SetInt(pos); - m_spin->GetEventHandler()->ProcessEvent(event); + m_spin->HandleWindowEvent(event); m_spin->m_oldValue = pos; } @@ -202,7 +202,7 @@ void wxSpinCtrl::Init() { m_text = NULL; m_btn = NULL; - m_container.SetContainerWindow(this); + WX_INIT_CONTROL_CONTAINER(); } bool wxSpinCtrl::Create(wxWindow *parent, @@ -256,7 +256,7 @@ bool wxSpinCtrl::Create(wxWindow *parent, //SetSize(csize); //MacPostControlCreate(pos, csize); - SetInitialBestSize(csize); + SetInitialSize(csize); return true; }