Fixed compilation for when not including <windows.h>

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index f511a98087bd14949bb5701ffeea5c0f20559bac..8c1d964c082e67ce4eb334c7976c01077618456c 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -16,15 +16,17 @@
 #pragma interface "checklst.h"
 #endif
 
 #pragma interface "checklst.h"
 #endif
 

-typedef   unsigned int  uint;
+// 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
 
   #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:
 {
   DECLARE_DYNAMIC_CLASS(wxCheckListBox)
 public:


@@ -41,16 +43,16 @@ public:
 //                 const wxFont& font = wxNullFont);
 
   // items may be checked
 //                 const wxFont& font = wxNullFont);
 
   // 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


@@ -58,7 +60,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()
 };