Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced all int/size_t indices in wxControlWithItems API with unsigned int (committing on behalf of ABX)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-03-23 22:05:23 +00:00
parent 5aa67d6619
commit aa61d35253
112 changed files with 1367 additions and 1414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/wx/univ/checklst.h
View File

@@ -70,8 +70,8 @@ public:
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,
@@ -80,11 +80,11 @@ public:
// 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);
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();
@@ -122,4 +122,3 @@ public:
};
#endif // _WX_UNIV_CHECKLST_H_

18
include/wx/univ/combobox.h
View File

@@ -293,10 +293,10 @@ public:
// wxControlWithItems methods
virtual void Clear();
virtual void Delete(int n);
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);
virtual void Delete(unsigned int n);
virtual unsigned int GetCount() const;
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void SetSelection(int n);
virtual int GetSelection() const;
@@ -305,11 +305,11 @@ public:
protected:
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual int DoInsert(const wxString& item, unsigned int pos);
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
// common part of all ctors
void Init();

20
include/wx/univ/listbox.h
View File

@@ -97,13 +97,13 @@ public:
// implement the listbox interface defined by wxListBoxBase
virtual void Clear();
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual size_t GetCount() const
{ return m_strings->GetCount(); }
virtual wxString GetString(int n) const
virtual unsigned int GetCount() const
{ return (unsigned int)m_strings->GetCount(); }
virtual wxString GetString(unsigned int n) const
{ return m_strings->Item(n); }
virtual void SetString(int n, const wxString& s);
virtual void SetString(unsigned int n, const wxString& s);
virtual int FindString(const wxString& s, bool bCase = false) const
{ return m_strings->Index(s, bCase); }
@@ -116,15 +116,15 @@ protected:
virtual void DoSetSelection(int n, bool select);
virtual int DoAppendOnly(const wxString& item);
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 DoSetFirstItem(int n);
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
virtual void DoSetItemClientObject(int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(int n) const;
virtual void DoSetItemClientData(unsigned int n, void* clientData);
virtual void* DoGetItemClientData(unsigned int n) const;
virtual void DoSetItemClientObject(unsigned int n, wxClientData* clientData);
virtual wxClientData* DoGetItemClientObject(unsigned int n) const;
public:
// override some more base class methods

15
include/wx/univ/radiobox.h
View File

@@ -84,16 +84,17 @@ public:
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual size_t GetCount() const { return m_buttons.GetCount(); }
virtual unsigned int GetCount() const
{ return (unsigned int)m_buttons.GetCount(); }
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);
virtual wxString GetString(unsigned int n) const;
virtual void SetString(unsigned int n, const wxString& label);
virtual bool Enable(int n, bool enable = true);
virtual bool Show(int n, bool show = true);
virtual bool Enable(unsigned int n, bool enable = true);
virtual bool Show(unsigned int n, bool show = true);
virtual bool IsItemEnabled(int n) const;
virtual bool IsItemShown(int n) const;
virtual bool IsItemEnabled(unsigned int n) const;
virtual bool IsItemShown(unsigned int n) const;
// we also override the wxControl methods to avoid virtual function hiding
virtual bool Enable(bool enable = true);