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

14
include/wx/mac/carbon/checklst.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: checklst.h
// Name: wx/mac/carbon/checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Note: this is an optional class.
// Author: Stefan Csomor
@@ -13,10 +13,6 @@
#ifndef _WX_CHECKLST_H_
#define _WX_CHECKLST_H_
#if !defined(__MWERKS__) && !defined(__UNIX__)
typedef unsigned int size_t;
#endif
class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
{
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
@@ -70,19 +66,19 @@ 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 all methods which add/delete items to update m_checks array as
// well
virtual void Delete(int n);
virtual void Delete(unsigned int n);
// the array containing the checked status of the items
wxArrayInt m_checks;
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();
// common part of all ctors

18
include/wx/mac/carbon/choice.h
View File

@@ -69,28 +69,28 @@ public:
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxChoiceNameStr);
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual void Clear();
virtual size_t GetCount() const ;
virtual unsigned int GetCount() const ;
virtual int GetSelection() const ;
virtual void SetSelection(int n);
int GetCurrentSelection() const { return GetSelection(); }
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual wxString GetString(int n) const ;
virtual void SetString( int , const wxString& s ) ;
virtual wxString GetString(unsigned int n) const ;
virtual void SetString(unsigned int pos, const wxString& s);
virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ;
protected:
virtual wxSize DoGetBestSize() const ;
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;
// free all memory we have (used by Clear() and dtor)
// prevent collision with some BSD definitions of macro Free()

18
include/wx/mac/carbon/combobox.h
View File

@@ -85,16 +85,16 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
const wxString& name = wxComboBoxNameStr);
// List functions
virtual void Delete(int n);
virtual void Delete(unsigned int n);
virtual void Clear();
virtual int GetSelection() const;
int GetCurrentSelection() const { return GetSelection(); }
virtual void SetSelection(int n);
virtual int FindString(const wxString& s, bool bCase = false) const;
virtual wxString GetString(int n) const;
virtual wxString GetString(unsigned int n) const;
virtual wxString GetStringSelection() const;
virtual void SetString(int n, const wxString& s);
virtual void SetString(unsigned int n, const wxString& s);
// Text field functions
virtual wxString GetValue() const;
@@ -114,7 +114,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void SetEditable(bool editable);
virtual bool IsEditable() const;
virtual size_t GetCount() const;
virtual unsigned int GetCount() const;
virtual void Undo();
virtual void Redo();
@@ -143,12 +143,12 @@ protected:
virtual void DoMoveWindow(int x, int y, int width, int height);
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;
// the subcontrols
wxComboBoxText* m_text;

20
include/wx/mac/carbon/listbox.h
View File

@@ -75,11 +75,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;
@@ -105,13 +105,13 @@ public:
protected:
virtual void DoSetSelection(int n, bool select);
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;
virtual void DoSetSize(int x, int y, int width, int height, int sizeFlags = wxSIZE_AUTO);
virtual int DoListHitTest(const wxPoint& point) const;
@@ -132,7 +132,7 @@ protected:
// prevent collision with some BSD definitions of macro Free()
void FreeData();
size_t m_noItems;
unsigned int m_noItems;
int m_selected;
bool m_suppressSelection ;
wxString m_typeIn ;

12
include/wx/mac/carbon/radiobox.h
View File

@@ -58,13 +58,13 @@ public:
virtual void SetSelection(int item);
virtual int GetSelection() const;
virtual size_t GetCount() const { return m_noItems; } ;
virtual unsigned int GetCount() const { return m_noItems; }
virtual wxString GetString(int item) const;
virtual void SetString(int item, const wxString& label) ;
virtual wxString GetString(unsigned int item) const;
virtual void SetString(unsigned int item, const wxString& label);
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 Enable(bool enable = true);
virtual wxString GetLabel() const;
@@ -84,7 +84,7 @@ public:
protected:
wxRadioButton *m_radioButtonCycle;
size_t m_noItems;
unsigned int m_noItems;
int m_noRowsOrCols;
// Internal functions

