Better wxFile support, warning fixes and minor source cleaning.

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

diff --git a/contrib/utils/convertrc/rc2wxr.cpp b/contrib/utils/convertrc/rc2wxr.cpp
index 11eb941376c9844a1ab7e8f08f426a143d3c277f..2a923d54459a204bb51992e563b010efdba2bac2 100644 (file)
--- a/contrib/utils/convertrc/rc2wxr.cpp
+++ b/contrib/utils/convertrc/rc2wxr.cpp
@@ -675,41 +675,24 @@ return phrase;
 
 
 void rc2wxr::ReadChar(int &ch)
 
 
 void rc2wxr::ReadChar(int &ch)

-

 {
 {

+    wxFileOffset result = m_rc.Tell();

 
 

-    int result;
-
-result=m_rc.Tell();
-
-
-
-if((result>=m_filesize))
-
-    m_done=true;
-
-
-
-result=m_rc.Read(&ch,1);
+    if ( result >= m_filesize )
+        m_done=true;

 
 

+    result = m_rc.Read(&ch,1);

 
 

+    if ( result==wxInvalidOffset )
+        m_done=true;

 
 

-if((result==-1))
-
-   m_done=true;
-
-
-
-if(ch==EOF)
-
-   m_done=true;
-
+    if(ch==EOF)
+        m_done=true;

 }
 
 
 
 void rc2wxr::ParseComboBox()
 }
 
 
 
 void rc2wxr::ParseComboBox()

-

 {
 
 /* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT |
 {
 
 /* COMBOBOX        IDC_SCALECOMBO,10,110,48,52,CBS_DROPDOWNLIST | CBS_SORT |