Add tests for wxSL_MIN_MAX_LABELS and wxSL_VALUE_LABEL

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@62643 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/widgets/filepicker.cpp b/samples/widgets/filepicker.cpp
index ec6f48f0146f7a88d3a9103b0f1ed86d22907f6e..501d1a4f669c25c55de4ae8bcade64a7ec47158e 100644 (file)
--- a/samples/widgets/filepicker.cpp
+++ b/samples/widgets/filepicker.cpp
@@ -197,10 +197,12 @@ void FilePickerWidgetsPage::CreateContent()
 void FilePickerWidgetsPage::CreatePicker()
 {
     delete m_filePicker;
 void FilePickerWidgetsPage::CreatePicker()
 {
     delete m_filePicker;

+    
+    wxString path = "/home/robert/wxDesigner.tar.gz";

 
     // pass an empty string as initial file
     m_filePicker = new wxFilePickerCtrl(this, PickerPage_File,
 
     // pass an empty string as initial file
     m_filePicker = new wxFilePickerCtrl(this, PickerPage_File,

-                                        wxEmptyString,
+                                        path,

                                         wxT("Hello!"), wxT("*"),
                                         wxDefaultPosition, wxDefaultSize,
                                         GetPickerStyle());
                                         wxT("Hello!"), wxT("*"),
                                         wxDefaultPosition, wxDefaultSize,
                                         GetPickerStyle());

diff --git a/samples/widgets/slider.cpp b/samples/widgets/slider.cpp
index 8f151f8b90a6498e5afa6cc39e3df7f2db390b92..ef805895c8a347b96abf8624b82a98185c3d19a3 100644 (file)
--- a/samples/widgets/slider.cpp
+++ b/samples/widgets/slider.cpp
@@ -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_chkTicks,
                *m_chkBothSides;
                *m_chkInverse,
                *m_chkTicks,
                *m_chkBothSides;


@@ -238,7 +239,8 @@ SliderWidgetsPage::SliderWidgetsPage(WidgetsBookCtrl *book,
 
     m_chkInverse =
     m_chkTicks =
 
     m_chkInverse =
     m_chkTicks =

-    m_chkLabels =
+    m_chkMinMaxLabels =
+    m_chkValueLabel =

     m_chkBothSides = (wxCheckBox *)NULL;
 
     m_radioSides = (wxRadioBox *)NULL;
     m_chkBothSides = (wxCheckBox *)NULL;
 
     m_radioSides = (wxRadioBox *)NULL;


@@ -257,7 +259,8 @@ void SliderWidgetsPage::CreateContent()
 
     m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Inverse"));
     m_chkTicks = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("Show &ticks"));
 
     m_chkInverse = CreateCheckBoxAndAddToSizer(sizerLeft, wxT("&Inverse"));
     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[] =
     {
         wxT("top"),
     static const wxString sides[] =
     {
         wxT("top"),


@@ -370,7 +373,8 @@ void SliderWidgetsPage::Reset()
 {
     m_chkInverse->SetValue(false);
     m_chkTicks->SetValue(true);
 {
     m_chkInverse->SetValue(false);
     m_chkTicks->SetValue(true);

-    m_chkLabels->SetValue(true);
+    m_chkValueLabel->SetValue(true);
+    m_chkMinMaxLabels->SetValue(true);

     m_chkBothSides->SetValue(false);
 
     m_radioSides->SetSelection(SliderTicks_Top);
     m_chkBothSides->SetValue(false);
 
     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() ||
                   !m_chkTicks->GetValue() ||
 {
     event.Enable( m_chkInverse->GetValue() ||
                   !m_chkTicks->GetValue() ||

-                  !m_chkLabels->GetValue() ||
+                  !m_chkValueLabel->GetValue() ||
+                  !m_chkMinMaxLabels->GetValue() ||

                   m_chkBothSides->GetValue() ||
                   m_radioSides->GetSelection() != SliderTicks_Top );
 }
                   m_chkBothSides->GetValue() ||
                   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)