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:
@@ -4,9 +4,9 @@
|
||||
// Author: David Elliott
|
||||
// Modified by:
|
||||
// Created: 2003/03/16
|
||||
// RCS-ID: $Id:
|
||||
// RCS-ID: $Id$
|
||||
// Copyright: (c) 2003 David Elliott
|
||||
// Licence: wxWindows licence
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#ifndef __WX_COCOA_CHECKLST_H__
|
||||
@@ -73,8 +73,8 @@ protected:
|
||||
// ------------------------------------------------------------------------
|
||||
public:
|
||||
// check list box specific 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);
|
||||
};
|
||||
|
||||
#endif // __WX_COCOA_CHECKLST_H__
|
||||
|
@@ -81,19 +81,19 @@ protected:
|
||||
// ------------------------------------------------------------------------
|
||||
public:
|
||||
virtual void Clear();
|
||||
virtual void Delete(int);
|
||||
virtual size_t GetCount() const;
|
||||
virtual wxString GetString(int) const;
|
||||
virtual void SetString(int, const wxString&);
|
||||
virtual void Delete(unsigned int n);
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual wxString GetString(unsigned int) const;
|
||||
virtual void SetString(unsigned int pos, const wxString&);
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
virtual int GetSelection() const;
|
||||
virtual int DoAppend(const wxString&);
|
||||
virtual int DoInsert(const wxString&, int);
|
||||
virtual void DoSetItemClientData(int, void*);
|
||||
virtual void* DoGetItemClientData(int) const;
|
||||
virtual void DoSetItemClientObject(int, wxClientData*);
|
||||
virtual wxClientData* DoGetItemClientObject(int) const;
|
||||
virtual void SetSelection(int);
|
||||
virtual int DoInsert(const wxString&, unsigned int pos);
|
||||
virtual void DoSetItemClientData(unsigned int, void*);
|
||||
virtual void* DoGetItemClientData(unsigned int) const;
|
||||
virtual void DoSetItemClientObject(unsigned int, wxClientData*);
|
||||
virtual wxClientData* DoGetItemClientObject(unsigned int) const;
|
||||
virtual void SetSelection(int pos);
|
||||
protected:
|
||||
wxSortedArrayString *m_sortedStrings;
|
||||
wxArrayPtrVoid m_itemsClientData;
|
||||
|
@@ -102,23 +102,23 @@ protected:
|
||||
// ------------------------------------------------------------------------
|
||||
public:
|
||||
// wxCombobox methods
|
||||
virtual void SetSelection(int);
|
||||
virtual void SetSelection(int pos);
|
||||
// Overlapping methods
|
||||
virtual wxString GetStringSelection();
|
||||
// wxItemContainer
|
||||
virtual void Clear();
|
||||
virtual void Delete(int);
|
||||
virtual size_t GetCount() const;
|
||||
virtual wxString GetString(int) const;
|
||||
virtual void SetString(int, const wxString&);
|
||||
virtual void Delete(unsigned int n);
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual wxString GetString(unsigned int) const;
|
||||
virtual void SetString(unsigned int pos, const wxString&);
|
||||
virtual int FindString(const wxString& s, bool bCase = false) const;
|
||||
virtual int GetSelection() const;
|
||||
virtual int DoAppend(const wxString&);
|
||||
virtual int DoInsert(const wxString&, int);
|
||||
virtual void DoSetItemClientData(int, void*);
|
||||
virtual void* DoGetItemClientData(int) const;
|
||||
virtual void DoSetItemClientObject(int, wxClientData*);
|
||||
virtual wxClientData* DoGetItemClientObject(int) const;
|
||||
virtual int DoInsert(const wxString&, unsigned int pos);
|
||||
virtual void DoSetItemClientData(unsigned int, void*);
|
||||
virtual void* DoGetItemClientData(unsigned int) const;
|
||||
virtual void DoSetItemClientObject(unsigned int, wxClientData*);
|
||||
virtual wxClientData* DoGetItemClientObject(unsigned int) const;
|
||||
// wxComboBoxBase pure virtuals
|
||||
virtual wxString GetValue() const
|
||||
{ return wxTextCtrl::GetValue(); }
|
||||
|
@@ -84,7 +84,7 @@ public:
|
||||
virtual bool IsSelected(int n) const;
|
||||
virtual int GetSelections(wxArrayInt& aSelections) const;
|
||||
protected:
|
||||
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 DoSetSelection(int n, bool select);
|
||||
@@ -93,20 +93,20 @@ protected:
|
||||
public:
|
||||
// deleting items
|
||||
virtual void Clear();
|
||||
virtual void Delete(int n);
|
||||
virtual void Delete(unsigned int n);
|
||||
// accessing strings
|
||||
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;
|
||||
// selection
|
||||
virtual int GetSelection() const;
|
||||
protected:
|
||||
virtual int DoAppend(const wxString& item);
|
||||
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;
|
||||
};
|
||||
|
||||
#endif // __WX_COCOA_LISTBOX_H__
|
||||
|
@@ -85,12 +85,12 @@ public:
|
||||
virtual void SetSelection(int n);
|
||||
virtual int GetSelection() const;
|
||||
// string access
|
||||
virtual size_t GetCount() const;
|
||||
virtual wxString GetString(int n) const;
|
||||
virtual void SetString(int n, const wxString& label);
|
||||
virtual unsigned int GetCount() const;
|
||||
virtual wxString GetString(unsigned int n) const;
|
||||
virtual void SetString(unsigned int n, const wxString& label);
|
||||
// change the individual radio button state
|
||||
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);
|
||||
protected:
|
||||
virtual wxSize DoGetBestSize() const;
|
||||
};
|
||||
|
Reference in New Issue
Block a user