Amebis/wxWidgets
1
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

31
src/gtk/choice.cpp
View File

@@ -7,7 +7,7 @@
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
#include "wx/defs.h"
#include "wx/wxprec.h"
#if wxUSE_CHOICE
@@ -120,7 +120,7 @@ bool wxChoice::Create( wxWindow *parent, wxWindowID id,
GtkWidget *menu = gtk_menu_new();
for (int i = 0; i < n; i++)
for (size_t i = 0; i < (size_t)n; i++)
{
GtkAddHelper(menu, i, choices[i]);
}
@@ -154,9 +154,9 @@ int wxChoice::DoAppend( const wxString &item )
int wxChoice::DoInsert( const wxString &item, int pos )
{
wxCHECK_MSG( m_widget != NULL, -1, wxT("invalid choice control") );
wxCHECK_MSG( (pos>=0) && (pos<=GetCount()), -1, wxT("invalid index"));
wxCHECK_MSG( IsValidInsert(pos), -1, wxT("invalid index"));
if (pos == GetCount())
if ((size_t)pos == GetCount())
return DoAppend(item);
GtkWidget *menu = gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) );
@@ -168,7 +168,7 @@ int wxChoice::DoInsert( const wxString &item, int pos )
m_selection_hack++;
}
return GtkAddHelper(menu, pos, item);
return GtkAddHelper(menu, (size_t)pos, item);
}
void wxChoice::DoSetItemClientData( int n, void* clientData )
@@ -246,13 +246,12 @@ void wxChoice::Clear()
void wxChoice::Delete( int n )
{
wxCHECK_RET( m_widget != NULL, wxT("invalid choice") );
wxCHECK_RET( IsValid(n), _T("invalid index in wxChoice::Delete") );
// VZ: apparently GTK+ doesn't have a built-in function to do it (not even
// in 2.0), hence this dumb implementation -- still better than nothing
int i,
count = GetCount();
wxCHECK_RET( n >= 0 && n < count, _T("invalid index in wxChoice::Delete") );
size_t i;
const size_t count = GetCount();
// if the item to delete is before the selection, and the selection is valid
if ((n < m_selection_hack) && (m_selection_hack != wxNOT_FOUND))
@@ -276,7 +275,7 @@ void wxChoice::Delete( int n )
items.Alloc(count);
for ( i = 0; i < count; i++ )
{
if ( i != n )
if ( i != (size_t)n )
{
items.Add(GetString(i));
if ( hasClientData )
@@ -418,12 +417,12 @@ wxString wxChoice::GetString( int n ) const
return wxEmptyString;
}
int wxChoice::GetCount() const
size_t wxChoice::GetCount() const
{
wxCHECK_MSG( m_widget != NULL, 0, wxT("invalid choice") );
GtkMenuShell *menu_shell = GTK_MENU_SHELL( gtk_option_menu_get_menu( GTK_OPTION_MENU(m_widget) ) );
int count = 0;
size_t count = 0;
GList *child = menu_shell->children;
while (child)
{
@@ -441,7 +440,7 @@ void wxChoice::SetSelection( int n )
gtk_option_menu_set_history( GTK_OPTION_MENU(m_widget), (gint)tmp );
// set the local selection variable manually
if ((n >= 0) && (n < GetCount()))
if ((n >= 0) && (n < (int)GetCount()))
{
// a valid selection has been made
m_selection_hack = n;
@@ -484,9 +483,9 @@ void wxChoice::DoApplyWidgetStyle(GtkRcStyle *style)
}
}
int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
int wxChoice::GtkAddHelper(GtkWidget *menu, size_t pos, const wxString& item)
{
wxCHECK_MSG((pos>=0) && (pos<=(int)m_clientList.GetCount()), -1, wxT("invalid index"));
wxCHECK_MSG(IsValidInsert(pos), -1, wxT("invalid index"));
GtkWidget *menu_item = gtk_menu_item_new_with_label( wxGTK_CONV( item ) );
@@ -514,7 +513,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
// if we're called from ctor (and GtkMenuShell is still NULL)
// normal control, just append
if (pos == (int)m_clientList.GetCount())
if (pos == m_clientList.GetCount())
{
gtk_menu_shell_append( GTK_MENU_SHELL(menu), menu_item );
m_clientList.Append( (wxObject*) NULL );