From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Sun, 12 Oct 2008 12:23:48 +0000 (+0000)
Subject: Eliminate (or at least reduce) 64-bit build warnings (as described in wxPG sourceforg...
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/68bcfd2c10258b50924ad45391b6fbff0e83ce55
Eliminate (or at least reduce) 64-bit build warnings (as described in wxPG sourceforge bug report #2156069)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56239 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
diff --git a/include/wx/propgrid/editors.h b/include/wx/propgrid/editors.h
index 8527f0a5ad..54bcdda98a 100644
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -525,7 +525,7 @@ public:
/** Returns number of buttons.
*/
- int GetCount() const { return m_buttons.Count(); }
+ unsigned int GetCount() const { return (unsigned int) m_buttons.size(); }
void Add( const wxString& label, int id = -2 );
#if wxUSE_BMPBUTTON
diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h
index 6825cda445..1c209463c8 100644
--- a/include/wx/propgrid/property.h
+++ b/include/wx/propgrid/property.h
@@ -215,7 +215,7 @@ public:
~wxPGAttributeStorage();
void Set( const wxString& name, const wxVariant& value );
- size_t GetCount() const { return m_map.size(); }
+ unsigned int GetCount() const { return (unsigned int) m_map.size(); }
wxVariant FindValue( const wxString& name ) const
{
wxPGHashMapS2P::const_iterator it = m_map.find(name);
@@ -619,7 +619,7 @@ public:
if ( index == -1 )
{
it = m_items.end();
- index = m_items.size();
+ index = (int) m_items.size();
}
else
{
@@ -636,7 +636,10 @@ public:
// Delete all entries
void Clear();
- size_t GetCount() const { return m_items.size(); }
+ unsigned int GetCount() const
+ {
+ return (unsigned int) m_items.size();
+ }
wxPGChoiceEntry* Item( unsigned int i ) const
{
@@ -781,12 +784,12 @@ public:
/** Gets a unsigned number identifying this list. */
wxPGChoicesId GetId() const { return (wxPGChoicesId) m_data; };
- const wxString& GetLabel( size_t ind ) const
+ const wxString& GetLabel( unsigned int ind ) const
{
return Item(ind).GetText();
}
- size_t GetCount () const
+ unsigned int GetCount () const
{
if ( !m_data )
return 0;
@@ -794,7 +797,7 @@ public:
return m_data->GetCount();
}
- int GetValue( size_t ind ) const { return Item(ind).GetValue(); }
+ int GetValue( unsigned int ind ) const { return Item(ind).GetValue(); }
/** Returns array of values matching the given strings. Unmatching strings
result in wxPG_INVALID_VALUE entry in array.
@@ -1891,10 +1894,13 @@ public:
int GetChildrenHeight( int lh, int iMax = -1 ) const;
/** Returns number of child properties */
- unsigned int GetChildCount() const { return m_children.size(); }
+ unsigned int GetChildCount() const
+ {
+ return (unsigned int) m_children.size();
+ }
/** Returns sub-property at index i. */
- wxPGProperty* Item( size_t i ) const
+ wxPGProperty* Item( unsigned int i ) const
{ return m_children[i]; }
/** Returns last sub-property.
@@ -1908,7 +1914,7 @@ public:
void Empty();
// Puts correct indexes to children
- void FixIndexesOfChildren( size_t starthere = 0 );
+ void FixIndexesOfChildren( unsigned int starthere = 0 );
#ifndef SWIG
// Returns wxPropertyGridPageState in which this property resides.
diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 809b849a4e..832232d1f4 100644
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -785,9 +785,9 @@ public:
/**
Returns number of columns currently on grid.
*/
- int GetColumnCount() const
+ unsigned int GetColumnCount() const
{
- return m_pState->m_colWidths.size();
+ return (unsigned int) m_pState->m_colWidths.size();
}
/** Returns colour of empty space below properties. */
@@ -1088,7 +1088,7 @@ public:
*/
unsigned int GetCommonValueCount() const
{
- return m_commonValues.size();
+ return (unsigned int) m_commonValues.size();
}
/** Returns label of given common value.
@@ -1844,7 +1844,7 @@ inline int wxPGProperty::GetDisplayedCommonValueCount() const
{
wxPropertyGrid* pg = GetGrid();
if ( pg )
- return pg->GetCommonValueCount();
+ return (int) pg->GetCommonValueCount();
}
return 0;
}
diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 710b10e794..7831f9cc0b 100644
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -463,7 +463,7 @@ public:
unsigned int GetColumnCount() const
{
- return m_colWidths.size();
+ return (unsigned int) m_colWidths.size();
}
wxPGProperty* GetSelection() const
diff --git a/interface/wx/propgrid/editors.h b/interface/wx/propgrid/editors.h
index 1b9ff42267..7f39b20814 100644
--- a/interface/wx/propgrid/editors.h
+++ b/interface/wx/propgrid/editors.h
@@ -322,7 +322,7 @@ public:
/**
Returns number of buttons.
*/
- int GetCount();
+ unsigned int GetCount();
/**
Returns size of primary editor control, as appropriately
diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 5b5e500e92..0b90955630 100644
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -1194,7 +1194,7 @@ public:
/**
Returns child property at index i.
*/
- wxPGProperty* Item( size_t i ) const;
+ wxPGProperty* Item( unsigned int i ) const;
/**
If property's editor is active, then update it's value.
@@ -1448,17 +1448,17 @@ public:
/**
Returns labe of item.
*/
- const wxString& GetLabel( size_t ind ) const;
+ const wxString& GetLabel( unsigned int ind ) const;
/**
Returns number of items.
*/
- size_t GetCount () const;
+ unsigned int GetCount() const;
/**
Returns value of item;
*/
- int GetValue( size_t ind ) const;
+ int GetValue( unsigned int ind ) const;
/**
Returns array of values matching the given strings. Unmatching strings
diff --git a/interface/wx/propgrid/propgrid.h b/interface/wx/propgrid/propgrid.h
index 5866eba44b..92029a6232 100644
--- a/interface/wx/propgrid/propgrid.h
+++ b/interface/wx/propgrid/propgrid.h
@@ -525,7 +525,7 @@ public:
/**
Returns number of columns currently on grid.
*/
- int GetColumnCount() const;
+ unsigned int GetColumnCount() const;
/**
Returns colour of empty space below properties.
diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 1eddd98fb4..1fc06b5159 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -1872,7 +1872,7 @@ void wxPGMultiButton::Finalize( wxPropertyGrid* propGrid, const wxPoint& pos )
Move( pos.x + m_fullEditorSize.x - m_buttonsWidth, pos.y );
// Connect event handling
- for ( int i=0; i<GetCount(); i++ )
+ for ( unsigned int i=0; i<GetCount(); i++ )
{
wxWindowID id = GetButtonId(i);
propGrid->Connect(id, wxEVT_COMMAND_BUTTON_CLICKED,