renamed RGBColor setter to avoid former overload being an override

[wxWidgets.git] / include / wx / mac / carbon / checklst.h

diff --git a/include/wx/mac/carbon/checklst.h b/include/wx/mac/carbon/checklst.h
index 630715e0a31486d1a7a73f320232b1b6c377b5c1..1f63f02d4b9393bcff0cd8b0f4b19d0b585863fc 100644 (file)
--- a/include/wx/mac/carbon/checklst.h
+++ b/include/wx/mac/carbon/checklst.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        checklst.h
+// Name:        wx/mac/carbon/checklst.h

 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      Stefan Csomor
 // Purpose:     wxCheckListBox class - a listbox with checkable items
 //              Note: this is an optional class.
 // Author:      Stefan Csomor


@@ -7,19 +7,18 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CHECKLST_H_
 #define _WX_CHECKLST_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma interface "checklst.h"
-#endif
-
-#if !defined(__MWERKS__) && !defined(__UNIX__)
-typedef   unsigned int  size_t;
-#endif
+class wxMacCheckListControl 
+{
+public :
+    virtual bool            MacIsChecked(unsigned int n) const = 0;
+    virtual void            MacCheck(unsigned int n, bool bCheck = true) = 0;
+};

 
 class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
 {
 
 class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
 {


@@ -74,22 +73,12 @@ public:
                 const wxString& name = wxListBoxNameStr);
 
     // items may be checked
                 const wxString& name = wxListBoxNameStr);
 
     // items may be checked

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

 
 

-    // override all methods which add/delete items to update m_checks array as
-    // well
-    virtual void Delete(int n);
-    // the array containing the checked status of the items
-    wxArrayInt m_checks;
+    wxMacCheckListControl* GetPeer() const;

 
 protected:
 
 protected:

-    virtual int DoAppend(const wxString& item);
-    virtual void DoInsertItems(const wxArrayString& items, int pos);
-    virtual void DoSetItems(const wxArrayString& items, void **clientData);
-    virtual void DoClear();
-    // common part of all ctors

     void Init();
 private:
 
     void Init();
 private: