Several instances of int --> unsigned int

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38320 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/src/_control.i b/wxPython/src/_control.i
index a043e77552d246f812351977e3d239856d8470dc..85d8175ffd55f24af83122f1f66dfaf2c98cea3a 100644 (file)
--- a/wxPython/src/_control.i
+++ b/wxPython/src/_control.i
@@ -157,7 +157,7 @@ need to add a lot of items.", "",
         DocStr(Insert,
                "Insert an item into the control before the item at the ``pos`` index,
 optionally associating some data object with the item.", "");
         DocStr(Insert,
                "Insert an item into the control before the item at the ``pos`` index,
 optionally associating some data object with the item.", "");

-        int Insert(const wxString& item, int pos, PyObject* clientData=NULL) {
+        int Insert(const wxString& item, unsigned int pos, PyObject* clientData=NULL) {

             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
                 return self->Insert(item, pos, data);
             if (clientData) {
                 wxPyClientData* data = new wxPyClientData(clientData);
                 return self->Insert(item, pos, data);


@@ -172,7 +172,7 @@ optionally associating some data object with the item.", "");
         "Removes all items from the control.", "");
     
     DocDeclStr(
         "Removes all items from the control.", "");
     
     DocDeclStr(

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

         "Deletes the item at the zero-based index 'n' from the control. Note
 that it is an error (signalled by a `wx.PyAssertionError` exception if
 enabled) to remove an item with the index negative or greater or equal
         "Deletes the item at the zero-based index 'n' from the control. Note
 that it is an error (signalled by a `wx.PyAssertionError` exception if
 enabled) to remove an item with the index negative or greater or equal


@@ -184,7 +184,7 @@ than the number of items in the control.", "");
      %extend {
         DocStr(GetClientData,
                "Returns the client data associated with the given item, (if any.)", "");
      %extend {
         DocStr(GetClientData,
                "Returns the client data associated with the given item, (if any.)", "");

-        PyObject* GetClientData(int n) {
+        PyObject* GetClientData(unsigned int n) {

             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             if (data) {
                 Py_INCREF(data->m_obj);
             wxPyClientData* data = (wxPyClientData*)self->GetClientObject(n);
             if (data) {
                 Py_INCREF(data->m_obj);


@@ -197,7 +197,7 @@ than the number of items in the control.", "");
 
         DocStr(SetClientData,
                "Associate the given client data with the item at position n.", "");
 
         DocStr(SetClientData,
                "Associate the given client data with the item at position n.", "");

-        void SetClientData(int n, PyObject* clientData) {
+        void SetClientData(unsigned int n, PyObject* clientData) {

             wxPyClientData* data = new wxPyClientData(clientData);
             self->SetClientObject(n, data);
         }
             wxPyClientData* data = new wxPyClientData(clientData);
             self->SetClientObject(n, data);
         }


@@ -206,7 +206,7 @@ than the number of items in the control.", "");
 
     
     DocDeclStr(
 
     
     DocDeclStr(

-        virtual size_t , GetCount() const,
+        virtual unsigned int , GetCount() const,

         "Returns the number of items in the control.", "");
     
     DocDeclStr(
         "Returns the number of items in the control.", "");
     
     DocDeclStr(


@@ -214,7 +214,7 @@ than the number of items in the control.", "");
         "Returns True if the control is empty or False if it has some items.", "");
     
     DocDeclStr(
         "Returns True if the control is empty or False if it has some items.", "");
     
     DocDeclStr(

-        virtual wxString , GetString(int n) const,
+        virtual wxString , GetString(unsigned int n) const,

         "Returns the label of the item with the given index.", "");
     
     DocDeclStr(
         "Returns the label of the item with the given index.", "");
     
     DocDeclStr(


@@ -222,7 +222,7 @@ than the number of items in the control.", "");
         "", "");
     
     DocDeclStr(
         "", "");
     
     DocDeclStr(

-        virtual void , SetString(int n, const wxString& s),
+        virtual void , SetString(unsigned int n, const wxString& s),

         "Sets the label for the given item.", "");
     
     DocDeclStr(
         "Sets the label for the given item.", "");
     
     DocDeclStr(

diff --git a/wxPython/src/_listbox.i b/wxPython/src/_listbox.i
index ef426b07a030d028d1b6e8fc6828172f7739741e..2bf130c77c627747cfe9852b559c70350ac72b71 100644 (file)
--- a/wxPython/src/_listbox.i
+++ b/wxPython/src/_listbox.i
@@ -63,7 +63,7 @@ public:
         }
     }
 
         }
     }
 

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

     void Set(const wxArrayString& items/*, void **clientData = NULL */);
 
     // multiple selection logic
     void Set(const wxArrayString& items/*, void **clientData = NULL */);
 
     // multiple selection logic


@@ -165,8 +165,8 @@ public:
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxPyListBoxNameStr);
 
                 const wxValidator& validator = wxDefaultValidator,
                 const wxString& name = wxPyListBoxNameStr);
 

-    bool  IsChecked(int index);
-    void  Check(int index, int check = true);
+    bool  IsChecked(unsigned int index);
+    void  Check(unsigned int index, int check = true);

 
 #if defined(__WXMSW__) || defined(__WXGTK__)
     int GetItemHeight();
 
 #if defined(__WXMSW__) || defined(__WXGTK__)
     int GetItemHeight();

diff --git a/wxPython/src/_radio.i b/wxPython/src/_radio.i
index 35aaa0f3b34d693ae2d68246b9fa146bf499e06d..972f260c59f553b620323accb508f7d0e7f4b5f9 100644 (file)
--- a/wxPython/src/_radio.i
+++ b/wxPython/src/_radio.i
@@ -68,23 +68,17 @@ public:
     %pythoncode { SetItemLabel = SetString };
 
     // change the individual radio button state
     %pythoncode { SetItemLabel = SetString };
 
     // change the individual radio button state

-    %Rename(EnableItem,  virtual void, Enable(int n, bool enable = true));
-    %Rename(ShowItem,  virtual void, Show(int n, bool show = true));
+    %Rename(EnableItem,  virtual void, Enable(unsigned int n, bool enable = true));
+    %Rename(ShowItem,  virtual void, Show(unsigned int n, bool show = true));
+    virtual bool IsItemEnabled(unsigned int n) const;
+    virtual bool IsItemShown(unsigned int n) const;

 
 

-#ifndef __WXGTK__

     // layout parameters
     // layout parameters

-    virtual int GetColumnCount() const;
-    virtual int GetRowCount() const;
+    virtual unsigned int GetColumnCount() const;
+    virtual unsigned int GetRowCount() const;

 
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;
 
     // return the item above/below/to the left/right of the given one
     int GetNextItem(int item, wxDirection dir, long style) const;

-#else
-    %extend {
-        int GetColumnCount() const { return -1; }
-        int GetRowCount() const { return -1; }
-        int GetNextItem(int item, wxDirection dir, long style) const { return -1; }
-    }
-#endif

 
 //    bool IsValid(int n) const;  ** not public
         
 
 //    bool IsValid(int n) const;  ** not public