Applied patch [ 778625 ] wxSVGFileDC and UNICODE build

[wxWidgets.git] / include / wx / os2 / checklst.h

diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index 335e8c07edcccff3bd7bda2f63d44496025a1278..6a73d7052b345e686796cdc68b8f289412dbd672 100644 (file)
--- 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:
 class WXDLLEXPORT wxCheckListBox : public wxListBox
 {
 public:

-    // 
+    //

     // Ctors
     //
     wxCheckListBox();
     // Ctors
     //
     wxCheckListBox();


@@ -35,13 +35,11 @@ public:
                    ,int                nStrings = 0
                    ,const wxString     asChoices[] = NULL
                    ,long               lStyle = 0
                    ,int                nStrings = 0
                    ,const wxString     asChoices[] = NULL
                    ,long               lStyle = 0

-#if wxUSE_VALIDATORS

                    ,const wxValidator& rValidator = wxDefaultValidator
                    ,const wxValidator& rValidator = wxDefaultValidator

-#endif

                    ,const wxString&    rsName = wxListBoxNameStr
                   );
 
                    ,const wxString&    rsName = wxListBoxNameStr
                   );
 

-    // 
+    //

     // Override base class virtuals
     //
     virtual void Delete(int n);
     // Override base class virtuals
     //
     virtual void Delete(int n);


@@ -52,7 +50,7 @@ public:
 
     virtual bool SetFont(const wxFont &rFont);
 
 
     virtual bool SetFont(const wxFont &rFont);
 

-    // 
+    //

     // Items may be checked
     //
     bool IsChecked(size_t uiIndex) const;
     // Items may be checked
     //
     bool IsChecked(size_t uiIndex) const;


@@ -60,20 +58,20 @@ public:
                ,bool   bCheck = TRUE
               );
 
                ,bool   bCheck = TRUE
               );
 

-    // 
+    //

     // Accessors
     //
     size_t GetItemHeight(void) const { return m_nItemHeight; }
 
 protected:
     // 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);
     // 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);
     // Pressing space or clicking the check box toggles the item
     //
     void OnChar(wxKeyEvent& rEvent);


@@ -82,19 +80,6 @@ protected:
 private:
     size_t                          m_nItemHeight;  // height of checklistbox items (the same for all)
 
 private:
     size_t                          m_nItemHeight;  // height of checklistbox items (the same for all)
 

-    //
-    // Virtual function hiding suppression, do not use
-    //
-    virtual wxControl* CreateItem( const wxItemResource*  pChildResource
-                                  ,const wxItemResource*  pParentResource
-                                  ,const wxResourceTable* pTable = (const wxResourceTable *) NULL
-                                 )
-    { 
-        return(wxWindowBase::CreateItem( pChildResource
-                                        ,pParentResource
-                                        ,pTable
-                                       ));
-    }

     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
     DECLARE_EVENT_TABLE()
 }; // end of CLASS wxCheckListBoxItem
     DECLARE_DYNAMIC_CLASS(wxCheckListBox)
     DECLARE_EVENT_TABLE()
 }; // end of CLASS wxCheckListBoxItem