X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3349fe9210482fad8586f0f3d41b4e64b8b45858..ccfd0a25fe037ea732f45b766fa234eedc56d5e9:/samples/checklst/checklst.cpp?ds=sidebyside

diff --git a/samples/checklst/checklst.cpp b/samples/checklst/checklst.cpp
index 26f90fa53d..8f26703e8a 100644
--- a/samples/checklst/checklst.cpp
+++ b/samples/checklst/checklst.cpp
@@ -2,7 +2,7 @@
 // Name:        checklst.cpp
 // Purpose:     wxCheckListBox sample
 // Author:      Vadim Zeitlin
-// Modified by: 
+// Modified by:
 // Created:     13.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
@@ -24,9 +24,11 @@
   #include "wx/wx.h"
 #endif
 
+#ifdef __WXMSW__
 #include  "wx/ownerdrw.h"
+#endif
 #include  "wx/menuitem.h"
-#include  "wx/msw/checklst.h"
+#include  "wx/checklst.h"
 
 // Define a new application type
 class CheckListBoxApp: public wxApp
@@ -57,8 +59,8 @@ private:
   wxCheckListBox *m_pListBox;
 };
 
-enum 
-{ 
+enum
+{
   Menu_Quit = 1,
   Control_First = 1000,
   Control_Listbox, Control_Listbox2,
@@ -68,8 +70,7 @@ BEGIN_EVENT_TABLE(CheckListBoxFrame, wxFrame)
   EVT_MENU(Menu_Quit, CheckListBoxFrame::OnQuit)
   EVT_LISTBOX(Control_Listbox, CheckListBoxFrame::OnListboxSelect)
   EVT_CHECKLISTBOX(Control_Listbox, CheckListBoxFrame::OnCheckboxToggle)
-  EVT_COMMAND(Control_Listbox, wxEVT_COMMAND_LISTBOX_DOUBLECLICKED,
-              CheckListBoxFrame::OnListboxDblClick)
+  EVT_LISTBOX_DCLICK(Control_Listbox, CheckListBoxFrame::OnListboxDblClick)
 END_EVENT_TABLE()
 
 IMPLEMENT_APP(CheckListBoxApp);
@@ -88,8 +89,11 @@ bool CheckListBoxApp::OnInit(void)
 CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, char *title, int x, int y, int w, int h)
          : wxFrame(frame, -1, title, wxPoint(x, y), wxSize(w, h))
 {
-  // set the icon
-  SetIcon(wxIcon("mondrian"));
+  // create the status line
+  const int widths[] = { -1, 60 };
+  CreateStatusBar(2);
+  SetStatusWidths(2, widths);
+  SetStatusText("no selection", 0);
 
   // Make a menubar
   wxMenu *file_menu = new wxMenu;
@@ -102,11 +106,11 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, char *title, int x, int y,
   SetMenuBar(menu_bar);
 
   // make a panel with some controls
-  wxPanel *pPanel = new wxPanel(this, -1, wxPoint(0, 0), 
+  wxPanel *pPanel = new wxPanel(this, -1, wxPoint(0, 0),
                                 wxSize(400, 200), wxTAB_TRAVERSAL);
 
   // check list box
-  static const char* aszChoices[] = { "Hello", "world", "and", 
+  static const char* aszChoices[] = { "Hello", "world", "and",
                                       "goodbye", "cruel", "world",
                                       "-------", "owner-drawn", "listbox" };
 
@@ -116,29 +120,26 @@ CheckListBoxFrame::CheckListBoxFrame(wxFrame *frame, char *title, int x, int y,
     astrChoices[ui] = aszChoices[ui];
 
   m_pListBox = new wxCheckListBox
-                   (                                             
-                     pPanel,             // parent               
-                     Control_Listbox,    // control id           
-                     wxPoint(10, 10),    // listbox poistion     
+                   (
+                     pPanel,             // parent
+                     Control_Listbox,    // control id
+                     wxPoint(10, 10),    // listbox poistion
                      wxSize(400, 200),   // listbox size
-                     WXSIZEOF(aszChoices), // number of strings    
+                     WXSIZEOF(aszChoices), // number of strings
                      astrChoices         // array of strings
-                   );                                            
-                                                                            
+                   );
+
   delete [] astrChoices;
 
+  // not implemented in wxGTK yet
+#ifndef __WXGTK__
   for ( ui = 0; ui < WXSIZEOF(aszChoices); ui += 2 ) {
     m_pListBox->GetItem(ui)->SetBackgroundColour(wxColor(200, 200, 200));
   }
+#endif // wxGTK
 
   m_pListBox->Check(2);
 
-  // create the status line
-  const int widths[] = { -1, 60 };
-  CreateStatusBar(2);
-  SetStatusWidths(2, widths);
-  SetStatusText("no selection", 0);
-
   Show(TRUE);
 }
 
@@ -146,12 +147,12 @@ CheckListBoxFrame::~CheckListBoxFrame()
 {
 }
 
-void CheckListBoxFrame::OnQuit(wxCommandEvent& event)
+void CheckListBoxFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 {
   Close(TRUE);
 }
 
-void CheckListBoxFrame::OnAbout(wxCommandEvent& event)
+void CheckListBoxFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
   wxMessageDialog dialog(this, "Demo of wxCheckListBox control\n"
                          "About wxCheckListBox", wxYES_NO | wxCANCEL);
@@ -163,11 +164,11 @@ void CheckListBoxFrame::OnListboxSelect(wxCommandEvent& event)
   wxString strSelection;
   unsigned int nSel = event.GetSelection();
   strSelection.sprintf("item %d selected (%schecked)", nSel,
-                       m_pListBox->IsChecked(nSel) ? "" : "not ");
+                       m_pListBox->IsChecked((int)nSel) ? "" : "not ");
   SetStatusText(strSelection);
 }
 
-void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& event)
+void CheckListBoxFrame::OnListboxDblClick(wxCommandEvent& WXUNUSED(event))
 {
   wxString strSelection;
   strSelection.sprintf("item %d double clicked", m_pListBox->GetSelection());
@@ -179,9 +180,8 @@ void CheckListBoxFrame::OnCheckboxToggle(wxCommandEvent& event)
 {
   wxString strSelection;
   unsigned int nItem = event.GetInt();
-  if(event.GetInt()==-1)
-	  return;
+
   strSelection.sprintf("item %d was %schecked", nItem,
                        m_pListBox->IsChecked(nItem) ? "" : "un");
   SetStatusText(strSelection);
-}
\ No newline at end of file
+}