X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/be5a51fb592f3fa2ba38ac6cd1e488d6d806058c..afbe150a7625268fb9fcc1a770dfb7d7bd218e01:/samples/checklst/checklst.cpp?ds=sidebyside diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp index bd844baa04..9ae58191f4 100644 --- a/samples/checklst/checklst.cpp +++ b/samples/checklst/checklst.cpp @@ -9,10 +9,6 @@ // Licence: wxWindows license /////////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - //#pragma implementation -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -34,6 +30,10 @@ #include "wx/menuitem.h" #include "wx/checklst.h" +#if !wxUSE_CHECKLISTBOX + #error "This sample can't be built without wxUSE_CHECKLISTBOX" +#endif // wxUSE_CHECKLISTBOX + // Define a new application type class CheckListBoxApp: public wxApp { @@ -46,9 +46,8 @@ class CheckListBoxFrame : public wxFrame { public: // ctor & dtor - CheckListBoxFrame(wxFrame *frame, const wxChar *title, - int x, int y, int w, int h); - virtual ~CheckListBoxFrame(); + CheckListBoxFrame(wxFrame *frame, const wxChar *title); + virtual ~CheckListBoxFrame(){}; // notifications void OnQuit(wxCommandEvent& event); @@ -58,7 +57,18 @@ public: void OnUncheckFirstItem(wxCommandEvent& event); void OnToggleFirstItem(wxCommandEvent& event); void OnToggleSelection(wxCommandEvent& event); - void OnAddItems(wxCommandEvent& event); + void OnToggleSorting(wxCommandEvent& event); + void OnToggleExtended(wxCommandEvent& event); + + void OnInsertItemsStart(wxCommandEvent& event); + void OnInsertItemsMiddle(wxCommandEvent& event); + void OnInsertItemsEnd(wxCommandEvent& event); + void OnAppendItems(wxCommandEvent& event); + void OnRemoveItems(wxCommandEvent& event); + + void OnGetBestSize(wxCommandEvent& event); + + void OnMakeItemFirst(wxCommandEvent& event); void OnListboxSelect(wxCommandEvent& event); void OnCheckboxToggle(wxCommandEvent& event); @@ -83,19 +93,28 @@ private: enum { - Menu_About = 100, - Menu_Quit, + Menu_About = wxID_ABOUT, + Menu_Quit = wxID_EXIT, - Menu_CheckFirst, + Menu_CheckFirst = wxID_HIGHEST, Menu_UncheckFirst, Menu_ToggleFirst, Menu_Selection, - Menu_AddItems, - - Control_First = 1000, + Menu_Extended, + Menu_Sorting, + Menu_InsertItemsStart, + Menu_InsertItemsMiddle, + Menu_InsertItemsEnd, + Menu_AppendItems, + Menu_RemoveItems, + Menu_GetBestSize, + Menu_MakeItemFirst, + + Control_First, Control_Listbox, - Btn_Up, - Btn_Down + + Btn_Up = wxID_UP, + Btn_Down = wxID_DOWN }; BEGIN_EVENT_TABLE(CheckListBoxFrame, wxFrame) @@ -106,7 +125,18 @@ BEGIN_EVENT_TABLE(CheckListBoxFrame, wxFrame) EVT_MENU(Menu_UncheckFirst, CheckListBoxFrame::OnUncheckFirstItem) EVT_MENU(Menu_ToggleFirst, CheckListBoxFrame::OnToggleFirstItem) EVT_MENU(Menu_Selection, CheckListBoxFrame::OnToggleSelection) - EVT_MENU(Menu_AddItems, CheckListBoxFrame::OnAddItems) + EVT_MENU(Menu_Extended, CheckListBoxFrame::OnToggleExtended) + EVT_MENU(Menu_Sorting, CheckListBoxFrame::OnToggleSorting) + + EVT_MENU(Menu_InsertItemsStart, CheckListBoxFrame::OnInsertItemsStart) + EVT_MENU(Menu_InsertItemsMiddle, CheckListBoxFrame::OnInsertItemsMiddle) + EVT_MENU(Menu_InsertItemsEnd, CheckListBoxFrame::OnInsertItemsEnd) + EVT_MENU(Menu_AppendItems, CheckListBoxFrame::OnAppendItems) + EVT_MENU(Menu_RemoveItems, CheckListBoxFrame::OnRemoveItems) + + EVT_MENU(Menu_GetBestSize, CheckListBoxFrame::OnGetBestSize) + + EVT_MENU(Menu_MakeItemFirst, CheckListBoxFrame::OnMakeItemFirst) EVT_LISTBOX(Control_Listbox, CheckListBoxFrame::OnListboxSelect) EVT_CHECKLISTBOX(Control_Listbox, CheckListBoxFrame::OnCheckboxToggle) @@ -124,8 +154,7 @@ bool CheckListBoxApp::OnInit(void) CheckListBoxFrame *pFrame = new CheckListBoxFrame ( NULL, - _T("wxWidgets Checklistbox Sample"), - 50, 50, 480, 320 + _T("wxWidgets Checklistbox Sample") ); SetTopWindow(pFrame); @@ -134,15 +163,15 @@ bool CheckListBoxApp::OnInit(void) // main frame constructor CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, - const wxChar *title, - int x, int y, int w, int h) - : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h)) + const wxChar *title) + : wxFrame(frame, wxID_ANY, title) { +#if wxUSE_STATUSBAR // create the status line const int widths[] = { -1, 60 }; CreateStatusBar(2); SetStatusWidths(2, widths); - wxLogStatus(this, _T("no selection")); +#endif // wxUSE_STATUSBAR // Make a menubar // -------------- @@ -159,9 +188,20 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, menuList->Append(Menu_UncheckFirst, _T("Uncheck the first item\tCtrl-U")); menuList->Append(Menu_ToggleFirst, _T("Toggle the first item\tCtrl-T")); menuList->AppendSeparator(); - menuList->AppendCheckItem(Menu_AddItems, _T("Add more items\tCtrl-A")); + menuList->Append(Menu_InsertItemsStart, _T("Insert some item at the beginning")); + menuList->Append(Menu_InsertItemsMiddle, _T("Insert some item at the middle")); + menuList->Append(Menu_InsertItemsEnd, _T("Insert some item at the end")); + menuList->Append(Menu_AppendItems, _T("Append some items\tCtrl-A")); + menuList->Append(Menu_RemoveItems, _T("Remove some items")); menuList->AppendSeparator(); menuList->AppendCheckItem(Menu_Selection, _T("Multiple selection\tCtrl-M")); + menuList->AppendCheckItem(Menu_Extended, _T("Extended selection")); + menuList->AppendCheckItem(Menu_Sorting, _T("Sorting")); + menuList->AppendSeparator(); + menuList->Append(Menu_GetBestSize, _T("Get the best size of the checklistbox control")); + menuList->AppendSeparator(); + menuList->Append(Menu_MakeItemFirst, _T("Make selected item the first item")); + // put it all together wxMenuBar *menu_bar = new wxMenuBar; @@ -170,14 +210,13 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, SetMenuBar(menu_bar); // make a panel with some controls - m_panel = new wxPanel(this, wxID_ANY, wxPoint(0, 0), - wxSize(400, 200), wxTAB_TRAVERSAL); + m_panel = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL); CreateCheckListbox(); // create buttons for moving the items around - wxButton *button1 = new wxButton(m_panel, Btn_Up, _T(" &Up "), wxPoint(420, 90)); - wxButton *button2 = new wxButton(m_panel, Btn_Down, _T("&Down"), wxPoint(420, 120)); + wxButton *button1 = new wxButton(m_panel, Btn_Up); + wxButton *button2 = new wxButton(m_panel, Btn_Down); wxBoxSizer *mainsizer = new wxBoxSizer( wxVERTICAL ); @@ -195,8 +234,10 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, m_panel->SetAutoLayout( true ); m_panel->SetSizer( mainsizer ); +#ifndef __WXWINCE__ // don't allow frame to get smaller than what the sizers tell ye mainsizer->SetSizeHints( this ); +#endif Show(true); } @@ -241,10 +282,6 @@ void CheckListBoxFrame::CreateCheckListbox(long flags) m_pListBox->Select(3); } -CheckListBoxFrame::~CheckListBoxFrame() -{ -} - void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) { Close(true); @@ -252,7 +289,7 @@ void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event)) void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) { - wxMessageBox(wxT("Demo of wxCheckListBox control\n© Vadim Zeitlin 1998-2002"), + wxMessageBox(wxT("Demo of wxCheckListBox control\n(c) Vadim Zeitlin 1998-2002"), wxT("About wxCheckListBox"), wxICON_INFORMATION, this); } @@ -275,7 +312,7 @@ void CheckListBoxFrame::OnToggleFirstItem(wxCommandEvent& WXUNUSED(event)) m_pListBox->Check(0, !m_pListBox->IsChecked(0)); } -void CheckListBoxFrame::OnAddItems(wxCommandEvent& WXUNUSED(event)) +void CheckListBoxFrame::OnInsertItemsStart(wxCommandEvent& WXUNUSED(event)) { static size_t s_nItem = 0; wxArrayString items; @@ -286,6 +323,64 @@ void CheckListBoxFrame::OnAddItems(wxCommandEvent& WXUNUSED(event)) m_pListBox->InsertItems(items, 0);//m_pListBox->GetCount()); } +void CheckListBoxFrame::OnInsertItemsMiddle(wxCommandEvent& WXUNUSED(event)) +{ + static size_t s_nItem = 0; + wxArrayString items; + items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + + m_pListBox->InsertItems(items, m_pListBox->GetCount() ? 1 : 0); +} + +void CheckListBoxFrame::OnInsertItemsEnd(wxCommandEvent& WXUNUSED(event)) +{ + static size_t s_nItem = 0; + wxArrayString items; + items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + items.Add(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + + m_pListBox->InsertItems(items, m_pListBox->GetCount() ); +} + +void CheckListBoxFrame::OnAppendItems(wxCommandEvent& WXUNUSED(event)) +{ + static size_t s_nItem = 0; + m_pListBox->Append(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + m_pListBox->Append(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); + m_pListBox->Append(wxString::Format(_T("New item %lu"), (unsigned long)++s_nItem)); +} + +void CheckListBoxFrame::OnRemoveItems(wxCommandEvent& WXUNUSED(event)) +{ + if(m_pListBox->GetCount()) + m_pListBox->Delete(0); + if(m_pListBox->GetCount()) + m_pListBox->Delete(0); + if(m_pListBox->GetCount()) + m_pListBox->Delete(0); +} + +void CheckListBoxFrame::OnGetBestSize(wxCommandEvent& WXUNUSED(event)) +{ + wxSize bestSize = m_pListBox->GetBestSize(); + + wxMessageBox(wxString::Format(wxT("Best size of the checklistbox is:[%i,%i]"), + bestSize.x, bestSize.y + ) + ); +} + +void CheckListBoxFrame::OnMakeItemFirst(wxCommandEvent& WXUNUSED(event)) +{ + if(m_pListBox->GetSelection() != -1) + m_pListBox->SetFirstItem(m_pListBox->GetSelection()); + else + wxMessageBox(wxT("Nothing selected!")); +} + void CheckListBoxFrame::OnToggleSelection(wxCommandEvent& event) { wxSizer *sizer = m_panel->GetSizer(); @@ -300,6 +395,34 @@ void CheckListBoxFrame::OnToggleSelection(wxCommandEvent& event) m_panel->Layout(); } +void CheckListBoxFrame::OnToggleExtended(wxCommandEvent& event) +{ + wxSizer *sizer = m_panel->GetSizer(); + + sizer->Detach( m_pListBox ); + delete m_pListBox; + + CreateCheckListbox(event.IsChecked() ? wxLB_EXTENDED : 0); + + sizer->Insert(0, m_pListBox, 1, wxGROW | wxALL, 10); + + m_panel->Layout(); +} + +void CheckListBoxFrame::OnToggleSorting(wxCommandEvent& event) +{ + wxSizer *sizer = m_panel->GetSizer(); + + sizer->Detach( m_pListBox ); + delete m_pListBox; + + CreateCheckListbox(event.IsChecked() ? wxLB_SORT : 0); + + sizer->Insert(0, m_pListBox, 1, wxGROW | wxALL, 10); + + m_panel->Layout(); +} + void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event) { int nSel = event.GetSelection(); @@ -371,7 +494,7 @@ void CheckListBoxFrame::OnButtonMove(bool up) { selection = m_pListBox->GetSelection(); } - if ( selection != -1 ) + if ( selection != wxNOT_FOUND ) { wxString label = m_pListBox->GetString(selection); @@ -395,6 +518,7 @@ void CheckListBoxFrame::OnButtonMove(bool up) int selectionNew = up ? positionNew : positionNew - 1; m_pListBox->Check(selectionNew, wasChecked); m_pListBox->SetSelection(selectionNew); + m_pListBox->SetFocus(); AdjustColour(selection); AdjustColour(selectionNew); @@ -409,7 +533,7 @@ void CheckListBoxFrame::OnButtonMove(bool up) } // not implemented in ports other than (native) MSW yet -#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) +#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__) && !defined(__WXWINCE__) void CheckListBoxFrame::AdjustColour(size_t index) { // even items have grey backround, odd ones - white