extending docs according #9713

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

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 9bfdc111571af0a9d9fedce8f3963b03f6d655c5..5916101b6ed43736c08899b2b4acdd88091cbf33 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -41,6 +41,7 @@
 
 #include "wx/sizer.h"
 
 
 #include "wx/sizer.h"
 

+#include "itemcontainer.h"

 #include "widgets.h"
 #if 1
 #include "icons/combobox.xpm"
 #include "widgets.h"
 #if 1
 #include "icons/combobox.xpm"


@@ -52,8 +53,10 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    ComboPage_Reset = 100,
+    ComboPage_Reset = wxID_HIGHEST,
+    ComboPage_SetCurrent,

     ComboPage_CurText,
     ComboPage_CurText,

+    ComboPage_InsertionPointText,

     ComboPage_Insert,
     ComboPage_InsertText,
     ComboPage_Add,
     ComboPage_Insert,
     ComboPage_InsertText,
     ComboPage_Add,


@@ -66,7 +69,10 @@ enum
     ComboPage_Delete,
     ComboPage_DeleteText,
     ComboPage_DeleteSel,
     ComboPage_Delete,
     ComboPage_DeleteText,
     ComboPage_DeleteSel,

-    ComboPage_Combo
+    ComboPage_SetValue,
+    ComboPage_SetValueText,
+    ComboPage_Combo,
+    ComboPage_ContainerTests

 };
 
 // kinds of comboboxes
 };
 
 // kinds of comboboxes


@@ -81,12 +87,18 @@ enum
 // ComboboxWidgetsPage
 // ----------------------------------------------------------------------------
 
 // ComboboxWidgetsPage
 // ----------------------------------------------------------------------------
 

-class ComboboxWidgetsPage : public WidgetsPage
+class ComboboxWidgetsPage : public ItemContainerWidgetsPage

 {
 public:
 {
 public:

-    ComboboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist);
+    ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);

 
     virtual wxControl *GetWidget() const { return m_combobox; }
 
     virtual wxControl *GetWidget() const { return m_combobox; }

+    virtual wxTextEntryBase *GetTextEntry() const { return m_combobox; }
+    virtual wxItemContainer* GetContainer() const { return m_combobox; }
+    virtual void RecreateWidget() { CreateCombo(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

 
 protected:
     // event handlers
 
 protected:
     // event handlers


@@ -99,13 +111,15 @@ protected:
     void OnButtonAdd(wxCommandEvent& event);
     void OnButtonAddSeveral(wxCommandEvent& event);
     void OnButtonAddMany(wxCommandEvent& event);
     void OnButtonAdd(wxCommandEvent& event);
     void OnButtonAddSeveral(wxCommandEvent& event);
     void OnButtonAddMany(wxCommandEvent& event);

+    void OnButtonSetValue(wxCommandEvent& event);
+    void OnButtonSetCurrent(wxCommandEvent& event);

 
     void OnComboBox(wxCommandEvent& event);
     void OnComboText(wxCommandEvent& event);
 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 
 
     void OnComboBox(wxCommandEvent& event);
     void OnComboText(wxCommandEvent& event);
 
     void OnCheckOrRadioBox(wxCommandEvent& event);
 

-    void OnUpdateUICurText(wxUpdateUIEvent& event);
+    void OnUpdateUIInsertionPointText(wxUpdateUIEvent& event);

 
     void OnUpdateUIInsert(wxUpdateUIEvent& event);
     void OnUpdateUIAddSeveral(wxUpdateUIEvent& event);
 
     void OnUpdateUIInsert(wxUpdateUIEvent& event);
     void OnUpdateUIAddSeveral(wxUpdateUIEvent& event);


@@ -113,6 +127,7 @@ protected:
     void OnUpdateUIDeleteButton(wxUpdateUIEvent& event);
     void OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event);
     void OnUpdateUIResetButton(wxUpdateUIEvent& event);
     void OnUpdateUIDeleteButton(wxUpdateUIEvent& event);
     void OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event);
     void OnUpdateUIResetButton(wxUpdateUIEvent& event);

+    void OnUpdateUISetCurrent(wxUpdateUIEvent& event);

 
     // reset the combobox parameters
     void Reset();
 
     // reset the combobox parameters
     void Reset();


@@ -128,7 +143,8 @@ protected:
 
     // the checkboxes for styles
     wxCheckBox *m_chkSort,
 
     // the checkboxes for styles
     wxCheckBox *m_chkSort,

