added wxChoice:: and wxCombobox::GetCurrentSelection()

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

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 72c4b023f123fbddc8d34dde7610d1ba98f8c063..df409ff2a8754d9a4ba09e80d97f05f8e161c4d9 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -84,7 +84,7 @@ enum
 class ComboboxWidgetsPage : public WidgetsPage
 {
 public:
-    ComboboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    ComboboxWidgetsPage(wxBookCtrlBase *book, wxImageList *imaglist);
 
     virtual wxControl *GetWidget() const { return m_combobox; }
 
@@ -190,7 +190,7 @@ END_EVENT_TABLE()
 
 IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox"));
 
-ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
+ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrlBase *book,
                                          wxImageList *imaglist)
                   : WidgetsPage(book)
 {
@@ -536,7 +536,7 @@ void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
     if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
         wxLogMessage(_T("Combobox enter pressed (now '%s')"), s.c_str());
     else
-    wxLogMessage(_T("Combobox text changed (now '%s')"), s.c_str());
+        wxLogMessage(_T("Combobox text changed (now '%s')"), s.c_str());
 }
 
 void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
@@ -545,7 +545,7 @@ void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
     m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
 
     wxLogMessage(_T("Combobox item %ld selected"), sel);
-    
+
     wxLogMessage(_T("Combobox GetValue(): %s"), m_combobox->GetValue().c_str() );
 }