Line-up interfaces to use size_t for GetCount()s (and count related api).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38076 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-14 19:44:45 +00:00
parent afbe150a76
commit 8228b8932a
79 changed files with 667 additions and 745 deletions

View File

@@ -72,7 +72,7 @@ public:
virtual void Delete(int n);
virtual void Clear();
virtual int GetCount() const ;
virtual size_t GetCount() const ;
virtual int GetSelection() const ;
virtual void SetSelection(int n);
int GetCurrentSelection() const { return GetSelection(); }

View File

@@ -114,7 +114,7 @@ class WXDLLEXPORT wxComboBox : public wxControl, public wxComboBoxBase
virtual void SetEditable(bool editable);
virtual bool IsEditable() const;
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual void Undo();
virtual void Redo();

View File

@@ -71,13 +71,13 @@ public:
const wxString& name = wxListBoxNameStr);
virtual ~wxListBox();
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
// implement base class pure virtuals
virtual void Clear();
virtual void Delete(int n);
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);
virtual int FindString(const wxString& s, bool bCase = false) const;
@@ -132,7 +132,7 @@ protected:
// prevent collision with some BSD definitions of macro Free()
void FreeData();
int m_noItems;
size_t m_noItems;
int m_selected;
bool m_suppressSelection ;
wxString m_typeIn ;

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobox.h
// Name: wx/mac/carbon/radiobox.h
// Purpose: wxRadioBox class
// Author: Stefan Csomor
// Modified by:
@@ -58,7 +58,7 @@ public:
virtual void SetSelection(int item);
virtual int GetSelection() const;
inline virtual int GetCount() const { return m_noItems; } ;
virtual size_t GetCount() const { return m_noItems; } ;
virtual wxString GetString(int item) const;
virtual void SetString(int item, const wxString& label) ;
@@ -80,10 +80,11 @@ public:
inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
void OnRadioButton( wxCommandEvent& event ) ;
protected:
wxRadioButton *m_radioButtonCycle;
int m_noItems;
protected:
wxRadioButton *m_radioButtonCycle;
size_t m_noItems;
int m_noRowsOrCols;
// Internal functions

View File

@@ -75,7 +75,7 @@ public:
virtual void Delete(int n);
virtual void Clear();
virtual int GetCount() const ;
virtual size_t GetCount() const ;
virtual int GetSelection() const ;
virtual void SetSelection(int n);

View File

@@ -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 int GetCount() const { return m_choice->GetCount() ; }
virtual size_t GetCount() const { return m_choice->GetCount() ; }
virtual bool IsEditable() const ;

View File

@@ -81,13 +81,13 @@ public:
const wxString& name = wxListBoxNameStr);
virtual ~wxListBox();
virtual void Refresh(bool eraseBack = TRUE, const wxRect *rect = NULL);
virtual void Refresh(bool eraseBack = true, const wxRect *rect = NULL);
// implement base class pure virtuals
virtual void Clear();
virtual void Delete(int n);
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);
virtual int FindString(const wxString& s, bool bCase = false) const;
@@ -156,7 +156,7 @@ protected:
// prevent collision with some BSD definitions of macro Free()
void FreeData();
int m_noItems;
size_t m_noItems;
int m_selected;
wxString m_typeIn ;
long m_lastTypeIn ;

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: radiobox.h
// Name: wx/mac/classic/radiobox.h
// Purpose: wxRadioBox class
// Author: Stefan Csomor
// Modified by:
@@ -58,7 +58,7 @@ public:
virtual void SetSelection(int item);
virtual int GetSelection() const;
inline virtual int GetCount() const { return m_noItems; } ;
virtual size_t GetCount() const { return m_noItems; } ;
virtual wxString GetString(int item) const;
virtual void SetString(int item, const wxString& label) ;
@@ -80,10 +80,11 @@ public:
inline void SetNumberOfRowsOrCols(int n) { m_noRowsOrCols = n; }
void OnRadioButton( wxCommandEvent& event ) ;
protected:
wxRadioButton *m_radioButtonCycle;
int m_noItems;
protected:
wxRadioButton *m_radioButtonCycle;
size_t m_noItems;
int m_noRowsOrCols;
// Internal functions