-               *m_chkReadonly;
+               *m_chkReadonly,
+               *m_chkFilename;

 
     // the combobox itself and the sizer it is in
     wxComboBox *m_combobox;
 
     // the combobox itself and the sizer it is in
     wxComboBox *m_combobox;


@@ -138,7 +154,9 @@ protected:
     wxTextCtrl *m_textInsert,
                *m_textAdd,
                *m_textChange,
     wxTextCtrl *m_textInsert,
                *m_textAdd,
                *m_textChange,

-               *m_textDelete;
+               *m_textSetValue,
+               *m_textDelete,
+               *m_textCur;

 
 private:
     DECLARE_EVENT_TABLE()
 
 private:
     DECLARE_EVENT_TABLE()


@@ -159,12 +177,15 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage)
     EVT_BUTTON(ComboPage_Add, ComboboxWidgetsPage::OnButtonAdd)
     EVT_BUTTON(ComboPage_AddSeveral, ComboboxWidgetsPage::OnButtonAddSeveral)
     EVT_BUTTON(ComboPage_AddMany, ComboboxWidgetsPage::OnButtonAddMany)
     EVT_BUTTON(ComboPage_Add, ComboboxWidgetsPage::OnButtonAdd)
     EVT_BUTTON(ComboPage_AddSeveral, ComboboxWidgetsPage::OnButtonAddSeveral)
     EVT_BUTTON(ComboPage_AddMany, ComboboxWidgetsPage::OnButtonAddMany)

+    EVT_BUTTON(ComboPage_SetValue, ComboboxWidgetsPage::OnButtonSetValue)
+    EVT_BUTTON(ComboPage_SetCurrent, ComboboxWidgetsPage::OnButtonSetCurrent)
+    EVT_BUTTON(ComboPage_ContainerTests, ItemContainerWidgetsPage::OnButtonTestItemContainer)

 
     EVT_TEXT_ENTER(ComboPage_InsertText, ComboboxWidgetsPage::OnButtonInsert)
     EVT_TEXT_ENTER(ComboPage_AddText, ComboboxWidgetsPage::OnButtonAdd)
     EVT_TEXT_ENTER(ComboPage_DeleteText, ComboboxWidgetsPage::OnButtonDelete)
 
 
     EVT_TEXT_ENTER(ComboPage_InsertText, ComboboxWidgetsPage::OnButtonInsert)
     EVT_TEXT_ENTER(ComboPage_AddText, ComboboxWidgetsPage::OnButtonAdd)
     EVT_TEXT_ENTER(ComboPage_DeleteText, ComboboxWidgetsPage::OnButtonDelete)
 

-    EVT_UPDATE_UI(ComboPage_CurText, ComboboxWidgetsPage::OnUpdateUICurText)
+    EVT_UPDATE_UI(ComboPage_InsertionPointText, ComboboxWidgetsPage::OnUpdateUIInsertionPointText)

 
     EVT_UPDATE_UI(ComboPage_Reset, ComboboxWidgetsPage::OnUpdateUIResetButton)
     EVT_UPDATE_UI(ComboPage_Insert, ComboboxWidgetsPage::OnUpdateUIInsert)
 
     EVT_UPDATE_UI(ComboPage_Reset, ComboboxWidgetsPage::OnUpdateUIResetButton)
     EVT_UPDATE_UI(ComboPage_Insert, ComboboxWidgetsPage::OnUpdateUIInsert)


@@ -175,6 +196,7 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage)
     EVT_UPDATE_UI(ComboPage_Change, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ComboPage_ChangeText, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ComboPage_DeleteSel, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ComboPage_Change, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ComboPage_ChangeText, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)
     EVT_UPDATE_UI(ComboPage_DeleteSel, ComboboxWidgetsPage::OnUpdateUIDeleteSelButton)

+    EVT_UPDATE_UI(ComboPage_SetCurrent, ComboboxWidgetsPage::OnUpdateUISetCurrent)

 
     EVT_COMBOBOX(ComboPage_Combo, ComboboxWidgetsPage::OnComboBox)
     EVT_TEXT(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
 
     EVT_COMBOBOX(ComboPage_Combo, ComboboxWidgetsPage::OnComboBox)
     EVT_TEXT(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)


@@ -188,21 +210,31 @@ END_EVENT_TABLE()
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

-IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox"));
+#if defined(__WXUNIVERSAL__)
+    #define FAMILY_CTRLS UNIVERSAL_CTRLS
+#else
+    #define FAMILY_CTRLS NATIVE_CTRLS
+#endif
+
+IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox"),
+                       FAMILY_CTRLS | WITH_ITEMS_CTRLS | COMBO_CTRLS
+                       );

 
 

-ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
+ComboboxWidgetsPage::ComboboxWidgetsPage(WidgetsBookCtrl *book,

                                          wxImageList *imaglist)
                                          wxImageList *imaglist)

-                  : WidgetsPage(book)
+                  : ItemContainerWidgetsPage(book, imaglist, combobox_xpm)

 {
     // init everything
     m_chkSort =
 {
     // init everything
     m_chkSort =

-    m_chkReadonly = (wxCheckBox *)NULL;
+    m_chkReadonly =
+    m_chkFilename = (wxCheckBox *)NULL;

 
     m_combobox = (wxComboBox *)NULL;
     m_sizerCombo = (wxSizer *)NULL;
 
     m_combobox = (wxComboBox *)NULL;
     m_sizerCombo = (wxSizer *)NULL;

+}

 
 

-    imaglist->Add(wxBitmap(combobox_xpm));
-
+void ComboboxWidgetsPage::CreateContent()
+{

     /*
        What we create here is a frame having 3 panes: style pane is the
        leftmost one, in the middle the pane with buttons allowing to perform
     /*
        What we create here is a frame having 3 panes: style pane is the
        leftmost one, in the middle the pane with buttons allowing to perform


@@ -231,6 +263,8 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
 
     m_chkSort = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Sort items"));
     m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Read only"));
 
     m_chkSort = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Sort items"));
     m_chkReadonly = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&Read only"));

+    m_chkFilename = CreateCheckBoxAndAddToSizer(sizerLeft, _T("&File name"));
+    m_chkFilename->Disable(); // not implemented yet

 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
     sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);
 
     sizerLeft->Add(5, 5, 0, wxGROW | wxALL, 5); // spacer
     sizerLeft->Add(m_radioKind, 0, wxGROW | wxALL, 5);


@@ -245,9 +279,16 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
 
     wxSizer *sizerRow;
 
 
     wxSizer *sizerRow;
 

+    sizerRow = CreateSizerWithTextAndButton(ComboPage_SetCurrent,
+                                            _T("Current &selection"),
+                                            ComboPage_CurText,
+                                            &m_textCur);
+
+    sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+

     wxTextCtrl *text;
     wxTextCtrl *text;

-    sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"),
-                                           ComboPage_CurText,
+    sizerRow = CreateSizerWithTextAndLabel(_T("Insertion Point"),
+                                           ComboPage_InsertionPointText,

                                            &text);
     text->SetEditable(false);
 
                                            &text);
     text->SetEditable(false);
 


@@ -289,13 +330,24 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
     btn = new wxButton(this, ComboPage_Clear, _T("&Clear"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 
     btn = new wxButton(this, ComboPage_Clear, _T("&Clear"));
     sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
 

+    sizerRow = CreateSizerWithTextAndButton(ComboPage_SetValue,
+                                            _T("SetValue"),
+                                            ComboPage_SetValueText,
+                                            &m_textSetValue);
+    sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
+    btn = new wxButton(this, ComboPage_ContainerTests, _T("Run &tests"));
+    sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5);
+
+
+

     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
     m_combobox = new wxComboBox(this, ComboPage_Combo, wxEmptyString,
                                 wxDefaultPosition, wxDefaultSize,
                                 0, NULL,
                                 0);
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
     m_combobox = new wxComboBox(this, ComboPage_Combo, wxEmptyString,
                                 wxDefaultPosition, wxDefaultSize,
                                 0, NULL,
                                 0);

-    sizerRight->Add(m_combobox, 1, wxGROW | wxALL, 5);
+    sizerRight->Add(m_combobox, 0, wxGROW | wxALL, 5);

     sizerRight->SetMinSize(150, 0);
     m_sizerCombo = sizerRight; // save it to modify it later
 
     sizerRight->SetMinSize(150, 0);
     m_sizerCombo = sizerRight; // save it to modify it later
 


@@ -308,8 +360,6 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book,
     Reset();
 
     SetSizer(sizerTop);
     Reset();
 
     SetSizer(sizerTop);

-
-    sizerTop->Fit(this);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -320,11 +370,12 @@ void ComboboxWidgetsPage::Reset()
 {
     m_chkSort->SetValue(false);
     m_chkReadonly->SetValue(false);
 {
     m_chkSort->SetValue(false);
     m_chkReadonly->SetValue(false);

+    m_chkFilename->SetValue(false);

 }
 
 void ComboboxWidgetsPage::CreateCombo()
 {
 }
 
 void ComboboxWidgetsPage::CreateCombo()
 {

-    int flags = 0;
+    int flags = ms_defaultFlags;

 
     if ( m_chkSort->GetValue() )
         flags |= wxCB_SORT;
 
     if ( m_chkSort->GetValue() )
         flags |= wxCB_SORT;


@@ -352,8 +403,8 @@ void ComboboxWidgetsPage::CreateCombo()
     wxArrayString items;
     if ( m_combobox )
     {
     wxArrayString items;
     if ( m_combobox )
     {

-        int count = m_combobox->GetCount();
-        for ( int n = 0; n < count; n++ )
+        unsigned int count = m_combobox->GetCount();
+        for ( unsigned int n = 0; n < count; n++ )

         {
             items.Add(m_combobox->GetString(n));
         }
         {
             items.Add(m_combobox->GetString(n));
         }


@@ -367,13 +418,18 @@ void ComboboxWidgetsPage::CreateCombo()
                                 0, NULL,
                                 flags);
 
                                 0, NULL,
                                 flags);
 

-    size_t count = items.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+#if 0
+    if ( m_chkFilename->GetValue() )
+        ;
+#endif // TODO
+
+    unsigned int count = items.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

     {
         m_combobox->Append(items[n]);
     }
 
     {
         m_combobox->Append(items[n]);
     }
 

-    m_sizerCombo->Add(m_combobox, 1, wxGROW | wxALL, 5);
+    m_sizerCombo->Add(m_combobox, 0, wxGROW | wxALL, 5);

     m_sizerCombo->Layout();
 }
 
     m_sizerCombo->Layout();
 }
 


@@ -391,7 +447,7 @@ void ComboboxWidgetsPage::OnButtonReset(wxCommandEvent& WXUNUSED(event))
 void ComboboxWidgetsPage::OnButtonChange(wxCommandEvent& WXUNUSED(event))
 {
     int sel = m_combobox->GetSelection();
 void ComboboxWidgetsPage::OnButtonChange(wxCommandEvent& WXUNUSED(event))
 {
     int sel = m_combobox->GetSelection();

-    if ( sel != -1 )
+    if ( sel != wxNOT_FOUND )

     {
 #ifndef __WXGTK__
         m_combobox->SetString(sel, m_textChange->GetValue());
     {
 #ifndef __WXGTK__
         m_combobox->SetString(sel, m_textChange->GetValue());


@@ -405,7 +461,7 @@ void ComboboxWidgetsPage::OnButtonDelete(wxCommandEvent& WXUNUSED(event))
 {
     unsigned long n;
     if ( !m_textDelete->GetValue().ToULong(&n) ||
 {
     unsigned long n;
     if ( !m_textDelete->GetValue().ToULong(&n) ||

-            (n >= (unsigned)m_combobox->GetCount()) )
+            (n >= m_combobox->GetCount()) )

     {
         return;
     }
     {
         return;
     }


@@ -416,12 +472,18 @@ void ComboboxWidgetsPage::OnButtonDelete(wxCommandEvent& WXUNUSED(event))
 void ComboboxWidgetsPage::OnButtonDeleteSel(wxCommandEvent& WXUNUSED(event))
 {
     int sel = m_combobox->GetSelection();
 void ComboboxWidgetsPage::OnButtonDeleteSel(wxCommandEvent& WXUNUSED(event))
 {
     int sel = m_combobox->GetSelection();

-    if ( sel != -1 )
+    if ( sel != wxNOT_FOUND )

     {
         m_combobox->Delete(sel);
     }
 }
 
     {
         m_combobox->Delete(sel);
     }
 }
 

+void ComboboxWidgetsPage::OnButtonSetValue(wxCommandEvent& WXUNUSED(event))
+{
+    wxString value = m_textSetValue->GetValue();
+    m_combobox->SetValue( value );
+}
+

 void ComboboxWidgetsPage::OnButtonClear(wxCommandEvent& WXUNUSED(event))
 {
     m_combobox->Clear();
 void ComboboxWidgetsPage::OnButtonClear(wxCommandEvent& WXUNUSED(event))
 {
     m_combobox->Clear();


@@ -465,6 +527,15 @@ void ComboboxWidgetsPage::OnButtonAddMany(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

+void ComboboxWidgetsPage::OnButtonSetCurrent(wxCommandEvent& WXUNUSED(event))
+{
+    long n;
+    if ( !m_textCur->GetValue().ToLong(&n) )
+        return;
+
+    m_combobox->SetSelection(n);
+}
+

 void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event))
 {
     m_combobox->Append(_T("First"));
 void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event))
 {
     m_combobox->Append(_T("First"));


@@ -472,16 +543,17 @@ void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event))
     m_combobox->Append(_T("and the last (very very very very very very very very very very long) one"));
 }
 
     m_combobox->Append(_T("and the last (very very very very very very very very very very long) one"));
 }
 

-void ComboboxWidgetsPage::OnUpdateUICurText(wxUpdateUIEvent& event)
+void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event)

 {
     if (m_combobox)
 {
     if (m_combobox)

-        event.SetText( wxString::Format(_T("%d"), m_combobox->GetSelection()) );
+        event.SetText( wxString::Format(_T("%ld"), m_combobox->GetInsertionPoint()) );

 }
 
 void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {
 }
 
 void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {

-    if (m_combobox)
-        event.Enable( m_chkSort->GetValue() || m_chkReadonly->GetValue() );
+    event.Enable( m_chkSort->GetValue() ||
+                    m_chkReadonly->GetValue() ||
+                        m_chkFilename->GetValue() );

 }
 
 void ComboboxWidgetsPage::OnUpdateUIInsert(wxUpdateUIEvent& event)
 }
 
 void ComboboxWidgetsPage::OnUpdateUIInsert(wxUpdateUIEvent& event)


@@ -508,7 +580,7 @@ void ComboboxWidgetsPage::OnUpdateUIDeleteButton(wxUpdateUIEvent& event)
 void ComboboxWidgetsPage::OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event)
 {
     if (m_combobox)
 void ComboboxWidgetsPage::OnUpdateUIDeleteSelButton(wxUpdateUIEvent& event)
 {
     if (m_combobox)

-        event.Enable(m_combobox->GetSelection() != -1);
+        event.Enable(m_combobox->GetSelection() != wxNOT_FOUND);

 }
 
 void ComboboxWidgetsPage::OnUpdateUIClearButton(wxUpdateUIEvent& event)
 }
 
 void ComboboxWidgetsPage::OnUpdateUIClearButton(wxUpdateUIEvent& event)


@@ -523,6 +595,14 @@ void ComboboxWidgetsPage::OnUpdateUIAddSeveral(wxUpdateUIEvent& event)
         event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT));
 }
 
         event.Enable(!(m_combobox->GetWindowStyle() & wxCB_SORT));
 }
 

+void ComboboxWidgetsPage::OnUpdateUISetCurrent(wxUpdateUIEvent& event)
+{
+    long n;
+    event.Enable( m_textCur->GetValue().ToLong(&n) &&
+                    (n == wxNOT_FOUND ||
+                        (n >= 0 && (unsigned)n < m_combobox->GetCount())) );
+}
+

 void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
 {
     if (!m_combobox)
 void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
 {
     if (!m_combobox)


@@ -536,15 +616,19 @@ void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event)
     if (event.GetEventType() == wxEVT_COMMAND_TEXT_ENTER)
         wxLogMessage(_T("Combobox enter pressed (now '%s')"), s.c_str());
     else
     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)
 {
     long sel = event.GetInt();
 }
 
 void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
 {
     long sel = event.GetInt();

-    m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
+    const wxString selstr = wxString::Format(_T("%ld"), sel);
+    m_textDelete->SetValue(selstr);
+    m_textCur->SetValue(selstr);

 
     wxLogMessage(_T("Combobox item %ld selected"), sel);
 
     wxLogMessage(_T("Combobox item %ld selected"), sel);

+
+    wxLogMessage(_T("Combobox GetValue(): %s"), m_combobox->GetValue().c_str() );

 }
 
 void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))
 }
 
 void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))