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

10
include/wx/motif/checklst.h
View File

@@ -56,16 +56,16 @@ public:
const wxString& name = wxListBoxNameStr);
// items may be checked
bool IsChecked(size_t uiIndex) const;
void Check(size_t uiIndex, bool bCheck = true);
bool IsChecked(unsigned int uiIndex) const;
void Check(unsigned int uiIndex, bool bCheck = true);
// override base class functions
virtual int DoAppend(const wxString& item);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual wxString GetString(unsigned int n) const;
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);
private:
void DoToggleItem( int item, int x );

20
include/wx/motif/choice.h
View File

@@ -71,18 +71,18 @@ public:
const wxString& name = wxChoiceNameStr);
// implementation of wxControlWithItems
virtual size_t GetCount() const;
virtual unsigned int GetCount() const;
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;
virtual int GetSelection() const;
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual void Clear();
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual wxString GetString(unsigned int n) const;
// implementation of wxChoiceBase
virtual void SetSelection(int n);
@@ -112,7 +112,7 @@ protected:
// common part of all contructors
void Init();
size_t m_noStrings;
unsigned int m_noStrings;
WXWidget m_menuWidget;
WXWidget m_buttonWidget;
wxWidgetArray m_widgetArray;

8
include/wx/motif/combobox.h
View File

@@ -71,14 +71,14 @@ public:
// implementation of wxControlWithItems
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
virtual void Delete(int n);
virtual int DoInsert(const wxString& item, unsigned int pos);
virtual void Delete(unsigned int n);
virtual void Clear();
virtual int GetSelection() const ;
virtual void SetSelection(int n);
virtual int FindString(const wxString& s, bool bCase = false) 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);
// Text field functions
virtual wxString GetValue() const ;

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

@@ -66,22 +66,22 @@ public:
~wxListBox();
// implementation of wxControlWithItems
virtual size_t GetCount() const;
virtual unsigned int GetCount() const;
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;
virtual int GetSelection() const;
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual void Clear();
virtual void SetString(int n, const wxString& s);
virtual wxString GetString(int n) const;
virtual void SetString(unsigned int n, const wxString& s);
virtual wxString GetString(unsigned int n) const;
// implementation of wxListBoxbase
virtual void DoSetSelection(int n, bool select);
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 int GetSelections(wxArrayInt& aSelections) const;
@@ -101,7 +101,7 @@ public:
protected:
virtual wxSize DoGetBestSize() const;
size_t m_noItems;
unsigned int m_noItems;
// List mapping positions->client data
wxClientDataDictionary m_clientDataDict;

14
include/wx/motif/radiobox.h
View File

@@ -72,19 +72,19 @@ public:
const wxValidator& val = wxDefaultValidator,
const wxString& name = wxRadioBoxNameStr);
void SetSelection(int N);
virtual void SetSelection(int n);
int GetSelection() const;
void SetString(int item, const wxString& label) ;
wxString GetString(int item) const;
virtual void SetString(unsigned int item, const wxString& label);
virtual wxString GetString(unsigned int item) const;
virtual bool Enable(bool enable = true);
virtual bool Enable(int item, bool enable = true);
virtual bool Show(int item, bool show = true);
virtual bool Enable(unsigned int item, bool enable = true);
virtual bool Show(unsigned int item, bool show = true);
virtual bool Show(bool show = true);
virtual wxString GetStringSelection() const;
virtual bool SetStringSelection(const wxString& s);
virtual size_t GetCount() const { return m_noItems; } ;
virtual unsigned int GetCount() const { return m_noItems; } ;
void Command(wxCommandEvent& event);
int GetNumberOfRowsOrCols() const { return m_noRowsOrCols; }
@@ -103,7 +103,7 @@ protected:
int width, int height,
int sizeFlags = wxSIZE_AUTO);
size_t m_noItems;
unsigned int m_noItems;
int m_noRowsOrCols;
int m_selectedButton;