Improvements for building minimal builds and new ports: wxUSE_* usage and minor cleaning.

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

diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp
index 0fb153f66705c4d4914609b2054360f2cbbc4ae1..2ac76337af76d209f2b99a49c6627040a3dc7e33 100644 (file)
--- a/samples/widgets/combobox.cpp
+++ b/samples/widgets/combobox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        combobox.cpp
 // Purpose:     Part of the widgets sample showing wxComboBox
 // Author:      Vadim Zeitlin
 // Name:        combobox.cpp
 // Purpose:     Part of the widgets sample showing wxComboBox
 // Author:      Vadim Zeitlin


@@ -52,8 +52,9 @@
 // control ids
 enum
 {
 // control ids
 enum
 {

-    ComboPage_Reset = 100,
+    ComboPage_Reset = wxID_HIGHEST,

     ComboPage_CurText,
     ComboPage_CurText,

+    ComboPage_InsertionPointText,

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


@@ -84,7 +85,13 @@ enum
 class ComboboxWidgetsPage : public WidgetsPage
 {
 public:
 class ComboboxWidgetsPage : public WidgetsPage
 {
 public:

-    ComboboxWidgetsPage(wxNotebook *notebook, wxImageList *imaglist);
+    ComboboxWidgetsPage(WidgetsBookCtrl *book, wxImageList *imaglist);
+
+    virtual wxControl *GetWidget() const { return m_combobox; }
+    virtual void RecreateWidget() { CreateCombo(); }
+
+    // lazy creation of the content
+    virtual void CreateContent();

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


@@ -104,6 +111,7 @@ protected:
     void OnCheckOrRadioBox(wxCommandEvent& event);
 
     void OnUpdateUICurText(wxUpdateUIEvent& 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);


@@ -163,6 +171,7 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage)
     EVT_TEXT_ENTER(ComboPage_DeleteText, ComboboxWidgetsPage::OnButtonDelete)
 
     EVT_UPDATE_UI(ComboPage_CurText, ComboboxWidgetsPage::OnUpdateUICurText)
     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)


@@ -178,19 +187,27 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage)
     EVT_TEXT(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
     EVT_TEXT_ENTER(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
 
     EVT_TEXT(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
     EVT_TEXT_ENTER(ComboPage_Combo, ComboboxWidgetsPage::OnComboText)
 

-    EVT_CHECKBOX(-1, ComboboxWidgetsPage::OnCheckOrRadioBox)
-    EVT_RADIOBOX(-1, ComboboxWidgetsPage::OnCheckOrRadioBox)
+    EVT_CHECKBOX(wxID_ANY, ComboboxWidgetsPage::OnCheckOrRadioBox)
+    EVT_RADIOBOX(wxID_ANY, ComboboxWidgetsPage::OnCheckOrRadioBox)

 END_EVENT_TABLE()
 
 // ============================================================================
 // implementation
 // ============================================================================
 
 END_EVENT_TABLE()
 
 // ============================================================================
 // 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(wxNotebook *notebook,
-                                       wxImageList *imaglist)
-                  : WidgetsPage(notebook)
+ComboboxWidgetsPage::ComboboxWidgetsPage(WidgetsBookCtrl *book,
+                                         wxImageList *imaglist)
+                  : WidgetsPage(book, imaglist, combobox_xpm)

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


@@ -198,9 +215,10 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
 
     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


@@ -210,7 +228,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane
     wxSizer *sizerTop = new wxBoxSizer(wxHORIZONTAL);
 
     // left pane

-    wxStaticBox *box = new wxStaticBox(this, -1, _T("&Set style"));
+    wxStaticBox *box = new wxStaticBox(this, wxID_ANY, _T("&Set style"));

 
     // should be in sync with ComboKind_XXX values
     static const wxString kinds[] =
 
     // should be in sync with ComboKind_XXX values
     static const wxString kinds[] =


@@ -220,7 +238,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
         _T("drop down"),
     };
 
         _T("drop down"),
     };
 

-    m_radioKind = new wxRadioBox(this, -1, _T("Combobox &kind:"),
+    m_radioKind = new wxRadioBox(this, wxID_ANY, _T("Combobox &kind:"),

                                  wxDefaultPosition, wxDefaultSize,
                                  WXSIZEOF(kinds), kinds,
                                  1, wxRA_SPECIFY_COLS);
                                  wxDefaultPosition, wxDefaultSize,
                                  WXSIZEOF(kinds), kinds,
                                  1, wxRA_SPECIFY_COLS);


@@ -237,7 +255,8 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane
     sizerLeft->Add(btn, 0, wxALIGN_CENTRE_HORIZONTAL | wxALL, 15);
 
     // middle pane

-    wxStaticBox *box2 = new wxStaticBox(this, -1, _T("&Change combobox contents"));
+    wxStaticBox *box2 = new wxStaticBox(this, wxID_ANY,
+        _T("&Change combobox contents"));

     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerRow;
     wxSizer *sizerMiddle = new wxStaticBoxSizer(box2, wxVERTICAL);
 
     wxSizer *sizerRow;


@@ -246,7 +265,14 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
     sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"),
                                            ComboPage_CurText,
                                            &text);
     sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"),
                                            ComboPage_CurText,
                                            &text);

