Fixed HitTest for columns > 1

[wxWidgets.git] / samples / widgets / checkbox.cpp

diff --git a/samples/widgets/checkbox.cpp b/samples/widgets/checkbox.cpp
index 8b242623b2d1d22a7ca63c6fcc3256ef9c4667e0..34295c7ee8d631c5eb91044ae012e69c2018cd76 100644 (file)
--- a/samples/widgets/checkbox.cpp
+++ b/samples/widgets/checkbox.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Program:     wxWindows Widgets Sample
+// Program:     wxWidgets Widgets Sample

 // Name:        checkbox.cpp
 // Purpose:     Part of the widgets sample showing wxCheckBox
 // Author:      Dimitri Schoolwerth
 // Name:        checkbox.cpp
 // Purpose:     Part of the widgets sample showing wxCheckBox
 // Author:      Dimitri Schoolwerth


@@ -29,6 +29,7 @@
     #include "wx/app.h"
     #include "wx/log.h"
 
     #include "wx/app.h"
     #include "wx/log.h"
 

+    #include "wx/bitmap.h"

     #include "wx/button.h"
     #include "wx/checkbox.h"
 
     #include "wx/button.h"
     #include "wx/checkbox.h"
 


@@ -147,8 +148,8 @@ void CheckBoxWidgetsPage::OnCheckBox(wxCommandEvent& event)
     };
     wxCheckBoxState state = (wxCheckBoxState) event.GetInt();
 
     };
     wxCheckBoxState state = (wxCheckBoxState) event.GetInt();
 

-    wxCHECK_RET( (state >= 0) && (state < WXSIZEOF(stateNames)),
-        "event.GetInt() returned an invalid wxCheckBoxState" );
+    wxCHECK_RET( (state >= (wxCheckBoxState)0) && (state < (wxCheckBoxState)WXSIZEOF(stateNames)),
+        _T("event.GetInt() returned an invalid wxCheckBoxState") );

 
     wxLogMessage(wxT("Checkbox now set to state: %s"),
         stateNames[state].c_str());
 
     wxLogMessage(wxT("Checkbox now set to state: %s"),
         stateNames[state].c_str());