Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/cocoa/choice.h
View File

@@ -82,7 +82,7 @@ protected:
public:
virtual void Clear();
virtual void Delete(int);
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int) const;
virtual void SetString(int, const wxString&);
virtual int FindString(const wxString& s, bool bCase = false) const;

2
include/wx/cocoa/combobox.h
View File

@@ -108,7 +108,7 @@ public:
// wxItemContainer
virtual void Clear();
virtual void Delete(int);
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int) const;
virtual void SetString(int, const wxString&);
virtual int FindString(const wxString& s, bool bCase = false) const;

2
include/wx/cocoa/listbox.h
View File

@@ -95,7 +95,7 @@ public:
virtual void Clear();
virtual void Delete(int n);
// accessing strings
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;

4
include/wx/cocoa/radiobox.h
View File

@@ -4,7 +4,7 @@
// Author: David Elliott
// Modified by:
// Created: 2003/03/18
// RCS-ID: $Id:
// RCS-ID: $Id$
// Copyright: (c) 2003 David Elliott
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@ -85,7 +85,7 @@ public:
virtual void SetSelection(int n);
virtual int GetSelection() const;
// string access
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);
// change the individual radio button state

10
include/wx/ctrlsub.h
View File

@@ -38,7 +38,7 @@ public:
// accessing strings
// -----------------
virtual int GetCount() const = 0;
virtual size_t GetCount() const = 0;
bool IsEmpty() const { return GetCount() == 0; }
virtual wxString GetString(int n) const = 0;
@@ -50,9 +50,9 @@ public:
// supported search type
virtual int FindString(const wxString& s, bool bCase = false) const
{
int count = GetCount();
size_t count = GetCount();
for ( int i = 0; i < count ; i ++ )
for ( size_t i = 0; i < count ; ++i )
{
if (GetString(i).IsSameAs( s , bCase ))
return i;
@@ -82,7 +82,9 @@ public:
protected:
// check that the index is valid
inline bool IsValid(int n) const { return n >= 0 && n < GetCount(); }
// FIXME: once api will move to size_t, drop >= 0 check
inline bool IsValid(int n) const { return n >= 0 && (size_t)n < GetCount(); }
inline bool IsValidInsert(int n) const { return n >= 0 && (size_t)n <= GetCount(); }
};
class WXDLLEXPORT wxItemContainer : public wxItemContainerImmutable

4
include/wx/gtk/choice.h
View File

@@ -69,7 +69,7 @@ public:
int GetCurrentSelection() const { return GetSelection(); }
void SetSelection( int n );
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual int FindString(const wxString& s, bool bCase = false) const;
wxString GetString( int n ) const;
void SetString( int n, const wxString& string );
@@ -95,7 +95,7 @@ protected:
private:
// common part of Create() and DoAppend()
int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
int GtkAddHelper(GtkWidget *menu, size_t 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)

3
include/wx/gtk/combobox.h
View File

@@ -88,8 +88,7 @@ public:
int GetCurrentSelection() const;
wxString GetString( int n ) const;
wxString GetStringSelection() const;
int GetCount() const;
int Number() const { return GetCount(); }
virtual size_t GetCount() const;
void SetSelection( int n );
void SetString(int n, const wxString &text);

6
include/wx/gtk/listbox.h
View File

@@ -65,7 +65,7 @@ public:
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;
@@ -98,8 +98,8 @@ public:
bool m_spacePressed;
struct _GtkTreeEntry* GtkGetEntry(int pos) const;
void GtkInsertItems(const wxArrayString& items,
void** clientData, int pos);
void GtkInsertItems(const wxArrayString& items,
void** clientData, size_t pos);
void GtkSetSelection(int n, const bool select, const bool blockEvent);
protected:

2
include/wx/gtk/radiobox.h
View File

@@ -81,7 +81,7 @@ public:
// implement wxItemContainerImmutable methods
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);

4
include/wx/gtk1/choice.h
View File

@@ -69,7 +69,7 @@ public:
int GetCurrentSelection() const { return GetSelection(); }
void SetSelection( int n );
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual int FindString(const wxString& s, bool bCase = false) const;
wxString GetString( int n ) const;
void SetString( int n, const wxString& string );
@@ -95,7 +95,7 @@ protected:
private:
// common part of Create() and DoAppend()
int GtkAddHelper(GtkWidget *menu, int pos, const wxString& item);
int GtkAddHelper(GtkWidget *menu, size_t 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)

3
include/wx/gtk1/combobox.h
View File

@@ -88,8 +88,7 @@ public:
int GetCurrentSelection() const;
wxString GetString( int n ) const;
wxString GetStringSelection() const;
int GetCount() const;
int Number() const { return GetCount(); }
virtual size_t GetCount() const;
void SetSelection( int n );
void SetString(int n, const wxString &text);

2
include/wx/gtk1/listbox.h
View File

@@ -70,7 +70,7 @@ public:
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;

2
include/wx/gtk1/radiobox.h
View File

@@ -81,7 +81,7 @@ public:
// implement wxItemContainerImmutable methods
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& s);

2
include/wx/mac/carbon/choice.h
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(); }

2
include/wx/mac/carbon/combobox.h
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();

6
include/wx/mac/carbon/listbox.h
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 ;

11
include/wx/mac/carbon/radiobox.h
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

2
include/wx/mac/classic/choice.h
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);

2
include/wx/mac/classic/combobox.h
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 ;

6
include/wx/mac/classic/listbox.h
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 ;

11
include/wx/mac/classic/radiobox.h
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

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

@@ -71,7 +71,7 @@ public:
const wxString& name = wxChoiceNameStr);
// implementation of wxControlWithItems
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual int DoAppend(const wxString& item);
virtual int DoInsert(const wxString& item, int pos);
virtual void DoSetItemClientData(int n, void* clientData);

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

