Fixed minor typos in the name of variables.
This commit is contained in:
@@ -692,7 +692,7 @@ template<> inline wxVariant WXVARIANT( const wxColour& value )
|
|||||||
class WXDLLIMPEXP_PROPGRID wxPGStringTokenizer
|
class WXDLLIMPEXP_PROPGRID wxPGStringTokenizer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
wxPGStringTokenizer( const wxString& str, wxChar delimeter );
|
wxPGStringTokenizer( const wxString& str, wxChar delimiter );
|
||||||
~wxPGStringTokenizer();
|
~wxPGStringTokenizer();
|
||||||
|
|
||||||
bool HasMoreTokens(); // not const so we can do some stuff in it
|
bool HasMoreTokens(); // not const so we can do some stuff in it
|
||||||
@@ -702,7 +702,7 @@ protected:
|
|||||||
const wxString* m_str;
|
const wxString* m_str;
|
||||||
wxString::const_iterator m_curPos;
|
wxString::const_iterator m_curPos;
|
||||||
wxString m_readyToken;
|
wxString m_readyToken;
|
||||||
wxUniChar m_delimeter;
|
wxUniChar m_delimiter;
|
||||||
};
|
};
|
||||||
|
|
||||||
#define WX_PG_TOKENIZER2_BEGIN(WXSTRING,DELIMITER) \
|
#define WX_PG_TOKENIZER2_BEGIN(WXSTRING,DELIMITER) \
|
||||||
|
@@ -1102,7 +1102,7 @@ bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFla
|
|||||||
|
|
||||||
// Its best only to add non-empty group items
|
// Its best only to add non-empty group items
|
||||||
bool addOnlyIfNotEmpty = false;
|
bool addOnlyIfNotEmpty = false;
|
||||||
const wxChar delimeter = wxS(';');
|
const wxChar delimiter = wxS(';');
|
||||||
|
|
||||||
size_t tokenStart = 0xFFFFFF;
|
size_t tokenStart = 0xFFFFFF;
|
||||||
|
|
||||||
@@ -1132,7 +1132,7 @@ bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFla
|
|||||||
if ( tokenStart != 0xFFFFFF )
|
if ( tokenStart != 0xFFFFFF )
|
||||||
{
|
{
|
||||||
// Token is running
|
// Token is running
|
||||||
if ( a == delimeter || a == 0 )
|
if ( a == delimiter || a == 0 )
|
||||||
{
|
{
|
||||||
token = text.substr(tokenStart,pos-tokenStart);
|
token = text.substr(tokenStart,pos-tokenStart);
|
||||||
token.Trim(true);
|
token.Trim(true);
|
||||||
@@ -1263,7 +1263,7 @@ bool wxPGProperty::StringToValue( wxVariant& v, const wxString& text, int argFla
|
|||||||
{
|
{
|
||||||
tokenStart = pos;
|
tokenStart = pos;
|
||||||
|
|
||||||
if ( a == delimeter )
|
if ( a == delimiter )
|
||||||
strPosIncrement -= 1;
|
strPosIncrement -= 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -6150,8 +6150,8 @@ void wxPropertyGrid::RegisterDefaultEditors()
|
|||||||
// Needed to handle C-style string lists (e.g. "str1" "str2")
|
// Needed to handle C-style string lists (e.g. "str1" "str2")
|
||||||
// -----------------------------------------------------------------------
|
// -----------------------------------------------------------------------
|
||||||
|
|
||||||
wxPGStringTokenizer::wxPGStringTokenizer( const wxString& str, wxChar delimeter )
|
wxPGStringTokenizer::wxPGStringTokenizer( const wxString& str, wxChar delimiter )
|
||||||
: m_str(&str), m_curPos(str.begin()), m_delimeter(delimeter)
|
: m_str(&str), m_curPos(str.begin()), m_delimiter(delimiter)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6165,7 +6165,7 @@ bool wxPGStringTokenizer::HasMoreTokens()
|
|||||||
|
|
||||||
wxString::const_iterator i = m_curPos;
|
wxString::const_iterator i = m_curPos;
|
||||||
|
|
||||||
wxUniChar delim = m_delimeter;
|
wxUniChar delim = m_delimiter;
|
||||||
wxUniChar a;
|
wxUniChar a;
|
||||||
wxUniChar prev_a = wxS('\0');
|
wxUniChar prev_a = wxS('\0');
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user