-    text->SetEditable(FALSE);
+    text->SetEditable(false);
+
+    sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
+
+    sizerRow = CreateSizerWithTextAndLabel(_T("Insertion Point"),
+                                           ComboPage_InsertionPointText,
+                                           &text);
+    text->SetEditable(false);

 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 
 
     sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5);
 


@@ -288,7 +314,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
 
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);
 
     // right pane
     wxSizer *sizerRight = new wxBoxSizer(wxVERTICAL);

-    m_combobox = new wxComboBox(this, ComboPage_Combo, _T(""),
+    m_combobox = new wxComboBox(this, ComboPage_Combo, wxEmptyString,

                                 wxDefaultPosition, wxDefaultSize,
                                 0, NULL,
                                 0);
                                 wxDefaultPosition, wxDefaultSize,
                                 0, NULL,
                                 0);


@@ -304,7 +330,6 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
     // final initializations
     Reset();
 
     // final initializations
     Reset();
 

-    SetAutoLayout(TRUE);

     SetSizer(sizerTop);
 
     sizerTop->Fit(this);
     SetSizer(sizerTop);
 
     sizerTop->Fit(this);


@@ -316,13 +341,13 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook,
 
 void ComboboxWidgetsPage::Reset()
 {
 
 void ComboboxWidgetsPage::Reset()
 {

-    m_chkSort->SetValue(FALSE);
-    m_chkReadonly->SetValue(FALSE);
+    m_chkSort->SetValue(false);
+    m_chkReadonly->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;


@@ -350,8 +375,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));
         }


@@ -360,13 +385,13 @@ void ComboboxWidgetsPage::CreateCombo()
         delete m_combobox;
     }
 
         delete m_combobox;
     }
 

-    m_combobox = new wxComboBox(this, ComboPage_Combo, _T(""),
+    m_combobox = new wxComboBox(this, ComboPage_Combo, wxEmptyString,

                                 wxDefaultPosition, wxDefaultSize,
                                 0, NULL,
                                 flags);
 
                                 wxDefaultPosition, wxDefaultSize,
                                 0, NULL,
                                 flags);
 

-    size_t count = items.GetCount();
-    for ( size_t n = 0; n < count; n++ )
+    unsigned int count = items.GetCount();
+    for ( unsigned int n = 0; n < count; n++ )

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


@@ -389,7 +414,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());


@@ -403,7 +428,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;
     }


@@ -414,18 +439,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::OnButtonClear(wxCommandEvent& event)
+void ComboboxWidgetsPage::OnButtonClear(wxCommandEvent& WXUNUSED(event))

 {
     m_combobox->Clear();
 }
 
 {
     m_combobox->Clear();
 }
 

-void ComboboxWidgetsPage::OnButtonInsert(wxCommandEvent& event)
+void ComboboxWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event))

 {
     static unsigned int s_item = 0;
 
 {
     static unsigned int s_item = 0;
 


@@ -440,7 +465,7 @@ void ComboboxWidgetsPage::OnButtonInsert(wxCommandEvent& event)
         m_combobox->Insert(s, m_combobox->GetSelection());
 }
 
         m_combobox->Insert(s, m_combobox->GetSelection());
 }
 

-void ComboboxWidgetsPage::OnButtonAdd(wxCommandEvent& event)
+void ComboboxWidgetsPage::OnButtonAdd(wxCommandEvent& WXUNUSED(event))

 {
     static unsigned int s_item = 0;
 
 {
     static unsigned int s_item = 0;
 


@@ -463,7 +488,7 @@ void ComboboxWidgetsPage::OnButtonAddMany(wxCommandEvent& WXUNUSED(event))
     }
 }
 
     }
 }
 

-void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& event)
+void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event))

 {
     m_combobox->Append(_T("First"));
     m_combobox->Append(_T("another one"));
 {
     m_combobox->Append(_T("First"));
     m_combobox->Append(_T("another one"));


@@ -476,6 +501,12 @@ void ComboboxWidgetsPage::OnUpdateUICurText(wxUpdateUIEvent& event)
         event.SetText( wxString::Format(_T("%d"), m_combobox->GetSelection()) );
 }
 
         event.SetText( wxString::Format(_T("%d"), m_combobox->GetSelection()) );
 }
 

+void ComboboxWidgetsPage::OnUpdateUIInsertionPointText(wxUpdateUIEvent& event)
+{
+    if (m_combobox)
+        event.SetText( wxString::Format(_T("%ld"), m_combobox->GetInsertionPoint()) );
+}
+

 void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {
     if (m_combobox)
 void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event)
 {
     if (m_combobox)


@@ -506,7 +537,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)


@@ -534,7 +565,7 @@ 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)
 }
 
 void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)


@@ -543,9 +574,11 @@ void ComboboxWidgetsPage::OnComboBox(wxCommandEvent& event)
     m_textDelete->SetValue(wxString::Format(_T("%ld"), sel));
 
     wxLogMessage(_T("Combobox item %ld selected"), sel);
     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() );

 }
 
 }
 

-void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event)
+void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event))

 {
     CreateCombo();
 }
 {
     CreateCombo();
 }