X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aec18ff785687e1d0830da8cd287903128a994c6..14b4c0ff125b7bd175916f465e76a359b4fda706:/samples/widgets/combobox.cpp?ds=sidebyside diff --git a/samples/widgets/combobox.cpp b/samples/widgets/combobox.cpp index 955567971e..72c4b023f1 100644 --- 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 @@ -30,6 +30,7 @@ #ifndef WX_PRECOMP #include "wx/log.h" + #include "wx/bitmap.h" #include "wx/button.h" #include "wx/checkbox.h" #include "wx/combobox.h" @@ -53,6 +54,8 @@ enum { ComboPage_Reset = 100, ComboPage_CurText, + ComboPage_Insert, + ComboPage_InsertText, ComboPage_Add, ComboPage_AddText, ComboPage_AddSeveral, @@ -81,7 +84,9 @@ enum class ComboboxWidgetsPage : public WidgetsPage { public: - ComboboxWidgetsPage(wxNotebook *notebook, wxImageList *imaglist); + ComboboxWidgetsPage(wxBookCtrl *book, wxImageList *imaglist); + + virtual wxControl *GetWidget() const { return m_combobox; } protected: // event handlers @@ -90,6 +95,7 @@ protected: void OnButtonDelete(wxCommandEvent& event); void OnButtonDeleteSel(wxCommandEvent& event); void OnButtonClear(wxCommandEvent& event); + void OnButtonInsert(wxCommandEvent &event); void OnButtonAdd(wxCommandEvent& event); void OnButtonAddSeveral(wxCommandEvent& event); void OnButtonAddMany(wxCommandEvent& event); @@ -101,6 +107,7 @@ protected: void OnUpdateUICurText(wxUpdateUIEvent& event); + void OnUpdateUIInsert(wxUpdateUIEvent& event); void OnUpdateUIAddSeveral(wxUpdateUIEvent& event); void OnUpdateUIClearButton(wxUpdateUIEvent& event); void OnUpdateUIDeleteButton(wxUpdateUIEvent& event); @@ -128,7 +135,8 @@ protected: wxSizer *m_sizerCombo; // the text entries for "Add/change string" and "Delete" buttons - wxTextCtrl *m_textAdd, + wxTextCtrl *m_textInsert, + *m_textAdd, *m_textChange, *m_textDelete; @@ -147,16 +155,19 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage) EVT_BUTTON(ComboPage_Delete, ComboboxWidgetsPage::OnButtonDelete) EVT_BUTTON(ComboPage_DeleteSel, ComboboxWidgetsPage::OnButtonDeleteSel) EVT_BUTTON(ComboPage_Clear, ComboboxWidgetsPage::OnButtonClear) + EVT_BUTTON(ComboPage_Insert, ComboboxWidgetsPage::OnButtonInsert) EVT_BUTTON(ComboPage_Add, ComboboxWidgetsPage::OnButtonAdd) EVT_BUTTON(ComboPage_AddSeveral, ComboboxWidgetsPage::OnButtonAddSeveral) EVT_BUTTON(ComboPage_AddMany, ComboboxWidgetsPage::OnButtonAddMany) + 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_Reset, ComboboxWidgetsPage::OnUpdateUIResetButton) + EVT_UPDATE_UI(ComboPage_Insert, ComboboxWidgetsPage::OnUpdateUIInsert) EVT_UPDATE_UI(ComboPage_AddSeveral, ComboboxWidgetsPage::OnUpdateUIAddSeveral) EVT_UPDATE_UI(ComboPage_Clear, ComboboxWidgetsPage::OnUpdateUIClearButton) EVT_UPDATE_UI(ComboPage_DeleteText, ComboboxWidgetsPage::OnUpdateUIClearButton) @@ -167,9 +178,10 @@ BEGIN_EVENT_TABLE(ComboboxWidgetsPage, WidgetsPage) EVT_COMBOBOX(ComboPage_Combo, ComboboxWidgetsPage::OnComboBox) 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() // ============================================================================ @@ -178,9 +190,9 @@ END_EVENT_TABLE() IMPLEMENT_WIDGETS_PAGE(ComboboxWidgetsPage, _T("Combobox")); -ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, - wxImageList *imaglist) - : WidgetsPage(notebook) +ComboboxWidgetsPage::ComboboxWidgetsPage(wxBookCtrl *book, + wxImageList *imaglist) + : WidgetsPage(book) { // init everything m_chkSort = @@ -200,7 +212,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, 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[] = @@ -210,7 +222,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, _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); @@ -227,7 +239,8 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, 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; @@ -236,8 +249,14 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, sizerRow = CreateSizerWithTextAndLabel(_T("Current selection"), ComboPage_CurText, &text); - text->SetEditable(FALSE); + text->SetEditable(false); + + sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); + sizerRow = CreateSizerWithTextAndButton(ComboPage_Insert, + _T("&Insert this string"), + ComboPage_InsertText, + &m_textInsert); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(ComboPage_Add, @@ -246,10 +265,10 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, &m_textAdd); sizerMiddle->Add(sizerRow, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, ComboPage_AddSeveral, _T("&Insert a few strings")); + btn = new wxButton(this, ComboPage_AddSeveral, _T("&Append a few strings")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); - btn = new wxButton(this, ComboPage_AddMany, _T("Add &many strings")); + btn = new wxButton(this, ComboPage_AddMany, _T("Append &many strings")); sizerMiddle->Add(btn, 0, wxALL | wxGROW, 5); sizerRow = CreateSizerWithTextAndButton(ComboPage_Change, @@ -272,7 +291,7 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, // 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); @@ -288,7 +307,6 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, // final initializations Reset(); - SetAutoLayout(TRUE); SetSizer(sizerTop); sizerTop->Fit(this); @@ -300,8 +318,8 @@ ComboboxWidgetsPage::ComboboxWidgetsPage(wxNotebook *notebook, void ComboboxWidgetsPage::Reset() { - m_chkSort->SetValue(FALSE); - m_chkReadonly->SetValue(FALSE); + m_chkSort->SetValue(false); + m_chkReadonly->SetValue(false); } void ComboboxWidgetsPage::CreateCombo() @@ -340,11 +358,11 @@ void ComboboxWidgetsPage::CreateCombo() items.Add(m_combobox->GetString(n)); } - m_sizerCombo->Remove(m_combobox); + m_sizerCombo->Detach( 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); @@ -404,14 +422,29 @@ void ComboboxWidgetsPage::OnButtonDeleteSel(wxCommandEvent& WXUNUSED(event)) } } -void ComboboxWidgetsPage::OnButtonClear(wxCommandEvent& event) +void ComboboxWidgetsPage::OnButtonClear(wxCommandEvent& WXUNUSED(event)) { m_combobox->Clear(); } -void ComboboxWidgetsPage::OnButtonAdd(wxCommandEvent& event) +void ComboboxWidgetsPage::OnButtonInsert(wxCommandEvent& WXUNUSED(event)) +{ + static unsigned int s_item = 0; + + wxString s = m_textInsert->GetValue(); + if ( !m_textInsert->IsModified() ) + { + // update the default string + m_textInsert->SetValue(wxString::Format(_T("test item %u"), ++s_item)); + } + + if (m_combobox->GetSelection() >= 0) + m_combobox->Insert(s, m_combobox->GetSelection()); +} + +void ComboboxWidgetsPage::OnButtonAdd(wxCommandEvent& WXUNUSED(event)) { - static size_t s_item = 0; + static unsigned int s_item = 0; wxString s = m_textAdd->GetValue(); if ( !m_textAdd->IsModified() ) @@ -426,13 +459,13 @@ void ComboboxWidgetsPage::OnButtonAdd(wxCommandEvent& event) void ComboboxWidgetsPage::OnButtonAddMany(wxCommandEvent& WXUNUSED(event)) { // "many" means 1000 here - for ( size_t n = 0; n < 1000; n++ ) + for ( unsigned int n = 0; n < 1000; n++ ) { m_combobox->Append(wxString::Format(_T("item #%u"), n)); } } -void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& event) +void ComboboxWidgetsPage::OnButtonAddSeveral(wxCommandEvent& WXUNUSED(event)) { m_combobox->Append(_T("First")); m_combobox->Append(_T("another one")); @@ -451,6 +484,17 @@ void ComboboxWidgetsPage::OnUpdateUIResetButton(wxUpdateUIEvent& event) event.Enable( m_chkSort->GetValue() || m_chkReadonly->GetValue() ); } +void ComboboxWidgetsPage::OnUpdateUIInsert(wxUpdateUIEvent& event) +{ + if (m_combobox) + { + bool enable = !(m_combobox->GetWindowStyle() & wxCB_SORT) && + (m_combobox->GetSelection() >= 0); + + event.Enable(enable); + } +} + void ComboboxWidgetsPage::OnUpdateUIDeleteButton(wxUpdateUIEvent& event) { if (m_combobox) @@ -489,6 +533,9 @@ void ComboboxWidgetsPage::OnComboText(wxCommandEvent& event) wxASSERT_MSG( s == m_combobox->GetValue(), _T("event and combobox values should be the same") ); + 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()); } @@ -498,9 +545,11 @@ 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() ); } -void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& event) +void ComboboxWidgetsPage::OnCheckOrRadioBox(wxCommandEvent& WXUNUSED(event)) { CreateCombo(); }