@@ -66,7 +66,7 @@ public:
~wxListBox();
// implementation of wxControlWithItems
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual int DoAppend(const wxString& item);
virtual void DoSetItemClientData(int n, void* clientData);
virtual void* DoGetItemClientData(int n) const;
@@ -101,7 +101,7 @@ public:
protected:
virtual wxSize DoGetBestSize() const;
int m_noItems;
size_t m_noItems;
// List mapping positions->client data
wxClientDataDictionary m_clientDataDict;

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

@@ -84,7 +84,7 @@ public:
virtual wxString GetStringSelection() const;
virtual bool SetStringSelection(const wxString& s);
virtual int GetCount() const { return m_noItems; } ;
virtual size_t 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);
int m_noItems;
size_t m_noItems;
int m_noRowsOrCols;
int m_selectedButton;

2
include/wx/msw/choice.h
View File

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

4
include/wx/msw/listbox.h
View File

@@ -81,7 +81,7 @@ public:
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;
@@ -147,7 +147,7 @@ protected:
// free memory (common part of Clear() and dtor)
void Free();
int m_noItems;
size_t m_noItems;
int m_selected;
virtual wxSize DoGetBestSize() const;

2
include/wx/msw/radiobox.h
View File

@@ -85,7 +85,7 @@ public:
// implement the radiobox interface
virtual void SetSelection(int n);
virtual int GetSelection() const { return m_selectedButton; }
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);
virtual bool Enable(int n, bool enable = true);

2
include/wx/msw/wince/checklst.h
View File

@@ -58,7 +58,7 @@ public:
// public interface derived from wxListBox and lower classes
virtual void Clear();
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual int GetSelection() const;
virtual int GetSelections(wxArrayInt& aSelections) const;
virtual wxString GetString(int n) const;

2
include/wx/msw/wince/choicece.h
View File

@@ -83,7 +83,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);

2
include/wx/os2/choice.h
View File

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

15
include/wx/os2/listbox.h
View File

@@ -106,21 +106,17 @@ public:
virtual void Clear(void);
virtual void Delete(int n);
virtual int GetCount(void) const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& rsString);
virtual bool IsSelected(int n) const;
virtual void DoSetSelection( int n
,bool bSelect
);
virtual void DoSetSelection(int n, bool bSelect);
virtual int GetSelection(void) const;
virtual int GetSelections(wxArrayInt& raSelections) const;
virtual int DoAppend(const wxString& rsItem);
virtual void DoInsertItems( const wxArrayString& raItems
,int rPos
);
virtual void DoInsertItems( const wxArrayString& raItems, int rPos );
virtual void DoSetItems( const wxArrayString& raItems
,void ** ppClientData
);
@@ -158,9 +154,8 @@ protected:
bool HasMultipleSelection(void) const;
virtual wxSize DoGetBestSize(void) const;
int m_nNumItems;
int m_nSelected;
size_t m_nNumItems;
int m_nSelected;
#if wxUSE_OWNER_DRAWN
//

5
include/wx/os2/radiobox.h
View File

@@ -125,7 +125,7 @@ public:
virtual int GetCount(void) const;
virtual size_t GetCount() const;
inline WXHWND* GetRadioButtons(void) const { return m_ahRadioButtons; }
int GetSelection(void) const;
void GetSize( int* pnX
@@ -170,12 +170,13 @@ protected:
WXHWND* m_ahRadioButtons;
int* m_pnRadioWidth; // for bitmaps
int* m_pnRadioHeight;
int m_nNoItems;
int m_nSelectedButton;
int m_nSizeFlags;
private:
size_t m_nNoItems;
DECLARE_DYNAMIC_CLASS(wxRadioBox)
}; // end of wxRadioBox

2
include/wx/palmos/choice.h
View File

@@ -69,7 +69,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);

3
include/wx/palmos/listbox.h
View File

@@ -81,7 +81,7 @@ public:
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);
@@ -141,7 +141,6 @@ protected:
// free memory (common part of Clear() and dtor)
void Free();
int m_noItems;
int m_selected;
virtual wxSize DoGetBestSize() const;

11
include/wx/palmos/radiobox.h
View File

@@ -88,7 +88,7 @@ public:
// implement the radiobox interface
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual int GetCount() const;
virtual size_t GetCount() const;
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);
@@ -136,12 +136,11 @@ protected:
// get the total size occupied by the radio box buttons
wxSize GetTotalButtonSize(const wxSize& sizeBtn) const;
int * m_radioWidth; // for bitmaps
int * m_radioHeight;
int *m_radioWidth; // for bitmaps
int *m_radioHeight;
int m_noItems;
int m_noRowsOrCols;
int m_selectedButton;
int m_noRowsOrCols;
int m_selectedButton;
virtual wxSize DoGetBestSize() const;

2
include/wx/univ/combobox.h
View File

@@ -294,7 +294,7 @@ public:
// wxControlWithItems methods
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;

4
include/wx/univ/listbox.h
View File

@@ -99,8 +99,8 @@ public:
virtual void Clear();
virtual void Delete(int n);
virtual int GetCount() const
{ return (int)m_strings->GetCount(); }
virtual size_t GetCount() const
{ return m_strings->GetCount(); }
virtual wxString GetString(int n) const
{ return m_strings->Item(n); }
virtual void SetString(int n, const wxString& s);

2
include/wx/univ/radiobox.h
View File

@@ -84,7 +84,7 @@ public:
virtual void SetSelection(int n);
virtual int GetSelection() const;
virtual int GetCount() const { return (int) m_buttons.GetCount(); }
virtual size_t GetCount() const { return m_buttons.GetCount(); }
virtual wxString GetString(int n) const;
virtual void SetString(int n, const wxString& label);