Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add tests for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2009-11-14 16:31:06 +00:00
parent a57bfed905
commit 7de8349472
2 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/widgets/filepicker.cpp
View File

@@ -198,9 +198,11 @@ void FilePickerWidgetsPage::CreatePicker()
{ {
delete m_filePicker; delete m_filePicker;
wxString path = "/home/robert/wxDesigner.tar.gz";
// pass an empty string as initial file // pass an empty string as initial file
m_filePicker = new wxFilePickerCtrl(this, PickerPage_File, m_filePicker = new wxFilePickerCtrl(this, PickerPage_File,
wxEmptyString, path,
wxT("Hello!"), wxT("*"), wxT("Hello!"), wxT("*"),
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
GetPickerStyle()); GetPickerStyle());

26
samples/widgets/slider.cpp
View File

@@ -159,7 +159,8 @@ protected:
// ------------ // ------------
// the check/radio boxes for styles // the check/radio boxes for styles
wxCheckBox *m_chkLabels, wxCheckBox *m_chkMinMaxLabels,
*m_chkValueLabel,
*m_chkInverse, *m_chkInverse,
*m_chkTicks, *m_chkTicks,
*m_chkBothSides; *m_chkBothSides;
@@ -238,7 +239,8 @@ SliderWidgetsPage::SliderWidgetsPage(WidgetsBookCtrl *book,
m_chkInverse = m_chkInverse =
m_chkTicks = m_chkTicks =
m_chkLabels = m_chkMinMaxLabels =
m_chkValueLabel =
m_chkBothSides = (wxCheckBox *)NULL; m_chkBothSides = (wxCheckBox *)NULL;
m_radioSides = (wxRadioBox *)NULL; m_radioSides = (wxRadioBox *)NULL;
@@ -257,7 +259,8 @@ void SliderWidgetsPage::CreateContent()
m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Inverse")); m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Inverse"));
m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &ticks")); m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &ticks"));
m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &labels")); m_chkMinMaxLabels = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show min/max &labels"));
m_chkValueLabel = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &value label"));
static const wxString sides[] = static const wxString sides[] =
{ {
wxT("top"), wxT("top"),
@@ -370,7 +373,8 @@ void SliderWidgetsPage::Reset()
{ {
m_chkInverse->SetValue(false); m_chkInverse->SetValue(false);
m_chkTicks->SetValue(true); m_chkTicks->SetValue(true);
m_chkLabels->SetValue(true); m_chkValueLabel->SetValue(true);
m_chkMinMaxLabels->SetValue(true);
m_chkBothSides->SetValue(false); m_chkBothSides->SetValue(false);
m_radioSides->SetSelection(SliderTicks_Top); m_radioSides->SetSelection(SliderTicks_Top);
@@ -385,9 +389,14 @@ void SliderWidgetsPage::CreateSlider()
flags |= wxSL_INVERSE; flags |= wxSL_INVERSE;
} }
if ( m_chkLabels->GetValue() ) if ( m_chkMinMaxLabels->GetValue() )
{ {
flags |= wxSL_LABELS; flags |= wxSL_MIN_MAX_LABELS;
}
if ( m_chkValueLabel->GetValue() )
{
flags |= wxSL_VALUE_LABEL;
} }
if ( m_chkTicks->GetValue() ) if ( m_chkTicks->GetValue() )
@@ -645,7 +654,8 @@ void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
{ {
event.Enable( m_chkInverse->GetValue() || event.Enable( m_chkInverse->GetValue() ||
!m_chkTicks->GetValue() || !m_chkTicks->GetValue() ||
!m_chkLabels->GetValue() || !m_chkValueLabel->GetValue() ||
!m_chkMinMaxLabels->GetValue() ||
m_chkBothSides->GetValue() || m_chkBothSides->GetValue() ||
m_radioSides->GetSelection() != SliderTicks_Top ); m_radioSides->GetSelection() != SliderTicks_Top );
} }
@@ -662,7 +672,7 @@ void SliderWidgetsPage::OnUpdateUICurValueText(wxUpdateUIEvent& event)
void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event) void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event)
{ {
event.Enable( m_chkLabels->GetValue() || m_chkTicks->GetValue() ); event.Enable( m_chkValueLabel->GetValue() || m_chkTicks->GetValue() );
} }
void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event) void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event)