A few tweaks and cleanups

[wxWidgets.git] / samples / widgets / combobox.cpp

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index b4a4ecc9610e6d6e6dc8dc6e64d81451a280bfd6..5570f43f1f4cfb7ed4422f3c8d791c6a0e55582c 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -41,7 +41,7 @@
 #include "wx/sizer.h"
 
 #include "widgets.h"
 #include "wx/sizer.h"
 
 #include "widgets.h"

-
+#if 1

 #include "icons/combobox.xpm"
 
 // ----------------------------------------------------------------------------
 #include "icons/combobox.xpm"
 
 // ----------------------------------------------------------------------------


@@ -277,7 +277,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
                                 0, NULL,
                                 0);
     sizerRight->Add(m_combobox, 1, wxGROW | wxALL, 5);
                                 0, NULL,
                                 0);
     sizerRight->Add(m_combobox, 1, wxGROW | wxALL, 5);

-    sizerRight->SetMinSize(250, 0);
+    sizerRight->SetMinSize(150, 0);

     m_sizerCombo = sizerRight; // save it to modify it later
 
     // the 3 panes panes compose the window
     m_sizerCombo = sizerRight; // save it to modify it later
 
     // the 3 panes panes compose the window


@@ -457,7 +457,7 @@ void ComboboxWidgetsPage::OnUpdateUIDeleteButton(wxUpdateUIEvent& event)
     {
       unsigned long n;
       event.Enable(m_textDelete->GetValue().ToULong(&n) &&
     {
       unsigned long n;
       event.Enable(m_textDelete->GetValue().ToULong(&n) &&

-                (n < (unsigned)m_combobox->GetCount()));
+        (n < (unsigned)m_combobox->GetCount()));

     }
 }
 
     }
 }
 


@@ -482,8 +482,8 @@ void ComboboxWidgetsPage::OnUpdateUIAddSeveral(wxUpdateUIEvent& event)
 void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
 {
     if (!m_combobox)
 void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
 {
     if (!m_combobox)

-       return;
-    
+        return;
+

     wxString s = event.GetString();
 
     wxASSERT_MSG( s == m_combobox->GetValue(),
     wxString s = event.GetString();
 
     wxASSERT_MSG( s == m_combobox->GetValue(),


@@ -507,3 +507,4 @@ void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
 
 #endif //wxUSE_COMBOBOX
 
 
 #endif //wxUSE_COMBOBOX
 

+#endif