14
include/wx/mac/classic/checklst.h
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////////
// Name: checklst.h
// Name: wx/mac/classic/checklst.h
// Purpose: wxCheckListBox class - a listbox with checkable items
// Note: this is an optional class.
// Author: Stefan Csomor
@@ -13,10 +13,6 @@
#ifndef _WX_CHECKLST_H_
#define _WX_CHECKLST_H_
#if !defined(__MWERKS__) && !defined(__UNIX__)
typedef unsigned int size_t;
#endif
class WXDLLEXPORT wxCheckListBox : public wxCheckListBoxBase
{
DECLARE_DYNAMIC_CLASS(wxCheckListBox)
@@ -70,8 +66,8 @@ 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);
void OnChar(wxKeyEvent& event) ;
void OnLeftClick(wxMouseEvent& event) ;
@@ -85,10 +81,10 @@ 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();
// common part of all ctors

18
include/wx/mac/classic/choice.h
View File

@@ -71,26 +71,26 @@ public:
// implement base class pure virtuals
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 size_t GetCount() const ;
virtual unsigned int GetCount() const ;
virtual int GetSelection() const ;
virtual void SetSelection(int n);
virtual wxString GetString(int n) const ;
virtual void SetString( int , const wxString& s ) ;
virtual wxString GetString(unsigned int n) const ;
virtual void SetString(unsigned int pos, const wxString& s);
void MacHandleControlClick( WXWidget control , wxInt16 controlpart , bool mouseStillDown ) ;
protected:
virtual wxSize DoGetBestSize() const ;
public: // for wxComboBox only
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;
protected:
// free all memory we have (used by Clear() and dtor)

18
include/wx/mac/classic/combobox.h
View File

@@ -78,15 +78,15 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
const wxString& name = wxComboBoxNameStr);
// List functions
virtual void Delete(int n);
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 wxString GetString(unsigned int n) const ;
virtual wxString GetStringSelection() const ;
virtual void SetString(int n, const wxString& s) ;
virtual void SetString(unsigned int n, const wxString& s);
// Text field functions
virtual wxString GetValue() const ;
@@ -104,7 +104,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void Remove(long from, long to);
virtual void SetSelection(long from, long to);
virtual void SetEditable(bool editable);
virtual size_t GetCount() const { return m_choice->GetCount() ; }
virtual unsigned int GetCount() const { return m_choice->GetCount() ; }
virtual bool IsEditable() const ;
@@ -124,12 +124,12 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
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 ;
void FreeData();

20
include/wx/mac/classic/listbox.h
View File

@@ -85,11 +85,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;
@@ -98,15 +98,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;
virtual void DoSetSize(int x, int y,int width, int height,int sizeFlags = wxSIZE_AUTO ) ;
// wxCheckListBox support
@@ -156,7 +156,7 @@ protected:
// prevent collision with some BSD definitions of macro Free()
void FreeData();
size_t m_noItems;
unsigned int m_noItems;
int m_selected;
wxString m_typeIn ;
long m_lastTypeIn ;

12
include/wx/mac/classic/radiobox.h
View File

@@ -58,13 +58,13 @@ public:
virtual void SetSelection(int item);
virtual int GetSelection() const;
virtual size_t GetCount() const { return m_noItems; } ;
virtual unsigned int GetCount() const { return m_noItems; }
virtual wxString GetString(int item) const;
virtual void SetString(int item, const wxString& label) ;
virtual wxString GetString(unsigned int item) const;
virtual void SetString(unsigned int item, const wxString& label);
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 Enable(bool enable = true);
virtual wxString GetLabel() const;
@@ -84,7 +84,7 @@ public:
protected:
wxRadioButton *m_radioButtonCycle;
size_t m_noItems;
unsigned int m_noItems;
int m_noRowsOrCols;
// Internal functions