Eliminate (or at least reduce) 64-bit build warnings (as described in wxPG sourceforg...

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 8527f0a5adc0f16cd06976a98ea4886717acbe30..54bcdda98a92bc4c863458523f39501df78bb186 100644 (file)
--- a/include/wx/propgrid/editors.h
+++ b/include/wx/propgrid/editors.h
@@ -525,7 +525,7 @@ public:
 
     /** Returns number of buttons.
     */
 
     /** 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
 
     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 6825cda44580ad69274ce84f88741d0d50e5c8a1..1c209463c824b8c0100f5d2e64df288311e55f5e 100644 (file)
--- 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 );
     ~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);
     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();
         if ( index == -1 )
         {
             it = m_items.end();

-            index = m_items.size();
+            index = (int) m_items.size();

         }
         else
         {
         }
         else
         {


@@ -636,7 +636,10 @@ public:
     // Delete all entries
     void Clear();
 
     // 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
     {
 
     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; };
 
     /** 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();
     }
 
     {
         return Item(ind).GetText();
     }
 

-    size_t GetCount () const
+    unsigned int GetCount () const

     {
         if ( !m_data )
             return 0;
     {
         if ( !m_data )
             return 0;


@@ -794,7 +797,7 @@ public:
         return m_data->GetCount();
     }
 
         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.
 
     /** 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 */
     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. */
 
     /** 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.
         { return m_children[i]; }
 
     /** Returns last sub-property.


@@ -1908,7 +1914,7 @@ public:
     void Empty();
 
     // Puts correct indexes to children
     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.
 
 #ifndef SWIG
     // Returns wxPropertyGridPageState in which this property resides.

diff --git a/include/wx/propgrid/propgrid.h b/include/wx/propgrid/propgrid.h
index 809b849a4e5ebfa0be8bcfc1d0ccd2ebdef4ae6e..832232d1f45bf680c27b6af4416d1660dbdd250c 100644 (file)
--- a/include/wx/propgrid/propgrid.h
+++ b/include/wx/propgrid/propgrid.h
@@ -785,9 +785,9 @@ public:
     /**
         Returns number of columns currently on grid.
     */
     /**
         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. */
     }
 
     /** Returns colour of empty space below properties. */


@@ -1088,7 +1088,7 @@ public:
     */
     unsigned int GetCommonValueCount() const
     {
     */
     unsigned int GetCommonValueCount() const
     {

-        return m_commonValues.size();
+        return (unsigned int) m_commonValues.size();

     }
 
     /** Returns label of given common value.
     }
 
     /** Returns label of given common value.


@@ -1844,7 +1844,7 @@ inline int wxPGProperty::GetDisplayedCommonValueCount() const
     {
         wxPropertyGrid* pg = GetGrid();
         if ( pg )
     {
         wxPropertyGrid* pg = GetGrid();
         if ( pg )

-            return pg->GetCommonValueCount();
+            return (int) pg->GetCommonValueCount();

     }
     return 0;
 }
     }
     return 0;
 }

diff --git a/include/wx/propgrid/propgridpagestate.h b/include/wx/propgrid/propgridpagestate.h
index 710b10e794ff071baa672a1caeff7aed17eecac2..7831f9cc0b742d0564b019b4a4c7364c17a39fa1 100644 (file)
--- a/include/wx/propgrid/propgridpagestate.h
+++ b/include/wx/propgrid/propgridpagestate.h
@@ -463,7 +463,7 @@ public:
 
     unsigned int GetColumnCount() const
     {
 
     unsigned int GetColumnCount() const
     {

-        return m_colWidths.size();
+        return (unsigned int) m_colWidths.size();

     }
 
     wxPGProperty* GetSelection() const
     }
 
     wxPGProperty* GetSelection() const

diff --git a/interface/wx/propgrid/editors.h b/interface/wx/propgrid/editors.h
index 1b9ff42267bb66791f171971aa3ec23b0ef71853..7f39b20814b1b287c5f54cbc1e875bce3f89350e 100644 (file)
--- a/interface/wx/propgrid/editors.h
+++ b/interface/wx/propgrid/editors.h
@@ -322,7 +322,7 @@ public:
     /**
         Returns number of buttons.
     */
     /**
         Returns number of buttons.
     */

-    int GetCount();
+    unsigned int GetCount();

 
     /**
         Returns size of primary editor control, as appropriately
 
     /**
         Returns size of primary editor control, as appropriately

diff --git a/interface/wx/propgrid/property.h b/interface/wx/propgrid/property.h
index 5b5e500e924d8422df282be746c77351f83d98c4..0b909556309350bf4fff4dfc63b7c9dc77fce081 100644 (file)
--- a/interface/wx/propgrid/property.h
+++ b/interface/wx/propgrid/property.h
@@ -1194,7 +1194,7 @@ public:
     /**
         Returns child property at index i.
     */
     /**
         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.
 
     /**
         If property's editor is active, then update it's value.


@@ -1448,17 +1448,17 @@ public:
     /**
         Returns labe of item.
     */
     /**
         Returns labe of item.
     */

-    const wxString& GetLabel( size_t ind ) const;
+    const wxString& GetLabel( unsigned int ind ) const;

 
     /**
         Returns number of items.
     */
 
     /**
         Returns number of items.
     */

-    size_t GetCount () const;
+    unsigned int GetCount() const;

 
     /**
         Returns value of item;
     */
 
     /**
         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
 
     /**
         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 5866eba44bed4f1957ac3d5a8c248fcf137673b5..92029a623257b4994d13a7705b990b7c961e7098 100644 (file)
--- a/interface/wx/propgrid/propgrid.h
+++ b/interface/wx/propgrid/propgrid.h
@@ -525,7 +525,7 @@ public:
     /**
         Returns number of columns currently on grid.
     */
     /**
         Returns number of columns currently on grid.
     */

-    int GetColumnCount() const;
+    unsigned int GetColumnCount() const;

 
     /**
         Returns colour of empty space below properties.
 
     /**
         Returns colour of empty space below properties.

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 1eddd98fb4e38e87d6a4f4394b8291acd4127c3f..1fc06b51590b5d6da018fa56cd0516bab64b57f3 100644 (file)
--- 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
     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,
     {
         wxWindowID id = GetButtonId(i);
         propGrid->Connect(id, wxEVT_COMMAND_BUTTON_CLICKED,