replaced all int/size_t indices in wxControlWithItems API with unsigned int (committing on behalf of ABX)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -48,8 +48,8 @@ public:
|
||||
const wxValidator& validator = wxDefaultValidator,
|
||||
const wxString& name = wxListBoxNameStr);
|
||||
|
||||
bool IsChecked( int index ) const;
|
||||
void Check( int index, bool check = TRUE );
|
||||
bool IsChecked(unsigned int index) const;
|
||||
void Check(unsigned int index, bool check = true);
|
||||
|
||||
int GetItemHeight() const;
|
||||
|
||||
|
@@ -62,17 +62,17 @@ public:
|
||||
const wxString& name = wxChoiceNameStr );
|
||||
|
||||
// implement base class pure virtuals
|
||||
void Delete(int n);
|
||||
void Delete(unsigned int n);
|
||||
void Clear();
|
||||
|
||||
int GetSelection() const;
|
||||
int GetCurrentSelection() const { return GetSelection(); }
|
||||
void SetSelection( int n );
|
||||
virtual void SetSelection(int n);
|
||||
|
||||
virtual size_t GetCount() const;
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
wxString GetString( int n ) const;
|
||||
void SetString( int n, const wxString& string );
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& string);
|
||||
|
||||
static wxVisualAttributes
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
@@ -82,12 +82,12 @@ protected:
|
||||
|
||||
void DoApplyWidgetStyle(GtkRcStyle *style);
|
||||
virtual int DoAppend(const wxString& item);
|
||||
virtual int DoInsert(const wxString& item, int pos);
|
||||
virtual int DoInsert(const wxString& item, unsigned 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 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;
|
||||
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
@@ -95,7 +95,7 @@ protected:
|
||||
|
||||
private:
|
||||
// common part of Create() and DoAppend()
|
||||
int GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item);
|
||||
int GtkAddHelper(GtkWidget *menu, unsigned int pos, const wxString& item);
|
||||
|
||||
// this array is only used for controls with wxCB_SORT style, so only
|
||||
// allocate it if it's needed (hence using pointer)
|
||||
|
@@ -81,16 +81,16 @@ public:
|
||||
const wxString& name = wxComboBoxNameStr);
|
||||
|
||||
void Clear();
|
||||
void Delete( int n );
|
||||
void Delete(unsigned int n);
|
||||
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
int GetSelection() const;
|
||||
int GetCurrentSelection() const;
|
||||
wxString GetString( int n ) const;
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
wxString GetStringSelection() const;
|
||||
virtual size_t GetCount() const;
|
||||
void SetSelection( int n );
|
||||
void SetString(int n, const wxString &text);
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual void SetSelection(int n);
|
||||
virtual void SetString(unsigned int n, const wxString &text);
|
||||
|
||||
wxString GetValue() const;
|
||||
void SetValue(const wxString& value);
|
||||
@@ -160,12 +160,12 @@ public:
|
||||
|
||||
protected:
|
||||
virtual int DoAppend(const wxString& item);
|
||||
virtual int DoInsert(const wxString& item, int pos);
|
||||
virtual int DoInsert(const wxString& item, unsigned 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 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;
|
||||
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
|
||||
|
@@ -68,11 +68,11 @@ public:
|
||||
|
||||
// implement base class pure virtuals
|
||||
virtual void Clear();
|
||||
virtual void Delete(int n);
|
||||
virtual void Delete(unsigned int n);
|
||||
|
||||
virtual size_t GetCount() const;
|
||||
virtual wxString GetString(int n) const;
|
||||
virtual void SetString(int n, const wxString& s);
|
||||
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 bool IsSelected(int n) const;
|
||||
@@ -81,15 +81,15 @@ public:
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
|
||||
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;
|
||||
|
||||
static wxVisualAttributes
|
||||
GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
|
||||
|
@@ -81,21 +81,21 @@ public:
|
||||
|
||||
|
||||
// implement wxItemContainerImmutable methods
|
||||
virtual size_t GetCount() const;
|
||||
virtual unsigned int GetCount() const;
|
||||
|
||||
virtual wxString GetString(int n) const;
|
||||
virtual void SetString(int n, const wxString& s);
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& s);
|
||||
|
||||
virtual void SetSelection(int n);
|
||||
virtual int GetSelection() const;
|
||||
|
||||
|
||||
// implement wxRadioBoxBase methods
|
||||
virtual bool Show(int n, bool show = true);
|
||||
virtual bool Enable(int n, bool enable = true);
|
||||
virtual bool Show(unsigned int n, bool show = true);
|
||||
virtual bool Enable(unsigned int n, bool enable = 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;
|
||||
|
||||
|
||||
// override some base class methods to operate on radiobox itself too
|
||||
|
Reference in New Issue
Block a user