Augmented version to b5

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index a525fa9c29f23a2b462a8f62e586d8b5fd5924b6..33ac083c8f46d09ab5fd6ed165665212364c7bbb 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -6,47 +6,56 @@
 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifndef   __CHECKLST_H__
-#define   __CHECKLST_H__
+#ifndef   __CHECKLST__H_
+#define   __CHECKLST__H_
 
-typedef   unsigned int  uint;
+#ifdef __GNUG__
+#pragma interface "checklst.h"
+#endif
+
+// No!
+// typedef   unsigned int  size_t;
+#include <stddef.h>
 
-#if !USE_OWNER_DRAWN
+#if !wxUSE_OWNER_DRAWN
   #error  "wxCheckListBox class requires owner-drawn functionality."
 #endif
 
 class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
 
-class wxCheckListBox : public wxListBox
+class WXDLLEXPORT wxCheckListBox : public wxListBox
 {
   DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:
   // ctors
   wxCheckListBox();
-  wxCheckListBox(wxWindow *parent, const wxWindowID id,
+  wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
-                 const int nStrings = 0, 
+                 int nStrings = 0, 
                  const wxString choices[] = NULL,
-                 const long style = 0,
+                 long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);
-//                 const wxFont& font = wxNullFont);
+
+  // override base class virtuals
+  virtual void Delete(int n);
+  virtual void InsertItems(int nItems, const wxString items[], int pos);
 
   // items may be checked
-  bool  IsChecked(uint uiIndex) const;
-  void  Check(uint uiIndex, bool bCheck = TRUE);
+  bool IsChecked(size_t uiIndex) const;
+  void Check(size_t uiIndex, bool bCheck = TRUE);
 
   // accessors
-  uint  GetItemHeight() const { return m_nItemHeight; }
+  size_t GetItemHeight() 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(uint n);
+  virtual wxOwnerDrawn *CreateItem(size_t n);
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
   // pressing space or clicking the check box toggles the item
@@ -54,7 +63,7 @@ protected:
   void OnLeftClick(wxMouseEvent& event);
 
 private:
-  uint    m_nItemHeight;  // height of checklistbox items (the same for all)
+  size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
 
   DECLARE_EVENT_TABLE()
 };