From 98c0463399a5787ea9bf8644e2c4cacf2c98e214 Mon Sep 17 00:00:00 2001 From: Jaakko Salli Date: Tue, 21 Oct 2008 15:17:06 +0000 Subject: [PATCH] Removed deprecated functions wxPGChoices::HasValue(), HasValues() git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56480 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/propgrid/property.h | 48 +++++++++++++++++++++++++--------- src/propgrid/advprops.cpp | 19 +++----------- src/propgrid/propgrid.cpp | 7 ----- src/propgrid/props.cpp | 45 ++++++++----------------------- 4 files changed, 49 insertions(+), 70 deletions(-) diff --git a/include/wx/propgrid/property.h b/include/wx/propgrid/property.h index 90494f0783..d47ba6881b 100644 --- a/include/wx/propgrid/property.h +++ b/include/wx/propgrid/property.h @@ -591,8 +591,6 @@ public: int GetValue() const { return m_value; } - bool HasValue() const { return (m_value != wxPG_INVALID_VALUE); } - protected: int m_value; }; @@ -672,6 +670,8 @@ private: Each entry can have label, value, bitmap, text colour, and background colour. + @remarks If you do not specify value for entry, index is used. + @library{wxpropgrid} @category{propgrid} */ @@ -696,14 +696,30 @@ public: } } - /** Constructor. */ + /** + Constructor. + + @param labels + Labels for choices + + @param values + Values for choices. If NULL, indexes are used. + */ wxPGChoices( const wxChar** labels, const long* values = NULL ) { Init(); Set(labels,values); } - /** Constructor. */ + /** + Constructor. + + @param labels + Labels for choices + + @param values + Values for choices. If empty, indexes are used. + */ wxPGChoices( const wxArrayString& labels, const wxArrayInt& values = wxArrayInt() ) { @@ -730,6 +746,12 @@ public: If did not have own copies, creates them now. If was empty, identical to set except that creates copies. + + @param labels + Labels for added choices. + + @param values + Values for added choices. If empty, relevant entry indexes are used. */ void Add( const wxChar** labels, const ValArrItem* values = NULL ); @@ -739,7 +761,15 @@ public: /** Version that works with wxArrayString and wxArrayInt. */ void Add( const wxArrayString& arr, const wxArrayInt& arrint ); - /** Adds single item. */ + /** + Adds a single choice. + + @param label + Label for added choice. + + @param value + Value for added choice. If unspecified, index is used. + */ wxPGChoiceEntry& Add( const wxString& label, int value = wxPG_INVALID_VALUE ); @@ -807,14 +837,6 @@ public: wxArrayInt GetIndicesForStrings( const wxArrayString& strings, wxArrayString* unmatched = NULL ) const; - /** Returns true if choices in general are likely to have values - (depens on that all entries have values or none has) - */ - bool HasValues() const; - - bool HasValue( unsigned int i ) const - { return (i < m_data->GetCount()) && m_data->Item(i)->HasValue(); } - int Index( const wxString& str ) const; int Index( int val ) const; diff --git a/src/propgrid/advprops.cpp b/src/propgrid/advprops.cpp index 9defd31b6b..60fda14f1b 100644 --- a/src/propgrid/advprops.cpp +++ b/src/propgrid/advprops.cpp @@ -951,10 +951,7 @@ void wxSystemColourProperty::OnSetValue() if ( cpv.m_type < wxPG_COLOUR_WEB_BASE ) { - if ( m_choices.HasValues() ) - ind = GetIndexForValue(cpv.m_type); - else - ind = ColToInd(col); + ind = GetIndexForValue(cpv.m_type); } else { @@ -1086,13 +1083,8 @@ bool wxSystemColourProperty::IntToValue( wxVariant& variant, int number, int WXU { int index = number; int type = GetValueForIndex(index); - bool hasValue = m_choices[index].HasValue(); - if ( ( hasValue && type == wxPG_COLOUR_CUSTOM ) || - ( !hasValue && (index == (int)GetCustomColourIndex() && - !(m_flags & wxPG_PROP_HIDE_CUSTOM_COLOUR)) - ) - ) + if ( type == wxPG_COLOUR_CUSTOM ) { QueryColourFromUser(variant); } @@ -1250,7 +1242,7 @@ bool wxSystemColourProperty::StringToValue( wxVariant& value, const wxString& te if ( res && GetIndex() >= 0 ) { val.m_type = GetIndex(); - if ( val.m_type >= 0 && val.m_type < m_choices.GetCount() && m_choices[val.m_type].HasValue() ) + if ( val.m_type >= 0 && val.m_type < m_choices.GetCount() ) val.m_type = m_choices[val.m_type].GetValue(); // Get proper colour for type. @@ -1413,11 +1405,6 @@ wxString wxColourProperty::ValueToString( wxVariant& value, wxColour wxColourProperty::GetColour( int index ) const { - if ( !m_choices.HasValue(index) ) - { - wxASSERT( index < (int)GetItemCount() ); - return gs_cp_es_normcolour_colours[index]; - } return gs_cp_es_normcolour_colours[m_choices.GetValue(index)]; } diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index a7522f7c16..7ea5b3aa9a 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -5659,13 +5659,6 @@ wxArrayString wxPGChoices::GetLabels() const // ----------------------------------------------------------------------- -bool wxPGChoices::HasValues() const -{ - return true; -} - -// ----------------------------------------------------------------------- - wxArrayInt wxPGChoices::GetValuesForStrings( const wxArrayString& strings ) const { wxArrayInt arr; diff --git a/src/propgrid/props.cpp b/src/propgrid/props.cpp index a182229cc9..1b61ba15df 100644 --- a/src/propgrid/props.cpp +++ b/src/propgrid/props.cpp @@ -1138,12 +1138,9 @@ int wxEnumProperty::GetIndexForValue( int value ) const if ( !m_choices.IsOk() ) return -1; - if ( m_choices.HasValues() ) - { - int intVal = m_choices.Index(value); - if ( intVal >= 0 ) - return intVal; - } + int intVal = m_choices.Index(value); + if ( intVal >= 0 ) + return intVal; return value; } @@ -1156,9 +1153,7 @@ const wxString* wxEnumProperty::GetEntry( size_t index, int* pvalue ) const { if ( m_choices.IsOk() && index < m_choices.GetCount() ) { - int value = (int)index; - if ( m_choices.HasValue(index) ) - value = m_choices.GetValue(index); + int value = m_choices.GetValue(index); if ( pvalue ) *pvalue = value; @@ -1264,10 +1259,7 @@ void wxFlagsProperty::Init() for ( i=0; iSetFlag( wxPG_PROP_MODIFIED ); @@ -1431,10 +1417,7 @@ wxString wxFlagsProperty::ValueToString( wxVariant& value, for ( i = 0; i < GetItemCount(); i++ ) { int doAdd; - if ( choices.HasValue(i) ) - doAdd = ( flags & choices.GetValue(i) ); - else - doAdd = ( flags & (1<