Fix for Bug #229543

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index a525fa9c29f23a2b462a8f62e586d8b5fd5924b6..24003d4d439b1ce66d3702e5a91e145c945f656c 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -2,51 +2,62 @@
 // Name:        checklst.h
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin
 // Name:        checklst.h
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     16.11.97
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // 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
+
+#include "wx/setup.h"

 
 

-#if !USE_OWNER_DRAWN
+#if !wxUSE_OWNER_DRAWN

   #error  "wxCheckListBox class requires owner-drawn functionality."
 #endif
 
   #error  "wxCheckListBox class requires owner-drawn functionality."
 #endif
 

-class wxCheckListBoxItem; // fwd decl, define in checklst.cpp
+#include "wx/listbox.h"
+
+class wxCheckListBoxItem; // fwd decl, defined in checklst.cpp

 
 

-class wxCheckListBox : public wxListBox
+class WXDLLEXPORT wxCheckListBox : public wxListBox

 {
   DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:
   // ctors
   wxCheckListBox();
 {
   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 wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,

-                 const int nStrings = 0, 
+                 int nStrings = 0,

                  const wxString choices[] = NULL,
                  const wxString choices[] = NULL,

-                 const long style = 0,
+                 long style = 0,

                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);
                  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);
+
+  virtual bool SetFont( const wxFont &font );

 
   // items may be checked
 
   // 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
 
   // 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
 
 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
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
   // pressing space or clicking the check box toggles the item


@@ -54,7 +65,7 @@ protected:
   void OnLeftClick(wxMouseEvent& event);
 
 private:
   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()
 };
 
   DECLARE_EVENT_TABLE()
 };