Fix wxWrapSizer minimal size calculation.

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

diff --git a/include/wx/msw/wince/checklst.h b/include/wx/msw/wince/checklst.h
index 01f0c233194b29317b05e1bfef8a1640a329e248..896a30bdad0f4640d2b7681506065babbf6a3af4 100644 (file)
--- a/include/wx/msw/wince/checklst.h
+++ b/include/wx/msw/wince/checklst.h
@@ -12,7 +12,7 @@
 #ifndef   __CHECKLSTCE__H_
 #define   __CHECKLSTCE__H_
 
 #ifndef   __CHECKLSTCE__H_
 #define   __CHECKLSTCE__H_
 

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

 {
 public:
     // ctors
 {
 public:
     // ctors


@@ -49,15 +49,13 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
 

-    // override base class virtuals
-    virtual void Delete(unsigned int n);
-

     // items may be checked
     virtual bool IsChecked(unsigned int uiIndex) const;
     virtual void Check(unsigned int uiIndex, bool bCheck = true);
 
     // public interface derived from wxListBox and lower classes
     // items may be checked
     virtual bool IsChecked(unsigned int uiIndex) const;
     virtual void Check(unsigned int uiIndex, bool bCheck = true);
 
     // public interface derived from wxListBox and lower classes

-    virtual void Clear();
+    virtual void DoClear();
+    virtual void DoDeleteOneItem(unsigned int n);

     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;
     virtual unsigned int GetCount() const;
     virtual int GetSelection() const;
     virtual int GetSelections(wxArrayInt& aSelections) const;


@@ -72,20 +70,18 @@ protected:
     void OnSize(wxSizeEvent& event);
 
     // protected interface derived from wxListBox and lower classes
     void OnSize(wxSizeEvent& event);
 
     // protected interface derived from wxListBox and lower classes

-    virtual int DoAppend(const wxString& item);
+    virtual int DoInsertItems(const wxArrayStringsAdapter& items,
+                              unsigned int pos,
+                              void **clientData, wxClientDataType type);
+

     virtual void* DoGetItemClientData(unsigned int n) const;
     virtual void* DoGetItemClientData(unsigned int n) const;

-    virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
-    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);
-    virtual void DoSetFirstItem(int n);

     virtual void DoSetItemClientData(unsigned int n, void* clientData);
     virtual void DoSetItemClientData(unsigned int n, void* clientData);

-    virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
+    virtual void DoSetFirstItem(int n);

     virtual void DoSetSelection(int n, bool select);
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 private:
     virtual void DoSetSelection(int n, bool select);
     // convert our styles to Windows
     virtual WXDWORD MSWGetStyle(long style, WXDWORD *exstyle) const;
 
 private:

-

     wxArrayPtrVoid m_itemsClientData;
 
     DECLARE_EVENT_TABLE()
     wxArrayPtrVoid m_itemsClientData;
 
     DECLARE_EVENT_TABLE()