X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7df07b10aaf306995cc93f67706113bae9173135..9149aa8c961e1bfccc159526eeee5dc089eaf906:/samples/checklst/checklst.cpp

diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index 41d4f842e9..e09683c63c 100644
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -48,7 +48,7 @@ public:
     // ctor & dtor
     CheckListBoxFrame(wxFrame *frame, const wxChar *title,
                       int x, int y, int w, int h);
-    virtual ~CheckListBoxFrame();
+    virtual ~CheckListBoxFrame(){};
 
     // notifications
     void OnQuit(wxCommandEvent& event);
@@ -124,25 +124,27 @@ bool CheckListBoxApp::OnInit(void)
     CheckListBoxFrame *pFrame = new CheckListBoxFrame
                                     (
                                      NULL,
-                                     _T("wxWindows Checklistbox Sample"),
+                                     _T("wxWidgets Checklistbox Sample"),
                                      50, 50, 480, 320
                                     );
     SetTopWindow(pFrame);
 
-    return TRUE;
+    return true;
 }
 
 // main frame constructor
 CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
                                      const wxChar *title,
                                      int x, int y, int w, int h)
-                 : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
+                 : wxFrame(frame, wxID_ANY, title, wxPoint(x, y), wxSize(w, h))
 {
+#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
     // --------------
@@ -170,7 +172,7 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     SetMenuBar(menu_bar);
 
     // make a panel with some controls
-    m_panel = new wxPanel(this, -1, wxPoint(0, 0),
+    m_panel = new wxPanel(this, wxID_ANY, wxPoint(0, 0),
                           wxSize(400, 200), wxTAB_TRAVERSAL);
 
     CreateCheckListbox();
@@ -192,13 +194,13 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     mainsizer->Add( bottomsizer, 0, wxCENTER );
 
     // tell frame to make use of sizer (or constraints, if any)
-    m_panel->SetAutoLayout( TRUE );
+    m_panel->SetAutoLayout( true );
     m_panel->SetSizer( mainsizer );
 
     // don't allow frame to get smaller than what the sizers tell ye
     mainsizer->SetSizeHints( this );
 
-    Show(TRUE);
+    Show(true);
 }
 
 void CheckListBoxFrame::CreateCheckListbox(long flags)
@@ -241,41 +243,37 @@ void CheckListBoxFrame::CreateCheckListbox(long flags)
     m_pListBox->Select(3);
 }
 
-CheckListBoxFrame::~CheckListBoxFrame()
-{
-}
-
 void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
-    Close(TRUE);
+    Close(true);
 }
 
 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);
 }
 
-void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& event)
+void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& WXUNUSED(event))
 {
     if ( !m_pListBox->IsEmpty() )
         m_pListBox->Check(0);
 }
 
-void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& event)
+void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& WXUNUSED(event))
 {
     if ( !m_pListBox->IsEmpty() )
-        m_pListBox->Check(0, FALSE);
+        m_pListBox->Check(0, false);
 }
 
-void CheckListBoxFrame::OnToggleFirstItem(wxCommandEvent& event)
+void CheckListBoxFrame::OnToggleFirstItem(wxCommandEvent& WXUNUSED(event))
 {
     if ( !m_pListBox->IsEmpty() )
         m_pListBox->Check(0, !m_pListBox->IsChecked(0));
 }
 
-void CheckListBoxFrame::OnAddItems(wxCommandEvent& event)
+void CheckListBoxFrame::OnAddItems(wxCommandEvent& WXUNUSED(event))
 {
     static size_t s_nItem = 0;
     wxArrayString items;
@@ -304,13 +302,35 @@ void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();
     wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel,
-                      m_pListBox->IsChecked(nSel) ? _T("") : wxT("not "));
+                      m_pListBox->IsChecked(nSel) ? wxT("") : wxT("not "));
 }
 
 void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 {
+    int selection = -1;
+    if(m_pListBox->GetWindowStyle() & wxLB_EXTENDED)
+    {
+        wxArrayInt list;
+        m_pListBox->GetSelections(list);
+        if(list.Count()==1)
+        {
+            selection = list.Item(0);
+        }
+    }
+    else
+    {
+        selection = m_pListBox->GetSelection();
+    }
+
     wxString strSelection;
-    strSelection.Printf(wxT("Item %d double clicked"), m_pListBox->GetSelection());
+    if ( selection != -1 )
+    {
+        strSelection.Printf(wxT("Item %d double clicked"), selection);
+    }
+    else
+    {
+        strSelection = wxT("List double clicked in multiple selection mode");
+    }
     wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);
     dialog.ShowModal();
 }
@@ -325,17 +345,30 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event)
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 {
-    OnButtonMove(TRUE);
+    OnButtonMove(true);
 }
 
 void CheckListBoxFrame::OnButtonDown(wxCommandEvent& WXUNUSED(event))
 {
-    OnButtonMove(FALSE);
+    OnButtonMove(false);
 }
 
 void CheckListBoxFrame::OnButtonMove(bool up)
 {
-    int selection = m_pListBox->GetSelection();
+    int selection = -1;
+    if(m_pListBox->GetWindowStyle() & wxLB_EXTENDED)
+    {
+        wxArrayInt list;
+        m_pListBox->GetSelections(list);
+        if(list.Count()==1)
+        {
+            selection = list.Item(0);
+        }
+    }
+    else
+    {
+        selection = m_pListBox->GetSelection();
+    }
     if ( selection != -1 )
     {
         wxString label = m_pListBox->GetString(selection);
@@ -369,16 +402,20 @@ void CheckListBoxFrame::OnButtonMove(bool up)
     }
     else
     {
-        wxLogStatus(this, wxT("Please select an item"));
+        wxLogStatus(this, wxT("Please select single item"));
     }
 }
 
+// not implemented in ports other than (native) MSW yet
+#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
 void CheckListBoxFrame::AdjustColour(size_t index)
 {
-    // not implemented in ports other than (native) MSW yet
-#if defined(__WXMSW__) && !defined(__WXUNIVERSAL__)
     // even items have grey backround, odd ones - white
     unsigned char c = index % 2 ? 255 : 200;
     m_pListBox->GetItem(index)->SetBackgroundColour(wxColor(c, c, c));
-#endif // wxMSW
 }
+#else
+void CheckListBoxFrame::AdjustColour(size_t WXUNUSED(index))
+{
+}
+#endif // wxMSW