X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/656dad21d847f6d27f552cd07eef229c24690bf3..3285ee538be44537a0d4e43252db18f5e7362782:/contrib/utils/convertrc/rc2xml.cpp diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp index 18469e83e9..ddc225b77b 100644 --- a/contrib/utils/convertrc/rc2xml.cpp +++ b/contrib/utils/convertrc/rc2xml.cpp @@ -16,8 +16,7 @@ cross platform (wxGTK,etc) */ #ifdef __GNUG__ -#pragma implementation "rc2xml.cpp" -#pragma interface "rc2xml.cpp" +#pragma implementation "rc2xml.h" #endif // For compilers that support precompilation, includes "wx/wx.h". @@ -343,7 +342,7 @@ void rc2xml::ParsePushButton(wxString phrase, wxString varname) } -bool rc2xml::Seperator(int ch) +bool rc2xml::Separator(int ch) { //if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t')) if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t')) @@ -388,7 +387,7 @@ bool rc2xml::ReadRect(int & x, int & y, int & width, int & height) return ret; // check for more parameters } -wxString rc2xml::GetToken(bool *listseperator) +wxString rc2xml::GetToken(bool *listseparator) { wxString token=wxEmptyString; @@ -406,7 +405,7 @@ wxString rc2xml::GetToken(bool *listseperator) return token; } - while (Seperator(ch)) + while (Separator(ch)) { ReadChar(ch); if (m_done) @@ -419,7 +418,7 @@ wxString rc2xml::GetToken(bool *listseperator) } - while (!Seperator(ch)) + while (!Separator(ch)) { token += (char)ch; ReadChar(ch); @@ -428,8 +427,8 @@ wxString rc2xml::GetToken(bool *listseperator) if (ch == EOF) m_done = true; - if (listseperator) - *listseperator = (ch == ','); + if (listseparator) + *listseparator = (ch == ','); return token; }