Blindly added wxImageList::replace( int, bitmap, mask )

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

diff --git a/include/wx/univ/checklst.h b/include/wx/univ/checklst.h
index af878cad02b634807e2486699e43797a91a5bd99..619ab94038f1adfea26f178ae4a522b0e9423223 100644 (file)
--- a/include/wx/univ/checklst.h
+++ b/include/wx/univ/checklst.h
@@ -12,10 +12,6 @@
 #ifndef _WX_UNIV_CHECKLST_H_
 #define _WX_UNIV_CHECKLST_H_
 
 #ifndef _WX_UNIV_CHECKLST_H_
 #define _WX_UNIV_CHECKLST_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "univchecklst.h"
-#endif
-

 // ----------------------------------------------------------------------------
 // actions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // actions
 // ----------------------------------------------------------------------------


@@ -37,7 +33,7 @@ public:
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    int nStrings = 0,
                    const wxPoint& pos = wxDefaultPosition,
                    const wxSize& size = wxDefaultSize,
                    int nStrings = 0,

-                   const wxString *choices = NULL,
+                   const wxString choices[] = NULL,

                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxListBoxNameStr)
                    long style = 0,
                    const wxValidator& validator = wxDefaultValidator,
                    const wxString& name = wxListBoxNameStr)


@@ -60,7 +56,7 @@ public:
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int nStrings = 0,
                 const wxPoint& pos = wxDefaultPosition,
                 const wxSize& size = wxDefaultSize,
                 int nStrings = 0,

-                const wxString *choices = NULL,
+                const wxString choices[] = (const wxString *) NULL,

                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);
                 long style = 0,
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxListBoxNameStr);


@@ -74,8 +70,8 @@ public:
                 const wxString& name = wxListBoxNameStr);
 
     // implement check list box methods
                 const wxString& name = wxListBoxNameStr);
 
     // implement check list box methods

-    virtual bool IsChecked(size_t item) const;
-    virtual void Check(size_t item, bool check = TRUE);
+    virtual bool IsChecked(unsigned int item) const;
+    virtual void Check(unsigned int item, bool check = true);

 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,
 
     // and input handling
     virtual bool PerformAction(const wxControlAction& action,


@@ -84,11 +80,11 @@ public:
 
     // override all methods which add/delete items to update m_checks array as
     // well
 
     // override all methods which add/delete items to update m_checks array as
     // well

-    virtual void Delete(int n);
+    virtual void Delete(unsigned int n);

 
 protected:
     virtual int DoAppend(const wxString& item);
 
 protected:
     virtual int DoAppend(const wxString& item);

-    virtual void DoInsertItems(const wxArrayString& items, int pos);
+    virtual void DoInsertItems(const wxArrayString& items, unsigned int pos);

     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoClear();
 
     virtual void DoSetItems(const wxArrayString& items, void **clientData);
     virtual void DoClear();
 


@@ -126,4 +122,3 @@ public:
 };
 
 #endif // _WX_UNIV_CHECKLST_H_
 };
 
 #endif // _WX_UNIV_CHECKLST_H_

-