/////////////////////////////////////////////////////////////////////////////
-// Program: wxWindows Widgets Sample
+// Program: wxWidgets Widgets Sample
// Name: spinbtn.cpp
// Purpose: Part of the widgets sample showing wxSpinButton
// Author: Vadim Zeitlin
#pragma hdrstop
#endif
+#if wxUSE_SPINBTN
+
// for all others, include the necessary headers
#ifndef WX_PRECOMP
#include "wx/log.h"
+ #include "wx/bitmap.h"
#include "wx/button.h"
#include "wx/checkbox.h"
#include "wx/radiobox.h"
class SpinBtnWidgetsPage : public WidgetsPage
{
public:
- SpinBtnWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
- virtual ~SpinBtnWidgetsPage();
+ SpinBtnWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
+ virtual ~SpinBtnWidgetsPage(){};
+
+ virtual wxControl *GetWidget() const { return m_spinbtn; }
+ virtual wxControl *GetWidget2() const { return m_spinctrl; }
+ virtual void RecreateWidget() { CreateSpin(); }
protected:
// event handlers
void OnCheckOrRadioBox(wxCommandEvent& event);
- void OnSpinBtn(wxCommandEvent& event);
- void OnSpinBtnUp(wxCommandEvent& event);
- void OnSpinBtnDown(wxCommandEvent& event);
- void OnSpinCtrl(wxCommandEvent& event);
+ void OnSpinBtn(wxSpinEvent& event);
+ void OnSpinBtnUp(wxSpinEvent& event);
+ void OnSpinBtnDown(wxSpinEvent& event);
+ void OnSpinCtrl(wxSpinEvent& event);
void OnUpdateUIValueButton(wxUpdateUIEvent& event);
void OnUpdateUIMinMaxButton(wxUpdateUIEvent& event);
EVT_SPIN_DOWN(SpinBtnPage_SpinBtn, SpinBtnWidgetsPage::OnSpinBtnDown)
EVT_SPINCTRL(SpinBtnPage_SpinCtrl, SpinBtnWidgetsPage::OnSpinCtrl)
- EVT_CHECKBOX(-1, SpinBtnWidgetsPage::OnCheckOrRadioBox)
- EVT_RADIOBOX(-1, SpinBtnWidgetsPage::OnCheckOrRadioBox)
+ EVT_CHECKBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox)
+ EVT_RADIOBOX(wxID_ANY, SpinBtnWidgetsPage::OnCheckOrRadioBox)
END_EVENT_TABLE()
// ============================================================================
IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"));
-SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxNotebook *notebook,
+SpinBtnWidgetsPage::SpinBtnWidgetsPage(wxBookCtrlBase *book,
wxImageList *imaglist)
- : WidgetsPage(notebook)
+ : WidgetsPage(book)
{
+ m_chkVert = NULL;
+ m_chkWrap = NULL;
+ m_spinbtn = NULL;
+ m_spinctrl = NULL;
+ m_textValue = NULL;
+ m_textMin = NULL;
+ m_textMax = NULL;
imaglist->Add(wxBitmap(spinbtn_xpm));
// init everything
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
- wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
- wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change spinbtn value"));
+ wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
+ _T("&Change spinbtn value"));
+
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxTextCtrl *text;
wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
SpinBtnPage_CurValueText,
&text);
- text->SetEditable(FALSE);
+ text->SetEditable(false);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
SpinBtnPage_MinText,
&m_textMin);
- m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, _T(""));
+ m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, wxEmptyString);
sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
- m_textMin->SetValue(wxString::Format(_T("%lu"), m_min));
- m_textMax->SetValue(wxString::Format(_T("%lu"), m_max));
+ m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );
+ m_textMax->SetValue( wxString::Format(_T("%d"), m_max) );
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
// right pane
wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
- sizerRight->SetMinSize(250, 0);
+ sizerRight->SetMinSize(150, 0);
m_sizerSpin = sizerRight; // save it to modify it later
Reset();
// the 3 panes panes compose the window
sizerTop->Add(sizerLeft, 0, wxGROW | (wxALL & ~wxLEFT), 10);
- sizerTop->Add(sizerMiddle, 1, wxGROW | wxALL, 10);
+ sizerTop->Add(sizerMiddle, 0, wxGROW | wxALL, 10);
sizerTop->Add(sizerRight, 1, wxGROW | (wxALL & ~wxRIGHT), 10);
// final initializations
- SetAutoLayout(TRUE);
SetSizer(sizerTop);
sizerTop->Fit(this);
}
-SpinBtnWidgetsPage::~SpinBtnWidgetsPage()
-{
-}
-
// ----------------------------------------------------------------------------
// operations
// ----------------------------------------------------------------------------
void SpinBtnWidgetsPage::Reset()
{
- m_chkVert->SetValue(TRUE);
- m_chkWrap->SetValue(FALSE);
+ m_chkVert->SetValue(true);
+ m_chkWrap->SetValue(false);
}
void SpinBtnWidgetsPage::CreateSpin()
{
- int flags = 0;
+ int flags = ms_defaultFlags;
bool isVert = m_chkVert->GetValue();
if ( isVert )
val = valOld;
}
- m_sizerSpin->Remove(m_spinbtn);
- m_sizerSpin->Remove(m_spinctrl);
+ m_sizerSpin->Detach( m_spinbtn );
+ m_sizerSpin->Detach( m_spinctrl );
// there are 3 spacers left
- m_sizerSpin->Remove((int)0);
- m_sizerSpin->Remove((int)0);
- m_sizerSpin->Remove((int)0);
+ m_sizerSpin->Remove( 0 );
+ m_sizerSpin->Remove( 0 );
+ m_sizerSpin->Remove( 0 );
delete m_spinbtn;
delete m_spinctrl;
event.Enable( !m_chkVert->GetValue() || m_chkWrap->GetValue() );
}
-void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
{
CreateSpin();
}
event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue()));
}
-void SpinBtnWidgetsPage::OnSpinBtn(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
{
int value = event.GetInt();
wxLogMessage(_T("Spin button value changed, now %d"), value);
}
-void SpinBtnWidgetsPage::OnSpinBtnUp(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
{
- wxLogMessage(_T("Spin button value incremented, will be %d (was %d)"),
- event.GetInt(), m_spinbtn->GetValue());
+ wxLogMessage( _T("Spin button value incremented, will be %d (was %d)"),
+ event.GetInt(), m_spinbtn->GetValue() );
}
-void SpinBtnWidgetsPage::OnSpinBtnDown(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
{
- wxLogMessage(_T("Spin button value decremented, will be %d (was %d)"),
- event.GetInt(), m_spinbtn->GetValue());
+ wxLogMessage( _T("Spin button value decremented, will be %d (was %d)"),
+ event.GetInt(), m_spinbtn->GetValue() );
}
-void SpinBtnWidgetsPage::OnSpinCtrl(wxCommandEvent& event)
+void SpinBtnWidgetsPage::OnSpinCtrl(wxSpinEvent& event)
{
+ if (!m_spinctrl)
+ return;
int value = event.GetInt();
wxASSERT_MSG( value == m_spinctrl->GetValue(),
wxLogMessage(_T("Spin control value changed, now %d"), value);
}
+#endif
+ // wxUSE_SPINBTN
projects / wxWidgets.git / blobdiff