Added inverse checkbox to test sliders with wxSL_INVERSE style
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31570 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -143,6 +143,7 @@ protected:
|
|||||||
// the check/radio boxes for styles
|
// the check/radio boxes for styles
|
||||||
wxCheckBox *m_chkLabels,
|
wxCheckBox *m_chkLabels,
|
||||||
*m_chkVert,
|
*m_chkVert,
|
||||||
|
*m_chkInverse,
|
||||||
*m_chkTicks,
|
*m_chkTicks,
|
||||||
*m_chkBothSides;
|
*m_chkBothSides;
|
||||||
|
|
||||||
@@ -210,6 +211,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book,
|
|||||||
m_max = 100;
|
m_max = 100;
|
||||||
|
|
||||||
m_chkVert =
|
m_chkVert =
|
||||||
|
m_chkInverse =
|
||||||
m_chkTicks =
|
m_chkTicks =
|
||||||
m_chkLabels =
|
m_chkLabels =
|
||||||
m_chkBothSides = (wxCheckBox *)NULL;
|
m_chkBothSides = (wxCheckBox *)NULL;
|
||||||
@@ -226,6 +228,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book,
|
|||||||
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
|
wxSizer *sizerLeft = new wxStaticBoxSizer(box, wxVERTICAL);
|
||||||
|
|
||||||
m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
|
m_chkVert = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Vertical"));
|
||||||
|
m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Inverse"));
|
||||||
m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks"));
|
m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &ticks"));
|
||||||
m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels"));
|
m_chkLabels = CreateCheckBoxAndAddToSizer(sizerLeft, _T("Show &labels"));
|
||||||
static const wxString sides[] =
|
static const wxString sides[] =
|
||||||
@@ -324,6 +327,7 @@ SliderWidgetsPage::SliderWidgetsPage(wxBookCtrl *book,
|
|||||||
void SliderWidgetsPage::Reset()
|
void SliderWidgetsPage::Reset()
|
||||||
{
|
{
|
||||||
m_chkVert->SetValue(false);
|
m_chkVert->SetValue(false);
|
||||||
|
m_chkInverse->SetValue(false);
|
||||||
m_chkTicks->SetValue(true);
|
m_chkTicks->SetValue(true);
|
||||||
m_chkLabels->SetValue(true);
|
m_chkLabels->SetValue(true);
|
||||||
m_chkBothSides->SetValue(false);
|
m_chkBothSides->SetValue(false);
|
||||||
@@ -341,6 +345,11 @@ void SliderWidgetsPage::CreateSlider()
|
|||||||
else
|
else
|
||||||
flags |= wxSL_HORIZONTAL;
|
flags |= wxSL_HORIZONTAL;
|
||||||
|
|
||||||
|
if ( m_chkInverse->GetValue() )
|
||||||
|
{
|
||||||
|
flags |= wxSL_INVERSE;
|
||||||
|
}
|
||||||
|
|
||||||
if ( m_chkLabels->GetValue() )
|
if ( m_chkLabels->GetValue() )
|
||||||
{
|
{
|
||||||
flags |= wxSL_LABELS;
|
flags |= wxSL_LABELS;
|
||||||
@@ -530,6 +539,7 @@ void SliderWidgetsPage::OnUpdateUIMinMaxButton(wxUpdateUIEvent& event)
|
|||||||
void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
|
void SliderWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
|
||||||
{
|
{
|
||||||
event.Enable( m_chkVert->GetValue() ||
|
event.Enable( m_chkVert->GetValue() ||
|
||||||
|
m_chkInverse->GetValue() ||
|
||||||
!m_chkTicks->GetValue() ||
|
!m_chkTicks->GetValue() ||
|
||||||
!m_chkLabels->GetValue() ||
|
!m_chkLabels->GetValue() ||
|
||||||
m_chkBothSides->GetValue() );
|
m_chkBothSides->GetValue() );
|
||||||
@@ -596,10 +606,11 @@ void SliderWidgetsPage::OnSlider(wxScrollEvent& event)
|
|||||||
|
|
||||||
static int s_numSliderEvents = 0;
|
static int s_numSliderEvents = 0;
|
||||||
|
|
||||||
wxLogMessage(wxT("Slider event #%d: %s (pos = %d)"),
|
wxLogMessage(wxT("Slider event #%d: %s (pos = %d, int value = %d)"),
|
||||||
s_numSliderEvents++,
|
s_numSliderEvents++,
|
||||||
eventNames[index],
|
eventNames[index],
|
||||||
event.GetPosition());
|
event.GetPosition(),
|
||||||
|
event.GetInt());
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // wxUSE_SLIDER
|
#endif // wxUSE_SLIDER
|
||||||
|
Reference in New Issue
Block a user