define _HPUX_SOURCE under HP-UX, otherwise many things are not defined in standard...

[wxWidgets.git] / contrib / utils / convertrc / rc2xml.cpp

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index ac3e7218dc725f4a7d63f224665da0dfcce6fe3f..84550e020519d28b0b262c2b6b212614c1c127ef 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -15,10 +15,6 @@ cross platform (wxGTK,etc)
 3.  Be able to abort incorrectly formated files without crashing
 */
 
-#ifdef __GNUG__
-#pragma implementation "rc2xml.h"
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -29,7 +25,7 @@ cross platform (wxGTK,etc)
 // for all others, include the necessary headers (this file is usually all you
 // need because it includes almost all "standard" wxWidgets headers
 #ifndef WX_PRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 
@@ -37,8 +33,8 @@ cross platform (wxGTK,etc)
 #include "wx/image.h"
 #include "wx/deprecated/setup.h"
 #include "wx/deprecated/resource.h"
-#include <wx/textfile.h>
-#include <wx/tokenzr.h>
+#include "wx/textfile.h"
+#include "wx/tokenzr.h"
 
 
 
@@ -342,7 +338,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'))
@@ -387,7 +383,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;
 
@@ -405,7 +401,7 @@ wxString rc2xml::GetToken(bool *listseperator)
     return token;
     }
 
-    while (Seperator(ch))
+    while (Separator(ch))
     {
     ReadChar(ch);
     if (m_done)
@@ -418,7 +414,7 @@ wxString rc2xml::GetToken(bool *listseperator)
     }
 
 
-    while (!Seperator(ch))
+    while (!Separator(ch))
     {
     token += (char)ch;
     ReadChar(ch);
@@ -427,8 +423,8 @@ wxString rc2xml::GetToken(bool *listseperator)
     if (ch == EOF)
         m_done = true;
 
-    if (listseperator)
-      *listseperator = (ch == ',');
+    if (listseparator)
+      *listseparator = (ch == ',');
     return token;
 }