compilation fix: only us-ascii is safe in sources

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

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 44f75d959c71d012baa09b47ebd69f46d438eb7b..d31c59a49e587426bcaf347b2cdfb214aa450adf 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -46,7 +46,7 @@ This code was used as a starting point for my rc2xml converter
 
 // for all others, include the necessary headers (this file is usually all you
 
-// need because it includes almost all "standard" wxWindows headers
+// need because it includes almost all "standard" wxWidgets headers
 
 #ifndef WX_PRECOMP
 
@@ -77,7 +77,7 @@ rc2wxr::rc2wxr()
 
 {
 
-m_done=FALSE;
+m_done=false;
 
 m_controlid=6000;
 
@@ -511,7 +511,7 @@ bool rc2wxr::Seperator(int ch)
 
 if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|'))
 
-   return TRUE;
+   return true;
 
 
 
@@ -519,13 +519,13 @@ if (ch==EOF)
 
 {
 
-m_done=TRUE;
+m_done=true;
 
-return TRUE;
+return true;
 
 }
 
-return FALSE;
+return false;
 
 }
 
@@ -595,7 +595,7 @@ if (m_rc.Eof())
 
 {
 
-m_done=TRUE;
+m_done=true;
 
 return tok;
 
@@ -611,7 +611,7 @@ if (ch==EOF)
 
 {
 
-m_done=TRUE;
+m_done=true;
 
 return tok;
 
@@ -637,7 +637,7 @@ if (ch==EOF)
 
 {
 
-m_done=TRUE;
+m_done=true;
 
 
 
@@ -663,7 +663,7 @@ ReadChar(ch);
 
 if (ch==EOF)
 
-   m_done=TRUE;
+   m_done=true;
 
 
 
@@ -719,7 +719,7 @@ void rc2wxr::ReadChar(int &ch)
 
 {
 
-       int result;
+    int result;
 
 result=m_rc.Tell();
 
@@ -727,7 +727,7 @@ result=m_rc.Tell();
 
 if((result>=m_filesize))
 
-    m_done=TRUE;
+    m_done=true;
 
 
 
@@ -737,13 +737,13 @@ result=m_rc.Read(&ch,1);
 
 if((result==-1))
 
-   m_done=TRUE;
+   m_done=true;
 
 
 
 if(ch==EOF)
 
-   m_done=TRUE;
+   m_done=true;
 
 }
 
@@ -817,13 +817,13 @@ while ((tok!=_T("END"))&(tok!=_T("}")))
 
 if (tok==_T("POPUP"))
 
-       {
+    {
 
     ParsePopupMenu();
 
-       wxFprintf(m_wxr,_T("  ],\\\n"));
+    wxFprintf(m_wxr,_T("  ],\\\n"));
 
-       }
+    }
 
 }
 
@@ -979,7 +979,8 @@ void rc2wxr::ParseSlider(wxString WXUNUSED(label), wxString varname)
 
 wxString tok;
 
-while (ReadOrs(tok));
+while (ReadOrs(tok))
+    ;
 
 wxFprintf(m_wxr,_T("  control = [%i,wxSlider,'','wxSL_HORIZONTAL','%s',"),m_controlid,varname.c_str());
 
@@ -1009,7 +1010,8 @@ void rc2wxr::ParseProgressBar(wxString WXUNUSED(label), wxString varname)
 
 wxString tok;
 
-while (ReadOrs(tok));
+while (ReadOrs(tok))
+    ;
 
 wxFprintf(m_wxr,_T("  control = [%i,wxGauge,'','wxGA_HORIZONTAL','%s',"),m_controlid,varname.c_str());
 
@@ -1041,7 +1043,7 @@ if (tok.IsNumber())
 
 w=GetToken();
 
-return TRUE;
+return true;
 
 }
 
@@ -1071,7 +1073,8 @@ if (tok==_T("BS_AUTOCHECKBOX"))
 
     wxFprintf(m_wxr,_T("  control = [%i,wxCheckBox,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str());
 
-    while (ReadOrs(tok));
+    while (ReadOrs(tok))
+        ;
 
     ReadRect(x,y,width,height);
 
@@ -1089,7 +1092,8 @@ if (tok==_T("BS_AUTORADIOBUTTON"))
 
     wxFprintf(m_wxr,_T("  control = [%i,wxRadioButton,'%s','0','%s',"),m_controlid,label.c_str(),varname.c_str());
 
-    while(ReadOrs(tok));
+    while(ReadOrs(tok))
+        ;
 
     ReadRect(x,y,width,height);