X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1de4baa31f17548b32a376a71ce50fee6a3e759c..578dc95029e761a59911b7c1bc09f59384d64ddf:/include/wx/os2/checklst.h

diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index 335e8c07ed..c1d6b71f8b 100644
--- a/include/wx/os2/checklst.h
+++ b/include/wx/os2/checklst.h
@@ -24,7 +24,7 @@ class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
 class WXDLLEXPORT wxCheckListBox : public wxListBox
 {
 public:
-    // 
+    //
     // Ctors
     //
     wxCheckListBox();
@@ -35,13 +35,11 @@ public:
                    ,int                nStrings = 0
                    ,const wxString     asChoices[] = NULL
                    ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                    ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                    ,const wxString&    rsName = wxListBoxNameStr
                   );
 
-    // 
+    //
     // Override base class virtuals
     //
     virtual void Delete(int n);
@@ -52,7 +50,7 @@ public:
 
     virtual bool SetFont(const wxFont &rFont);
 
-    // 
+    //
     // Items may be checked
     //
     bool IsChecked(size_t uiIndex) const;
@@ -60,20 +58,20 @@ public:
                ,bool   bCheck = TRUE
               );
 
-    // 
+    //
     // Accessors
     //
     size_t GetItemHeight(void) const { return m_nItemHeight; }
 
 protected:
-    // 
+    //
     // We create our items ourselves and they have non-standard size,
     // so we need to override these functions
     //
     virtual wxOwnerDrawn* CreateItem(size_t n);
-    virtual bool          OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
+    virtual long          OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
 
-    // 
+    //
     // Pressing space or clicking the check box toggles the item
     //
     void OnChar(wxKeyEvent& rEvent);
@@ -89,7 +87,7 @@ private:
                                   ,const wxItemResource*  pParentResource
                                   ,const wxResourceTable* pTable = (const wxResourceTable *) NULL
                                  )
-    { 
+    {
         return(wxWindowBase::CreateItem( pChildResource
                                         ,pParentResource
                                         ,pTable