Set initial window size as its minimal size.

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

diff --git a/include/wx/msw/checklst.h b/include/wx/msw/checklst.h
index 24003d4d439b1ce66d3702e5a91e145c945f656c..4a9ab2281585d5700ff7e19b1a546a4d4dc5d446 100644 (file)
--- a/include/wx/msw/checklst.h
+++ b/include/wx/msw/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -12,23 +12,15 @@
 #ifndef   __CHECKLST__H_
 #define   __CHECKLST__H_
 
 #ifndef   __CHECKLST__H_
 #define   __CHECKLST__H_
 

-#ifdef __GNUG__
-#pragma interface "checklst.h"
-#endif
-
-#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
 

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

 
 

-class wxCheckListBoxItem; // fwd decl, defined in checklst.cpp
-
-class WXDLLEXPORT wxCheckListBox : public wxListBox
+class WXDLLIMPEXP_CORE wxCheckListBox : public wxCheckListBoxBase

 {
 {

-  DECLARE_DYNAMIC_CLASS(wxCheckListBox)

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


@@ -40,34 +32,58 @@ public:
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);
                  long style = 0,
                  const wxValidator& validator = wxDefaultValidator,
                  const wxString& name = wxListBoxNameStr);

+  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
 
   // override base class virtuals

-  virtual void Delete(int n);
-  virtual void InsertItems(int nItems, const wxString items[], int pos);
+  virtual void Delete(unsigned int n);

 
   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(unsigned int uiIndex) const;
+  virtual void Check(unsigned int uiIndex, bool bCheck = true);

 
   // accessors
   size_t GetItemHeight() const { return m_nItemHeight; }
 
 
   // accessors
   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:

   // 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