Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index a58714daa6e2484166c8a11e8a4ef15e06e180bb..a63221640309e8ffd9fb8115591cf8f63ff414c3 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.h
+// Name:        wx/msw/checklst.h

 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin
 // 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>


@@ -12,55 +12,85 @@
 #ifndef   __CHECKLST__H_
 #define   __CHECKLST__H_
 
 #ifndef   __CHECKLST__H_
 #define   __CHECKLST__H_
 

-#ifdef __GNUG__
-#pragma interface "checklst.h"
-#endif
-
-typedef   unsigned int  size_t;
-

 #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 WXDLLIMPEXP_FWD_CORE wxOwnerDrawn;
+class WXDLLIMPEXP_FWD_CORE wxCheckListBoxItem; // fwd decl, defined in checklst.cpp

 
 

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

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)

 public:
   // ctors
   wxCheckListBox();
   wxCheckListBox(wxWindow *parent, wxWindowID id,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
 public:
   // ctors
   wxCheckListBox();
   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& name = wxListBoxNameStr);
                  const wxString choices[] = NULL,
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);

-//                 const wxFont& font = wxNullFont);
+  wxCheckListBox(wxWindow *parent, wxWindowID id,
+                 const wxPoint& pos,
+                 const wxSize& size,
+                 const wxArrayString& choices,
+                 long style = 0,
+                 const wxValidator& validator = wxDefaultValidator,
+                 const wxString& name = wxListBoxNameStr);
+
+  bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                int n = 0, const wxString choices[] = NULL,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+  bool Create(wxWindow *parent, wxWindowID id,
+                const wxPoint& pos,
+                const wxSize& size,
+                const wxArrayString& choices,
+                long style = 0,
+                const wxValidator& validator = wxDefaultValidator,
+                const wxString& name = wxListBoxNameStr);
+
+  // override base class virtuals
+  virtual void Delete(unsigned int n);
+
+  virtual bool SetFont( const wxFont &font );

 
   // items may be checked
 
   // items may be checked

-  bool  IsChecked(size_t uiIndex) const;
-  void  Check(size_t uiIndex, bool bCheck = TRUE);
+  virtual bool IsChecked(unsigned int uiIndex) const;
+  virtual void Check(unsigned int uiIndex, bool bCheck = true);
+
+  // return the index of the item at this position or wxNOT_FOUND
+  int HitTest(const wxPoint& pt) const { return DoHitTestItem(pt.x, pt.y); }
+  int HitTest(wxCoord x, wxCoord y) const { return DoHitTestItem(x, y); }

 
   // accessors
 
   // accessors

-  size_t  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
   // we create our items ourselves and they have non-standard size,
   // so we need to override these functions

-  virtual wxOwnerDrawn *CreateItem(size_t n);
+  virtual wxOwnerDrawn *CreateLboxItem(size_t n);

   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 
   virtual bool          MSWOnMeasure(WXMEASUREITEMSTRUCT *item);
 

+protected:
+  // this can't be called DoHitTest() because wxWindow already has this method
+  int DoHitTestItem(wxCoord x, wxCoord y) const;
+

   // pressing space or clicking the check box toggles the item
   // pressing space or clicking the check box toggles the item

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

   void OnLeftClick(wxMouseEvent& event);
 
   void OnLeftClick(wxMouseEvent& event);
 

+  wxSize DoGetBestSize() const;
+

 private:
   size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
 
   DECLARE_EVENT_TABLE()
 private:
   size_t    m_nItemHeight;  // height of checklistbox items (the same for all)
 
   DECLARE_EVENT_TABLE()

+  DECLARE_DYNAMIC_CLASS_NO_COPY(wxCheckListBox)

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