Added version test

[wxWidgets.git] / samples / checklst / checklst.cpp

diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index 9ddcbf7b137279785b75824b66cc1d49cd91da34..07fef62c3a6403920fc57e51e460e76dd3d9dd7a 100644 (file)
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -53,13 +53,17 @@ public:
     // notifications
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);
     // notifications
     void OnQuit(wxCommandEvent& event);
     void OnAbout(wxCommandEvent& event);

+

     void OnCheckFirstItem(wxCommandEvent& event);
     void OnUncheckFirstItem(wxCommandEvent& event);
     void OnToggleFirstItem(wxCommandEvent& event);
     void OnToggleSelection(wxCommandEvent& event);
     void OnCheckFirstItem(wxCommandEvent& event);
     void OnUncheckFirstItem(wxCommandEvent& event);
     void OnToggleFirstItem(wxCommandEvent& event);
     void OnToggleSelection(wxCommandEvent& event);

+    void OnAddItems(wxCommandEvent& event);
+

     void OnListboxSelect(wxCommandEvent& event);
     void OnCheckboxToggle(wxCommandEvent& event);
     void OnListboxDblClick(wxCommandEvent& event);
     void OnListboxSelect(wxCommandEvent& event);
     void OnCheckboxToggle(wxCommandEvent& event);
     void OnListboxDblClick(wxCommandEvent& event);

+

     void OnButtonUp(wxCommandEvent& event);
     void OnButtonDown(wxCommandEvent& event);
 
     void OnButtonUp(wxCommandEvent& event);
     void OnButtonDown(wxCommandEvent& event);
 


@@ -86,6 +90,7 @@ enum
     Menu_UncheckFirst,
     Menu_ToggleFirst,
     Menu_Selection,
     Menu_UncheckFirst,
     Menu_ToggleFirst,
     Menu_Selection,

+    Menu_AddItems,

 
     Control_First = 1000,
     Control_Listbox,
 
     Control_First = 1000,
     Control_Listbox,


@@ -101,6 +106,7 @@ 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_UncheckFirst, CheckListBoxFrame::OnUncheckFirstItem)
     EVT_MENU(Menu_ToggleFirst, CheckListBoxFrame::OnToggleFirstItem)
     EVT_MENU(Menu_Selection, CheckListBoxFrame::OnToggleSelection)

+    EVT_MENU(Menu_AddItems, CheckListBoxFrame::OnAddItems)

 
     EVT_LISTBOX(Control_Listbox, CheckListBoxFrame::OnListboxSelect)
     EVT_CHECKLISTBOX(Control_Listbox, CheckListBoxFrame::OnCheckboxToggle)
 
     EVT_LISTBOX(Control_Listbox, CheckListBoxFrame::OnListboxSelect)
     EVT_CHECKLISTBOX(Control_Listbox, CheckListBoxFrame::OnCheckboxToggle)


@@ -123,14 +129,14 @@ bool CheckListBoxApp::OnInit(void)
                                     );
     SetTopWindow(pFrame);
 
                                     );
     SetTopWindow(pFrame);
 

-    return TRUE;
+    return true;

 }
 
 // main frame constructor
 CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
                                      const wxChar *title,
                                      int x, int y, int w, int h)
 }
 
 // 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))

 {
     // create the status line
     const int widths[] = { -1, 60 };
 {
     // create the status line
     const int widths[] = { -1, 60 };


@@ -153,6 +159,8 @@ 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->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->AppendSeparator();

     menuList->AppendCheckItem(Menu_Selection, _T("Multiple selection\tCtrl-M"));
 
     // put it all together
     menuList->AppendCheckItem(Menu_Selection, _T("Multiple selection\tCtrl-M"));
 
     // put it all together


@@ -162,7 +170,7 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     SetMenuBar(menu_bar);
 
     // make a panel with some controls
     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();
                           wxSize(400, 200), wxTAB_TRAVERSAL);
 
     CreateCheckListbox();


@@ -184,13 +192,13 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame,
     mainsizer->Add( bottomsizer, 0, wxCENTER );
 
     // tell frame to make use of sizer (or constraints, if any)
     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 );
 
     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)
 }
 
 void CheckListBoxFrame::CreateCheckListbox(long flags)


@@ -239,7 +247,7 @@ CheckListBoxFrame::~CheckListBoxFrame()
 
 void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
 
 void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {

-    Close(TRUE);
+    Close(true);

 }
 
 void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 }
 
 void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))


@@ -249,29 +257,40 @@ void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
                  wxICON_INFORMATION, this);
 }
 
                  wxICON_INFORMATION, this);
 }
 

-void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& event)
+void CheckListBoxFrame::OnCheckFirstItem(wxCommandEvent& WXUNUSED(event))

 {
     if ( !m_pListBox->IsEmpty() )
         m_pListBox->Check(0);
 }
 
 {
     if ( !m_pListBox->IsEmpty() )
         m_pListBox->Check(0);
 }
 

-void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& event)
+void CheckListBoxFrame::OnUncheckFirstItem(wxCommandEvent& WXUNUSED(event))

 {
     if ( !m_pListBox->IsEmpty() )
 {
     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));
 }
 
 {
     if ( !m_pListBox->IsEmpty() )
         m_pListBox->Check(0, !m_pListBox->IsChecked(0));
 }
 

+void CheckListBoxFrame::OnAddItems(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, 0);//m_pListBox->GetCount());
+}
+

 void CheckListBoxFrame::OnToggleSelection(wxCommandEvent& event)
 {
     wxSizer *sizer = m_panel->GetSizer();
 
 void CheckListBoxFrame::OnToggleSelection(wxCommandEvent& event)
 {
     wxSizer *sizer = m_panel->GetSizer();
 

-    sizer->Remove(m_pListBox);
+    sizer->Detach( m_pListBox );

     delete m_pListBox;
 
     CreateCheckListbox(event.IsChecked() ? wxLB_EXTENDED : 0);
     delete m_pListBox;
 
     CreateCheckListbox(event.IsChecked() ? wxLB_EXTENDED : 0);


@@ -285,13 +304,35 @@ void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
 {
     int nSel = event.GetSelection();
     wxLogStatus(this, wxT("Item %d selected (%schecked)"), nSel,
 {
     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))
 {
 }
 
 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;
     wxString strSelection;

-    strSelection.sprintf(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();
 }
     wxMessageDialog dialog(this, strSelection, wxT("wxCheckListBox message"), wxICON_INFORMATION);
     dialog.ShowModal();
 }


@@ -306,17 +347,30 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event)
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 {
 
 void CheckListBoxFrame::OnButtonUp(wxCommandEvent& WXUNUSED(event))
 {

-    OnButtonMove(TRUE);
+    OnButtonMove(true);

 }
 
 void CheckListBoxFrame::OnButtonDown(wxCommandEvent& WXUNUSED(event))
 {
 }
 
 void CheckListBoxFrame::OnButtonDown(wxCommandEvent& WXUNUSED(event))
 {

-    OnButtonMove(FALSE);
+    OnButtonMove(false);

 }
 
 void CheckListBoxFrame::OnButtonMove(bool up)
 {
 }
 
 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);
     if ( selection != -1 )
     {
         wxString label = m_pListBox->GetString(selection);


@@ -350,16 +404,20 @@ void CheckListBoxFrame::OnButtonMove(bool up)
     }
     else
     {
     }
     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)
 {
 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));
     // 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