Applied patch [ 597700 ] Fix proposal for wxJoystick under MSW

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index df6b479e9c551b7659813f162b657c12ffd44c53..473cc09b76901cdf1d314f3224865f886a254e57 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -16,19 +16,15 @@
 #pragma interface "checklst.h"
 #endif
 
 #pragma interface "checklst.h"
 #endif
 

-// No!
-// typedef   unsigned int  size_t;
-#include <stddef.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
+class WXDLLEXPORT wxOwnerDrawn;
+class WXDLLEXPORT wxCheckListBoxItem; // fwd decl, defined in checklst.cpp

 
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 public:
   // ctors
   wxCheckListBox();
 public:
   // ctors
   wxCheckListBox();


@@ -43,13 +39,12 @@ public:
 
   // override base class virtuals
   virtual void Delete(int n);
 
   // 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
 
   virtual bool SetFont( const wxFont &font );
 
   // items may be checked

-  bool IsChecked(size_t uiIndex) const;
-  void Check(size_t uiIndex, bool bCheck = TRUE);
+  virtual bool IsChecked(size_t uiIndex) const;
+  virtual void Check(size_t uiIndex, bool bCheck = TRUE);

 
   // accessors
   size_t GetItemHeight() const { return m_nItemHeight; }
 
   // accessors
   size_t GetItemHeight() const { return m_nItemHeight; }


@@ -61,13 +56,14 @@ protected:
   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

-  void OnChar(wxKeyEvent& event);
+  void OnKeyDown(wxKeyEvent& event);

   void OnLeftClick(wxMouseEvent& event);
 
 private:
   size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
 
   DECLARE_EVENT_TABLE()
   void OnLeftClick(wxMouseEvent& event);
 
 private:
   size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
 
   DECLARE_EVENT_TABLE()

+  DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 };
 
 #endif    //_CHECKLST_H
 };
 
 #endif    //_CHECKLST_H