use wxRect::Contains(), not Inside() (fixes compilation for WXWIN_COMPATIBILITY_2_6==0

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

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 18469e83e92d5634dd9b49312fb3281ec904a1ec..17fc4cebf7b89520121b80af408c4b0541c678ae 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -12,14 +12,9 @@ trans->Convert("Myfile.rc","Myfile.xml");
 1.  Figure how to fix memory leaks in all wxLists in this class
 2.  Find a way to rename MS Windows fonts so that they work
 cross platform (wxGTK,etc)
 1.  Figure how to fix memory leaks in all wxLists in this class
 2.  Find a way to rename MS Windows fonts so that they work
 cross platform (wxGTK,etc)

-3.  Be able to abort incorrectly formated files without crashing
+3.  Be able to abort incorrectly formatted files without crashing

 */
 
 */
 

-#ifdef __GNUG__
-#pragma implementation "rc2xml.cpp"
-#pragma interface "rc2xml.cpp"
-#endif
-

 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 


@@ -30,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
 // 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
 
 
 #endif
 
 


@@ -38,8 +33,8 @@ cross platform (wxGTK,etc)
 #include "wx/image.h"
 #include "wx/deprecated/setup.h"
 #include "wx/deprecated/resource.h"
 #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"

 
 
 
 
 
 


@@ -343,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'))
 {
 //if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='|')|(ch=='\t'))
     if ((ch==' ')|(ch==',')|(ch==13)|(ch==10)|(ch=='\t'))


@@ -388,7 +383,7 @@ bool rc2xml::ReadRect(int & x, int & y, int & width, int & height)
     return ret; // check for more parameters
 }
 
     return ret; // check for more parameters
 }
 

-wxString rc2xml::GetToken(bool *listseperator)
+wxString rc2xml::GetToken(bool *listseparator)

 {
     wxString token=wxEmptyString;
 
 {
     wxString token=wxEmptyString;
 


@@ -406,7 +401,7 @@ wxString rc2xml::GetToken(bool *listseperator)
     return token;
     }
 
     return token;
     }
 

-    while (Seperator(ch))
+    while (Separator(ch))

     {
     ReadChar(ch);
     if (m_done)
     {
     ReadChar(ch);
     if (m_done)


@@ -419,7 +414,7 @@ wxString rc2xml::GetToken(bool *listseperator)
     }
 
 
     }
 
 

-    while (!Seperator(ch))
+    while (!Separator(ch))

     {
     token += (char)ch;
     ReadChar(ch);
     {
     token += (char)ch;
     ReadChar(ch);


@@ -428,8 +423,8 @@ wxString rc2xml::GetToken(bool *listseperator)
     if (ch == EOF)
         m_done = true;
 
     if (ch == EOF)
         m_done = true;
 

-    if (listseperator)
-      *listseperator = (ch == ',');
+    if (listseparator)
+      *listseparator = (ch == ',');

     return token;
 }
 
     return token;
 }