corrected conditional include

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 33ac083c8f46d09ab5fd6ed165665212364c7bbb..24003d4d439b1ce66d3702e5a91e145c945f656c 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -2,7 +2,7 @@
 // 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>


@@ -16,15 +16,15 @@
 #pragma interface "checklst.h"
 #endif
 
 #pragma interface "checklst.h"
 #endif
 

-// No!
-// typedef   unsigned int  size_t;
-#include <stddef.h>
+#include "wx/setup.h"

 
 #if !wxUSE_OWNER_DRAWN
   #error  "wxCheckListBox class requires owner-drawn functionality."
 #endif
 
 
 #if !wxUSE_OWNER_DRAWN
   #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 WXDLLEXPORT wxCheckListBox : public wxListBox
 {
 
 class WXDLLEXPORT wxCheckListBox : public wxListBox
 {


@@ -35,7 +35,7 @@ public:
   wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
   wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,

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

                  const wxString choices[] = NULL,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString choices[] = NULL,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,


@@ -45,6 +45,8 @@ public:
   virtual void Delete(int n);
   virtual void InsertItems(int nItems, const wxString items[], int pos);
 
   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
   bool IsChecked(size_t uiIndex) const;
   void Check(size_t uiIndex, bool bCheck = TRUE);
   // items may be checked
   bool IsChecked(size_t uiIndex) const;
   void Check(size_t uiIndex, bool bCheck = TRUE);