// Created: 16.04.01
// Id: $Id$
// Copyright: (c) 2001 Vadim Zeitlin
-// License: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
SpinBtnPage_SpinCtrlDouble
};
+// alignment radiobox values
+enum
+{
+ Align_Left,
+ Align_Centre,
+ Align_Right
+};
+
// ----------------------------------------------------------------------------
// SpinBtnWidgetsPage
// ----------------------------------------------------------------------------
virtual ~SpinBtnWidgetsPage(){};
virtual wxControl *GetWidget() const { return m_spinbtn; }
- virtual wxControl *GetWidget2() const { return m_spinctrl; }
- virtual wxControl *GetWidget3() const { return m_spinctrldbl; }
+ virtual Widgets GetWidgets() const
+ {
+ Widgets widgets(WidgetsPage::GetWidgets());
+ widgets.push_back(m_spinctrl);
+ widgets.push_back(m_spinctrldbl);
+ return widgets;
+ }
+
virtual void RecreateWidget() { CreateSpin(); }
// lazy creation of the content
// the check/radio boxes for styles
wxCheckBox *m_chkVert,
+ *m_chkArrowKeys,
*m_chkWrap,
*m_chkProcessEnter;
+ wxRadioBox *m_radioAlign;
// the spinbtn and the spinctrl and the sizer containing them
wxSpinButton *m_spinbtn;
#define FAMILY_CTRLS NATIVE_CTRLS
#endif
-IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, _T("Spin"),
+IMPLEMENT_WIDGETS_PAGE(SpinBtnWidgetsPage, wxT("Spin"),
FAMILY_CTRLS | EDITABLE_CTRLS
);
: WidgetsPage(book, imaglist, spinbtn_xpm)
{
m_chkVert = NULL;
+ m_chkArrowKeys = NULL;
m_chkWrap = NULL;
m_chkProcessEnter = NULL;
+ m_radioAlign = NULL;
m_spinbtn = NULL;
m_spinctrl = NULL;
m_spinctrldbl = NULL;
wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
// left pane
- wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));
+ wxStaticBox *box = new wxStaticBox(this, wxID_ANY, wxT("&Set style"));
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
- m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
- m_chkWrap = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Wrap"));
+ m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Vertical"));
+ m_chkArrowKeys = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Arrow Keys"));
+ m_chkWrap = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Wrap"));
m_chkProcessEnter = CreateCheckBoxAndAddToSizer(sizerLeft,
- _T("Process &Enter"));
+ wxT("Process &Enter"));
+
+ sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
+
+ static const wxString halign[] =
+ {
+ wxT("left"),
+ wxT("centre"),
+ wxT("right"),
+ };
+
+ m_radioAlign = new wxRadioBox(this, wxID_ANY, wxT("&Text alignment"),
+ wxDefaultPosition, wxDefaultSize,
+ WXSIZEOF(halign), halign, 1);
+
+ sizerLeft->Add(m_radioAlign, 0, wxGROW | wxALL, 5);
sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
- wxButton *btn = new wxButton(this, SpinBtnPage_Reset, _T("&Reset"));
+ wxButton *btn = new wxButton(this, SpinBtnPage_Reset, wxT("&Reset"));
sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
// middle pane
wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
- _T("&Change spinbtn value"));
+ wxT("&Change spinbtn value"));
wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
wxTextCtrl *text;
- wxSizer *sizerRow = CreateSizerWithTextAndLabel(_T("Current value"),
+ wxSizer *sizerRow = CreateSizerWithTextAndLabel(wxT("Current value"),
SpinBtnPage_CurValueText,
&text);
text->SetEditable(false);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SpinBtnPage_SetValue,
- _T("Set &value"),
+ wxT("Set &value"),
SpinBtnPage_ValueText,
&m_textValue);
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
sizerRow = CreateSizerWithTextAndButton(SpinBtnPage_SetMinAndMax,
- _T("&Min and max"),
+ wxT("&Min and max"),
SpinBtnPage_MinText,
&m_textMin);
m_textMax = new wxTextCtrl(this, SpinBtnPage_MaxText, wxEmptyString);
sizerRow->Add(m_textMax, 1, wxLEFT | wxALIGN_CENTRE_VERTICAL, 5);
- m_textMin->SetValue( wxString::Format(_T("%d"), m_min) );
- m_textMax->SetValue( wxString::Format(_T("%d"), m_max) );
+ m_textMin->SetValue( wxString::Format(wxT("%d"), m_min) );
+ m_textMax->SetValue( wxString::Format(wxT("%d"), m_max) );
sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
void SpinBtnWidgetsPage::Reset()
{
m_chkVert->SetValue(true);
+ m_chkArrowKeys->SetValue(true);
m_chkWrap->SetValue(false);
m_chkProcessEnter->SetValue(false);
+ m_radioAlign->SetSelection(Align_Right);
}
void SpinBtnWidgetsPage::CreateSpin()
else
flags |= wxSP_HORIZONTAL;
+ if ( m_chkArrowKeys->GetValue() )
+ flags |= wxSP_ARROW_KEYS;
+
if ( m_chkWrap->GetValue() )
flags |= wxSP_WRAP;
if ( m_chkProcessEnter->GetValue() )
flags |= wxTE_PROCESS_ENTER;
+ int textFlags = 0;
+ switch ( m_radioAlign->GetSelection() )
+ {
+ default:
+ wxFAIL_MSG(wxT("unexpected radiobox selection"));
+ // fall through
+
+ case Align_Left:
+ textFlags |= wxALIGN_LEFT; // no-op
+ break;
+
+ case Align_Centre:
+ textFlags |= wxALIGN_CENTRE_HORIZONTAL;
+ break;
+
+ case Align_Right:
+ textFlags |= wxALIGN_RIGHT;
+ break;
+ }
+
int val = m_min;
if ( m_spinbtn )
{
val = valOld;
}
- m_sizerSpin->Detach( m_spinbtn );
- m_sizerSpin->Detach( m_spinctrl );
- m_sizerSpin->Detach( m_spinctrldbl );
-
- // there are 4 spacers left
- m_sizerSpin->Remove( 0 );
- m_sizerSpin->Remove( 0 );
- m_sizerSpin->Remove( 0 );
- m_sizerSpin->Remove( 0 );
-
- delete m_spinbtn;
- delete m_spinctrl;
- delete m_spinctrldbl;
+ m_sizerSpin->Clear(true /* delete windows */);
}
m_spinbtn = new wxSpinButton(this, SpinBtnPage_SpinBtn,
m_spinbtn->SetRange(m_min, m_max);
m_spinctrl = new wxSpinCtrl(this, SpinBtnPage_SpinCtrl,
- wxString::Format(_T("%d"), val),
+ wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
- flags,
+ flags | textFlags,
m_min, m_max, val);
m_spinctrldbl = new wxSpinCtrlDouble(this, SpinBtnPage_SpinCtrlDouble,
- wxString::Format(_T("%d"), val),
+ wxString::Format(wxT("%d"), val),
wxDefaultPosition, wxDefaultSize,
- flags,
+ flags | textFlags,
m_min, m_max, val, 0.1);
// Add spacers, labels and spin controls to the sizer.
!m_textMax->GetValue().ToLong(&maxNew) ||
minNew > maxNew )
{
- wxLogWarning(_T("Invalid min/max values for the spinbtn."));
+ wxLogWarning(wxT("Invalid min/max values for the spinbtn."));
return;
}
long val;
if ( !m_textValue->GetValue().ToLong(&val) || !IsValidValue(val) )
{
- wxLogWarning(_T("Invalid spinbtn value."));
+ wxLogWarning(wxT("Invalid spinbtn value."));
return;
}
void SpinBtnWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
{
- event.SetText( wxString::Format(_T("%d"), m_spinbtn->GetValue()));
+ event.SetText( wxString::Format(wxT("%d"), m_spinbtn->GetValue()));
}
void SpinBtnWidgetsPage::OnSpinBtn(wxSpinEvent& event)
int value = event.GetInt();
wxASSERT_MSG( value == m_spinbtn->GetValue(),
- _T("spinbtn value should be the same") );
+ wxT("spinbtn value should be the same") );
- wxLogMessage(_T("Spin button value changed, now %d"), value);
+ wxLogMessage(wxT("Spin button value changed, now %d"), value);
}
void SpinBtnWidgetsPage::OnSpinBtnUp(wxSpinEvent& event)
{
- wxLogMessage( _T("Spin button value incremented, will be %d (was %d)"),
+ wxLogMessage( wxT("Spin button value incremented, will be %d (was %d)"),
event.GetInt(), m_spinbtn->GetValue() );
}
void SpinBtnWidgetsPage::OnSpinBtnDown(wxSpinEvent& event)
{
- wxLogMessage( _T("Spin button value decremented, will be %d (was %d)"),
+ wxLogMessage( wxT("Spin button value decremented, will be %d (was %d)"),
event.GetInt(), m_spinbtn->GetValue() );
}
int value = event.GetInt();
wxASSERT_MSG( value == m_spinctrl->GetValue(),
- _T("spinctrl value should be the same") );
+ wxT("spinctrl value should be the same") );
- wxLogMessage(_T("Spin control value changed, now %d"), value);
+ wxLogMessage(wxT("Spin control value changed, now %d"), value);
}
void SpinBtnWidgetsPage::OnSpinCtrlDouble(wxSpinDoubleEvent& event)
{
double value = event.GetValue();
- wxLogMessage(_T("Spin control value changed, now %g"), value);
+ wxLogMessage(wxT("Spin control value changed, now %g"), value);
}
void SpinBtnWidgetsPage::OnSpinText(wxCommandEvent& event)
{
- wxLogMessage(_T("Text changed in spin control, now \"%s\""),
+ wxLogMessage(wxT("Text changed in spin control, now \"%s\""),
event.GetString().c_str());
}
projects / wxWidgets.git / blobdiff