From c8088e479a8801416538b89431704b5eeba663d2 Mon Sep 17 00:00:00 2001 From: Artur Wieczorek Date: Mon, 8 Jun 2015 21:48:08 +0200 Subject: [PATCH] Fixed minor typos in the name of variables. --- include/wx/propgrid/propgriddefs.h | 4 ++-- src/propgrid/property.cpp | 6 +++--- src/propgrid/propgrid.cpp | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index ddc12cf131..aac562b4e3 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -692,7 +692,7 @@ template<> inline wxVariant WXVARIANT( const wxColour& value ) class WXDLLIMPEXP_PROPGRID wxPGStringTokenizer { public: - wxPGStringTokenizer( const wxString& str, wxChar delimeter ); + wxPGStringTokenizer( const wxString& str, wxChar delimiter ); ~wxPGStringTokenizer(); bool HasMoreTokens(); // not const so we can do some stuff in it @@ -702,7 +702,7 @@ protected: const wxString* m_str; wxString::const_iterator m_curPos; wxString m_readyToken; - wxUniChar m_delimeter; + wxUniChar m_delimiter; }; #define WX_PG_TOKENIZER2_BEGIN(WXSTRING,DELIMITER) \ diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp index 390aa675ee..aabe208a84 100644 --- a/src/propgrid/property.cpp +++ b/src/propgrid/property.cpp @@ -1102,7 +1102,7 @@ bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFla // Its best only to add non-empty group items bool addOnlyIfNotEmpty = false; - const wxChar delimeter = wxS(';'); + const wxChar delimiter = wxS(';'); size_t tokenStart = 0xFFFFFF; @@ -1132,7 +1132,7 @@ bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFla if ( tokenStart != 0xFFFFFF ) { // Token is running - if ( a == delimeter || a == 0 ) + if ( a == delimiter || a == 0 ) { token = text.substr(tokenStart,pos-tokenStart); token.Trim(true); @@ -1263,7 +1263,7 @@ bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFla { tokenStart = pos; - if ( a == delimeter ) + if ( a == delimiter ) strPosIncrement -= 1; } } diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp index e7257f7fbb..c1e0fb1f35 100644 --- a/src/propgrid/propgrid.cpp +++ b/src/propgrid/propgrid.cpp @@ -6150,8 +6150,8 @@ void wxPropertyGrid::RegisterDefaultEditors() // Needed to handle C-style string lists (e.g. "str1" "str2") // ----------------------------------------------------------------------- -wxPGStringTokenizer::wxPGStringTokenizer( const wxString& str, wxChar delimeter ) - : m_str(&str), m_curPos(str.begin()), m_delimeter(delimeter) +wxPGStringTokenizer::wxPGStringTokenizer( const wxString& str, wxChar delimiter ) + : m_str(&str), m_curPos(str.begin()), m_delimiter(delimiter) { } @@ -6165,7 +6165,7 @@ bool wxPGStringTokenizer::HasMoreTokens() wxString::const_iterator i = m_curPos; - wxUniChar delim = m_delimeter; + wxUniChar delim = m_delimiter; wxUniChar a; wxUniChar prev_a = wxS('\0');