X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..328fafa1db150b08d1793bafd1b17208857d0102:/include/wx/os2/checklst.h

diff --git a/include/wx/os2/checklst.h b/include/wx/os2/checklst.h
index 59a7951d67..4ead4b063a 100644
--- a/include/wx/os2/checklst.h
+++ b/include/wx/os2/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        checklst.h
+// Name:        wx/os2/checklst.h
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      David Webster
@@ -15,65 +15,79 @@
 
 #include <stddef.h>
 
-#include "wx/setup.h"
+#include "wx/defs.h"
 
-class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
+class wxOwnerDrawn; // so the compiler knows, it is a class.
 
-class WXDLLEXPORT wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase
 {
-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:
-  // ctors
-  wxCheckListBox();
-  wxCheckListBox(wxWindow *parent, wxWindowID id,
-                 const wxPoint& pos = wxDefaultPosition,
-                 const wxSize& size = wxDefaultSize,
-                 int nStrings = 0,
-                 const wxString choices[] = NULL,
-                 long style = 0,
-#if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-                 const wxValidator* validator = wxDefaultValidator,
-#  else
-                 const wxValidator& validator = wxDefaultValidator,
-#  endif
-#endif
-                 const wxString& name = wxListBoxNameStr);
+    //
+    // Ctors
+    //
+    wxCheckListBox();
+    wxCheckListBox( wxWindow*          pParent
+                   ,wxWindowID         vId
+                   ,const wxPoint&     rPos = wxDefaultPosition
+                   ,const wxSize&      vSize = wxDefaultSize
+                   ,int                nStrings = 0
+                   ,const wxString     asChoices[] = NULL
+                   ,long               lStyle = 0
+                   ,const wxValidator& rValidator = wxDefaultValidator
+                   ,const wxString&    rsName = wxListBoxNameStr
+                  );
+    wxCheckListBox( wxWindow*            pParent
+                   ,wxWindowID           vId
+                   ,const wxPoint&       rPos
+                   ,const wxSize&        vSize
+                   ,const wxArrayString& asChoices
+                   ,long                 lStyle = 0
+                   ,const wxValidator&   rValidator = wxDefaultValidator
+                   ,const wxString&      rsName = wxListBoxNameStr
+                  );
 
-  // override base class virtuals
-  virtual void Delete(int n);
-  virtual void InsertItems(int nItems, const wxString items[], int pos);
+    //
+    // Override base class virtuals
+    //
+    virtual void Delete(unsigned int n);
 
-  virtual bool SetFont( const wxFont &font );
+    virtual bool SetFont(const wxFont &rFont);
 
-  // items may be checked
-  bool IsChecked(size_t uiIndex) const;
-  void Check(size_t uiIndex, bool bCheck = TRUE);
+    //
+    // Items may be checked
+    //
+    bool IsChecked(unsigned int uiIndex) const;
+    void Check(unsigned int uiIndex, bool bCheck = true);
 
-  // accessors
-  size_t GetItemHeight() const { return m_nItemHeight; }
+    //
+    // 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 *item);
+    //
+    // 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 long          OS2OnMeasure(WXMEASUREITEMSTRUCT* pItem);
 
-  // pressing space or clicking the check box toggles the item
-  void OnChar(wxKeyEvent& event);
-  void OnLeftClick(wxMouseEvent& event);
+    virtual int DoInsertItems(const wxArrayStringsAdapter & items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
 
-private:
-  size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
+    //
+    // Pressing space or clicking the check box toggles the item
+    //
+    void OnChar(wxKeyEvent& rEvent);
+    void OnLeftClick(wxMouseEvent& rEvent);
 
-  //Virtual function hiding suppression, do not use
-  virtual wxControl *CreateItem(const wxItemResource* childResource,
-                                const wxItemResource* parentResource,
-                                const wxResourceTable *table = (const wxResourceTable *) NULL)
-  { return(wxWindowBase::CreateItem(childResource, parentResource, table));};
+private:
+    size_t m_nItemHeight;  // height of checklistbox items (the same for all)
 
-  DECLARE_EVENT_TABLE()
-};
+    DECLARE_DYNAMIC_CLASS(wxCheckListBox)
+    DECLARE_EVENT_TABLE()
+}; // end of CLASS wxCheckListBox
 
 #endif
    // _WX_CHECKLST_H_