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

Converted various wxArrayPtrVoids to wxVectors

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55989 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Jaakko Salli
2008-09-30 17:23:27 +00:00
parent 7eaed395dd
commit f7a094e1af
9 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/propgrid/manager.h
View File

@@ -432,7 +432,7 @@ public:
*/
wxPropertyGridPage* GetPage( unsigned int ind ) const
{
return (wxPropertyGridPage*)m_arrPages.Item(ind);
return m_arrPages[ind];
}
/** Returns page object for given page name.
@@ -660,7 +660,7 @@ protected:
wxPropertyGrid* m_pPropGrid;
wxArrayPtrVoid m_arrPages;
wxVector<wxPropertyGridPage*> m_arrPages;
#if wxUSE_TOOLBAR
wxToolBar* m_pToolbar;

19
include/wx/propgrid/property.h
View File

@@ -615,7 +615,7 @@ public:
// Takes ownership of 'item'
void Insert( int index, wxPGChoiceEntry* item )
{
wxArrayPtrVoid::iterator it;
wxVector<wxPGChoiceEntry*>::iterator it;
if ( index == -1 )
{
it = m_items.end();
@@ -642,7 +642,7 @@ public:
{
wxCHECK_MSG( i < GetCount(), NULL, "invalid index" );
return (wxPGChoiceEntry*) m_items[i];
return m_items[i];
}
void DecRef()
@@ -654,7 +654,7 @@ public:
}
private:
wxArrayPtrVoid m_items;
wxVector<wxPGChoiceEntry*> m_items;
// So that multiple properties can use the same set
int m_refCount;
@@ -1888,19 +1888,18 @@ public:
int GetChildrenHeight( int lh, int iMax = -1 ) const;
/** Returns number of child properties */
unsigned int GetChildCount() const { return m_children.GetCount(); }
unsigned int GetChildCount() const { return m_children.size(); }
/** Returns sub-property at index i. */
wxPGProperty* Item( size_t i ) const
{ return (wxPGProperty*)m_children.Item(i); }
{ return m_children[i]; }
/** Returns last sub-property.
*/
wxPGProperty* Last() const { return (wxPGProperty*)m_children.Last(); }
wxPGProperty* Last() const { return m_children.back(); }
/** Returns index of given sub-property. */
int Index( const wxPGProperty* p ) const
{ return m_children.Index((wxPGProperty*)p); }
/** Returns index of given child property. */
int Index( const wxPGProperty* p ) const;
/** Deletes all sub-properties. */
void Empty();
@@ -2021,7 +2020,7 @@ protected:
wxVariant m_value;
wxPGAttributeStorage m_attributes;
wxArrayPtrVoid m_children;
wxArrayPGProperty m_children;
// Extended cell information
wxArrayPtrVoid m_cells;

8
include/wx/propgrid/propgrid.h
View File

@@ -49,7 +49,7 @@ public:
wxPGHashMapS2P m_mapEditorClasses;
#if wxUSE_VALIDATORS
wxArrayPtrVoid m_arrValidators; // These wxValidators need to be freed
wxVector<wxValidator*> m_arrValidators; // These wxValidators need to be freed
#endif
wxPGHashMapS2P m_dictPropertyClassInfo; // PropertyName -> ClassInfo
@@ -1408,7 +1408,7 @@ protected:
wxBitmap *m_doubleBuffer;
#endif
wxArrayPtrVoid *m_windowsToDelete;
wxVector<wxWindow*> m_windowsToDelete;
/** Local time ms when control was created. */
wxLongLong m_timeCreated;
@@ -1627,11 +1627,13 @@ protected:
// Array of background colour brushes.
wxArrayPtrVoid m_arrBgBrushes;
// Array of foreground colours.
wxArrayPtrVoid m_arrFgCols;
// labels when properties use common values
wxArrayPtrVoid m_commonValues;
wxVector<wxPGCommonValue*> m_commonValues;
// Which cv selection really sets value to unspecified?
int m_cvUnspecified;

1
include/wx/propgrid/propgriddefs.h
View File

@@ -15,6 +15,7 @@
#if wxUSE_PROPGRID
#include "wx/dynarray.h"
#include "wx/vector.h"
#include "wx/hashmap.h"
#include "wx/variant.h"
#include "wx/longlong.h"

2
include/wx/propgrid/props.h
View File

@@ -213,7 +213,7 @@ WX_PG_IMPLEMENT_CUSTOM_COLOUR_PROPERTY_USES_WXCOLOUR2(CLASSNAME, \
// Common function exit
#define WX_PG_DOGETVALIDATOR_EXIT(VALIDATOR) \
s_ptr = VALIDATOR; \
wxPGGlobalVars->m_arrValidators.Add( (void*) VALIDATOR ); \
wxPGGlobalVars->m_arrValidators.push_back( VALIDATOR ); \
return VALIDATOR;
// -----------------------------------------------------------------------