wxEmptyString decorations.

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

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 795f45a9eb92c4aaa536b7fbe78342fd9aed1fac..9f4246b19aed79d85525bf6ecde3545ea324f4ab 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -21,14 +21,14 @@ cross platform (wxGTK,etc)
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx/wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 // for all others, include the necessary headers (this file is usually all you
 
 #ifdef __BORLANDC__
 #pragma hdrstop
 #endif
 
 // 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
 #include <wx/wx.h>
 #endif
 #ifndef WX_PRECOMP
 #include <wx/wx.h>
 #endif


@@ -36,7 +36,8 @@ cross platform (wxGTK,etc)
 
 #include "rc2xml.h"
 #include "wx/image.h"
 
 #include "rc2xml.h"
 #include "wx/image.h"

-#include "wx/resource.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>
 


@@ -48,7 +49,7 @@ cross platform (wxGTK,etc)
 
 rc2xml::rc2xml()
 {
 
 rc2xml::rc2xml()
 {

-    m_done=FALSE;
+    m_done=false;

     m_bitmaplist=new wxList(wxKEY_STRING);
     m_stringtable=new wxList(wxKEY_STRING);
     m_iconlist = new wxList(wxKEY_STRING);
     m_bitmaplist=new wxList(wxKEY_STRING);
     m_stringtable=new wxList(wxKEY_STRING);
     m_iconlist = new wxList(wxKEY_STRING);


@@ -67,32 +68,44 @@ bool rc2xml::Convert(wxString rcfile, wxString xmlfile)
 {
     m_rc.Open(rcfile.c_str());
     m_filesize=m_rc.Length();
 {
     m_rc.Open(rcfile.c_str());
     m_filesize=m_rc.Length();

-    
+
+
+    m_workingpath=wxPathOnly(rcfile);
+
+    m_targetpath=wxPathOnly(xmlfile) + _T("\\");
+
+
+
+    wxSetWorkingDirectory(m_workingpath);
+
+

     bool result;
     bool result;

-    result=m_xmlfile.Open(xmlfile.c_str(),"w+t");
-    wxASSERT_MSG(result,"Couldn't create XML file");   
+    result=m_xmlfile.Open(xmlfile.c_str(),_T("w+t"));
+    wxASSERT_MSG(result,_T("Couldn't create XML file"));

     if (!result)
     if (!result)

-        return FALSE;
+        return false;
+

 
 

-       

 /* Write Basic header for XML file */
 /* Write Basic header for XML file */

-    m_xmlfile.Write("<?xml version=\"1.0\" ?>\n");
-    m_xmlfile.Write("<resource>\n");
-    
+    m_xmlfile.Write(_T("<?xml version=\"1.0\" ?>\n"));
+    m_xmlfile.Write(_T("<resource>\n"));
+

 //Read resource.h
     ParseResourceHeader();
 //Gather all the resource we need for toolbars,menus, and etc
     FirstPass();
 //Read resource.h
     ParseResourceHeader();
 //Gather all the resource we need for toolbars,menus, and etc
     FirstPass();

-    m_done=FALSE;
+    m_done=false;

     m_rc.Seek(0);
 //Read in dialogs, toolbars,menus
     SecondPass();
 
     m_rc.Seek(0);
 //Read in dialogs, toolbars,menus
     SecondPass();
 

-    m_xmlfile.Write("</resource>\n");
+    m_xmlfile.Write(_T("</resource>\n"));

     m_xmlfile.Close();
     m_rc.Close();
     m_xmlfile.Close();
     m_rc.Close();

+    wxMessageBox(_("Conversion complete."), _("Done"),
+                            wxOK | wxICON_INFORMATION);

 
 

-return TRUE;
+return true;

 }
 
 
 }
 
 


@@ -101,12 +114,13 @@ void rc2xml::ParseDialog(wxString dlgname)
     wxString token;
     static int dlgid=999;
     dlgid++;
     wxString token;
     static int dlgid=999;
     dlgid++;

-/* Make sure that this really is a dialog 
+/* Make sure that this really is a dialog

 microsoft reuses the keyword DIALOG for other things
 */
     token=PeekToken();
 //Microsoft notation?
 microsoft reuses the keyword DIALOG for other things
 */
     token=PeekToken();
 //Microsoft notation?

-    if (token=="DISCARDABLE")
+    while ((token==_T("DISCARDABLE"))
+            ||(token==_T("LOADONCALL"))||(token==_T("MOVEABLE")))

     {
     token=GetToken();
     token=PeekToken();
     {
     token=GetToken();
     token=PeekToken();


@@ -122,45 +136,43 @@ microsoft reuses the keyword DIALOG for other things
     token=GetToken();
     wxString title;
     wxString ptsize,face;
     token=GetToken();
     wxString title;
     wxString ptsize,face;

-    
-    m_xmlfile.Write("\t<dialog");
+
+    m_xmlfile.Write(_T("\t<object class=\"wxDialog\""));

     //Avoid duplicate names this way
     //Avoid duplicate names this way

-    dlgname.Replace("IDD_","DLG_");
+    dlgname.Replace(_T("IDD_"),_T("DLG_"));

     WriteBasicInfo(x,y,width,height,dlgname);
     WriteTitle(title);
     WriteBasicInfo(x,y,width,height,dlgname);
     WriteTitle(title);

-    

 
 

-    while ((token!="BEGIN")&(token!="{"))
+
+    while ((token!=_T("BEGIN"))&(token!=_T("{")))

     {
     {

-    if (token=="CAPTION")
+    if (token==_T("CAPTION"))

         {
         title=GetQuoteField();
         }
 
 //TODO fix face name so that it is cross platform name
 //  FONT 8, "MS Sans Serif"
         {
         title=GetQuoteField();
         }
 
 //TODO fix face name so that it is cross platform name
 //  FONT 8, "MS Sans Serif"

-    if (token=="FONT")
+    if (token==_T("FONT"))

         {
         ptsize=GetToken();
         face=GetQuoteField();
         {
         ptsize=GetToken();
         face=GetQuoteField();

-        m_xmlfile.Write("\t\t<font>\n");
-        m_xmlfile.Write("\t\t\t<size>"+ptsize+"</size>\n");
-        m_xmlfile.Write("\t\t\t<face>"+face+"</face>\n");
-        m_xmlfile.Write("\t\t</font>\n");
+        m_xmlfile.Write(_T("\t\t<font>\n"));
+        m_xmlfile.Write(_T("\t\t\t<size>")+ptsize+_T("</size>\n"));
+        m_xmlfile.Write(_T("\t\t\t<face>")+face+_T("</face>\n"));
+        m_xmlfile.Write(_T("\t\t</font>\n"));

         }
 
     token=GetToken();
     }
 
         }
 
     token=GetToken();
     }
 

-    m_xmlfile.Write("\t<children>\n");

     ParseControls();
     ParseControls();

-    m_xmlfile.Write("\t</children>\n");
-    m_xmlfile.Write("\t</dialog>\n");
+    m_xmlfile.Write(_T("\t</object>\n"));

 }
 
 /*
 BEGIN
 }
 
 /*
 BEGIN

-    EDITTEXT        IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT 
+    EDITTEXT        IDC_BANDS,36,83,22,14,ES_AUTOHSCROLL | ES_NUMBER | NOT

                     WS_TABSTOP
     LTEXT           "Bands",IDC_STATIC,11,86,21,8
     EDITTEXT        IDC_NAME,10,3,75,14,ES_AUTOHSCROLL
                     WS_TABSTOP
     LTEXT           "Bands",IDC_STATIC,11,86,21,8
     EDITTEXT        IDC_NAME,10,3,75,14,ES_AUTOHSCROLL


@@ -169,79 +181,164 @@ END
 void rc2xml::ParseControls()
 {
     wxString token;
 void rc2xml::ParseControls()
 {
     wxString token;

+    wxString label,varname;

 
     token=GetToken();
 
     token=GetToken();

-    while ((token!="END")&(token!="}"))
+    while ((token!=_T("END"))&(token!=_T("}")))

         {
         {

-        if (token=="LTEXT")
-            ParseStaticText();
-        else if (token=="EDITTEXT")
-            ParseTextCtrl();
-        else if (token=="PUSHBUTTON")
-            ParsePushButton();
-        else if (token=="DEFPUSHBUTTON")
-            ParsePushButton();
-        else if (token=="GROUPBOX")
-            ParseGroupBox();
-        else if (token=="COMBOBOX")
-            ParseComboBox();
-        else if (token=="CONTROL")
+        if (token==_T("AUTOCHECKBOX"))
+           {
+            label=GetQuoteField();
+            varname=GetToken();
+            ParseCheckBox(label,varname);
+            }
+        else
+        if (token==_T("AUTORADIOBUTTON"))
+           {
+            label=GetQuoteField();
+            varname=GetToken();
+            ParseRadioButton(label,varname);
+           }
+        else
+        if (token==_T("LTEXT"))
+           {
+            label=GetQuoteField();
+            varname=GetToken();
+            ParseStaticText(label,varname);
+            }
+        else if (token==_T("EDITTEXT"))
+           {
+            varname=GetToken();
+            ParseTextCtrl(varname);
+            }
+        else if ((token==_T("PUSHBUTTON"))||(token==_T("DEFPUSHBUTTON")))
+           {
+            label=GetQuoteField();
+            varname=GetToken();
+            ParsePushButton(label,varname);
+            }
+        else if (token==_T("GROUPBOX"))
+           {
+            label=GetQuoteField();
+            varname=GetToken();
+            ParseGroupBox(label,varname);
+            }
+        else if (token==_T("COMBOBOX"))
+            {
+            varname=GetToken();
+            ParseComboBox(varname);
+             }
+        else if (token==_T("CONTROL"))

             ParseControlMS();
             ParseControlMS();

-        else if (token=="LISTBOX")
-            ParseListBox();
-        else if (token=="ICON")
+        else if (token==_T("LISTBOX"))
+           {
+            varname=GetToken();
+            ParseListBox(varname);
+            }
+        else if (token==_T("ICON"))

             ParseIconStatic();
             ParseIconStatic();

-        else if (token=="SCROLLBAR")
+        else if (token==_T("SCROLLBAR"))

             ParseScrollBar();
         token=GetToken();
         }
 
 }
 //LTEXT           "Radius",IDC_STATIC,9,67,23,8
             ParseScrollBar();
         token=GetToken();
         }
 
 }
 //LTEXT           "Radius",IDC_STATIC,9,67,23,8

-void rc2xml::ParseStaticText()
+void rc2xml::ParseStaticText(wxString phrase, wxString varname)

 {
     wxString token;
 {
     wxString token;

-    wxString phrase,varname;
-    phrase=GetQuoteField();
-    varname=GetToken();
+    token=PeekToken();
+    while (!token.IsNumber())
+        {
+        token=GetToken();
+        token=PeekToken();
+        }

     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 

-    m_xmlfile.Write("\t\t<statictext");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticText\""));

     WriteBasicInfo(x,y,width,height,varname);WriteLabel(phrase);
     WriteBasicInfo(x,y,width,height,varname);WriteLabel(phrase);

-    m_xmlfile.Write("\t\t</statictext>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 //EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL
 
 }
 //EDITTEXT        IDC_RADIUS,36,65,40,14,ES_AUTOHSCROLL

-void rc2xml::ParseTextCtrl()
+void rc2xml::ParseTextCtrl(wxString varname)

 {
     wxString token;
 {
     wxString token;

-    wxString varname,style;
-    varname=GetToken();
+    wxString style;
+    token=PeekToken();
+    while (!token.IsNumber())
+        {
+        token=GetToken();
+        token=PeekToken();
+        }

     int x,y,width,height;
     ReadRect(x,y,width,height);
 //TODO
 //style=GetToken();
     int x,y,width,height;
     ReadRect(x,y,width,height);
 //TODO
 //style=GetToken();

-    m_xmlfile.Write("\t\t<textctrl");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxTextCtrl\""));
+    WriteBasicInfo(x,y,width,height,varname);
+    m_xmlfile.Write(_T("\t\t</object>\n"));
+
+}
+//AUTOCHECKBOX "&log.", ID_XLOG, 25, 24, 21, 12
+void rc2xml::ParseCheckBox(wxString phrase, wxString varname)
+{
+    wxString token;
+    token=PeekToken();
+    while (!token.IsNumber())
+        {
+        token=GetToken();
+        token=PeekToken();
+        }
+    int x,y,width,height;
+    ReadRect(x,y,width,height);
+
+    m_xmlfile.Write(_T("\t\t<object class=\"wxCheckBox\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBasicInfo(x,y,width,height,varname);

-    m_xmlfile.Write("\t\t</textctrl>\n");
+    WriteLabel(phrase);
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 
 }

+//AUTORADIOBUTTON "&text", ID_SW10, 13, 12, 68, 10, BS_AUTORADIOBUTTON | WS_GROUP
+void rc2xml::ParseRadioButton(wxString phrase, wxString varname)
+{
+    wxString token,style;
+    int x,y,width,height;
+    bool GotOrs;
+    GotOrs = ReadOrs(token);
+    if (ReadRect(x,y,width,height))
+        if (GotOrs==false)
+      ReadOrs(token);
+    if (token.Find(_T("WS_GROUP")) != wxNOT_FOUND)
+        style += _T("wxRB_GROUP");
+
+    m_xmlfile.Write(_T("\t\t<object class=\"wxRadioButton\""));
+    WriteBasicInfo(x,y,width,height,varname);
+    WriteLabel(phrase);
+    WriteStyle(style);
+    m_xmlfile.Write(_T("\t\t</object>\n"));
+
+}
+

 //PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP
 //PUSHBUTTON      "Create/Update",IDC_CREATE,15,25,53,13,NOT WS_TABSTOP

-void rc2xml::ParsePushButton()
+void rc2xml::ParsePushButton(wxString phrase, wxString varname)

 {
     wxString token;
 {
     wxString token;

-    wxString phrase,varname;
-    phrase=GetQuoteField();
-    varname=GetToken();

 
 

+    token=PeekToken();
+    while (!token.IsNumber())
+        {
+        token=GetToken();
+        token=PeekToken();
+        }

     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 

-    m_xmlfile.Write("\t\t<button");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxButton\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteLabel(phrase);
     WriteBasicInfo(x,y,width,height,varname);
     WriteLabel(phrase);

-    m_xmlfile.Write("\t\t</button>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 
 
 }
 


@@ -250,48 +347,54 @@ bool rc2xml::Seperator(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'))

-        return TRUE;
+        return true;

 
     if (ch==EOF)
         {
 
     if (ch==EOF)
         {

-        m_done=TRUE;
-        return TRUE;
+        m_done=true;
+        return true;

         }
         }

-    
-    return FALSE;
+
+    return false;

 }
 
 }
 

-void rc2xml::ParseGroupBox()
+void rc2xml::ParseGroupBox(wxString phrase, wxString varname)

 {
 //    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79
     wxString token;
 {
 //    GROUPBOX        "Rotate",IDC_STATIC,1,1,71,79
     wxString token;

-    wxString phrase,varname;
-    phrase=GetQuoteField();
-    varname=GetToken();
+    token=PeekToken();
+    while (!token.IsNumber())
+        {
+        token=GetToken();
+        token=PeekToken();
+        }

     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 

-    m_xmlfile.Write("\t\t<staticbox");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticBox\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteLabel(phrase);
     WriteBasicInfo(x,y,width,height,varname);
     WriteLabel(phrase);

-    m_xmlfile.Write("\t\t</staticbox>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 }
 
 }
 

-void rc2xml::ReadRect(int & x, int & y, int & width, int & height)
+bool rc2xml::ReadRect(int & x, int & y, int & width, int & height)

 {
 {

-    x=atoi(GetToken());
-    y=atoi(GetToken());
-    width=atoi(GetToken());
-    height=atoi(GetToken());
+    x=wxAtoi(GetToken());
+    y=wxAtoi(GetToken());
+    width=wxAtoi(GetToken());
+    bool ret;
+    wxString tmp = GetToken(&ret);
+    height=wxAtoi(tmp);
+    return ret; // check for more parameters

 }
 
 }
 

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

 {
 {

-    wxString token="";
+    wxString token=wxEmptyString;

 
     if (m_rc.Eof())
     {
 
     if (m_rc.Eof())
     {

-    m_done=TRUE;
+    m_done=true;

     return token;
 }
 
     return token;
 }
 


@@ -299,7 +402,7 @@ wxString rc2xml::GetToken()
     ReadChar(ch);
     if (ch==EOF)
     {
     ReadChar(ch);
     if (ch==EOF)
     {

-    m_done=TRUE;
+    m_done=true;

     return token;
     }
 
     return token;
     }
 


@@ -312,19 +415,21 @@ wxString rc2xml::GetToken()
 
     if (ch==EOF)
     {
 
     if (ch==EOF)
     {

-    m_done=TRUE;
+    m_done=true;

     }
     }

-  
+

 
     while (!Seperator(ch))
     {
 
     while (!Seperator(ch))
     {

-    token+=(char)ch;
+    token += (char)ch;

     ReadChar(ch);
     }
 
     ReadChar(ch);
     }
 

-    if (ch==EOF)
-        m_done=TRUE;
+    if (ch == EOF)
+        m_done = true;

 
 

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

     return token;
 }
 
     return token;
 }
 


@@ -333,18 +438,78 @@ wxString rc2xml::GetQuoteField()
     wxString phrase;
     //ASCII code 34 "
     int ch=0;
     wxString phrase;
     //ASCII code 34 "
     int ch=0;

+    int ch1=0;
+

     ReadChar(ch);
 
     ReadChar(ch);
 

+    // !! Changed by MS, 15th/11/04. Can now read strings such as
+    // """Catapult"" - blah blah", ...
+

     while (ch!=34)
         ReadChar(ch);
     while (ch!=34)
         ReadChar(ch);

-  
+
+    // found first '"'
+    while (true)
+    {
+        ReadChar(ch);
+        if (ch == 34)
+        {
+            // another quote?
+            ReadChar(ch1);
+            if (ch1 != 34)
+            {
+                // real end of string..
+                break;
+            }
+
+            // add a single quote - fall through
+        }
+        phrase+=(char)ch;
+    }
+
+    return phrase;
+}
+
+// string in stringtable may contain embedded quotes
+// escape characters retained to allow strings to be rewritten
+wxString rc2xml::GetStringQuote()
+{
+    wxString phrase;
+    //ASCII code 34 "
+    bool done=false;
+    int p,ch=0,lastch=0;

     ReadChar(ch);
 
     while (ch!=34)
     ReadChar(ch);
 
     while (ch!=34)

+        ReadChar(ch);
+    ReadChar(ch);
+    while (done==false)
+        {
+        if ((ch==34)&&(lastch!='\\'))
+            {
+            p=m_rc.Tell();
+            ReadChar(ch);
+// RC supports "", for embedded quote, as well as  \"
+            if (ch==34)
+                phrase+='\\';
+            else

     {
     {

+                m_rc.Seek(p);
+                done = true;
+                }
+            }
+         if (done==true)
+             break;
+         if (ch=='\r')
+             ReadChar(ch);                    // skip
+         if ((ch=='\n')&&(lastch=='\\'))      // lastch <should> be this
+             phrase+='n';                     // escape
+         else

     phrase+=(char)ch;
     phrase+=(char)ch;

+         lastch=ch;

     ReadChar(ch);
     }
     ReadChar(ch);
     }

+

     return phrase;
 }
 
     return phrase;
 }
 


@@ -354,58 +519,66 @@ void rc2xml::ReadChar(int &ch)
     result=m_rc.Tell();
 
     if((result>=m_filesize))
     result=m_rc.Tell();
 
     if((result>=m_filesize))

-        m_done=TRUE;
+        m_done=true;

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

-        m_done=TRUE;
+        m_done=true;

 
     if(ch==EOF)
 
     if(ch==EOF)

-        m_done=TRUE;
+        m_done=true;

 }
 
 }
 

-void rc2xml::ParseComboBox()
+void rc2xml::ParseComboBox(wxString varname)

 {
 {

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

                     WS_VSCROLL | WS_TABSTOP */
                     WS_VSCROLL | WS_TABSTOP */

-    wxString token;
-    wxString varname;
-    varname=GetToken();
+    wxString token,style;

     int x,y,width,height;
     int x,y,width,height;

-    ReadRect(x,y,width,height);
+    bool GotOrs;
+    GotOrs = ReadOrs(token);
+    if (ReadRect(x,y,width,height))
+        if (GotOrs==false)
+      ReadOrs(token);

 
 

-    m_xmlfile.Write("\t\t<combobox");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxComboBox\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBasicInfo(x,y,width,height,varname);

-    m_xmlfile.Write("\n\t\t</combobox>\n");
+    if (token.Find(_T("CBS_SIMPLE")) != wxNOT_FOUND)
+        WriteStyle(_T("wxCB_SIMPLE"));
+    if (token.Find(_T("CBS_SORT")) != wxNOT_FOUND)
+        WriteStyle(_T("wxCB_SORT"));
+    if (token.Find(_T("CBS_DISABLENOSCROLL")) != wxNOT_FOUND)
+        WriteStyle(_T("wxLB_ALWAYS_SB"));
+    m_xmlfile.Write(_T("\n\t\t</object>\n"));

 
 }
 
 void rc2xml::ParseMenu(wxString varname)
 {
 
 }
 
 void rc2xml::ParseMenu(wxString varname)
 {

-    wxString token="";
+    wxString token=wxEmptyString;

 
     //Write menubar to xml file
 
     //Write menubar to xml file

-    m_xmlfile.Write("\t<menubar");
+    m_xmlfile.Write(_T("\t<object class=\"wxMenuBar\""));

     //Avoid duplicate names this way
     //Avoid duplicate names this way

-    varname.Replace("IDR_","MB_");
+    varname.Replace(_T("IDR_"),_T("MB_"));

     WriteName(varname);
     WriteName(varname);

-    m_xmlfile.Write(">\n");
-    m_xmlfile.Write("\t\t<children>\n");
+    m_xmlfile.Write(_T(">\n"));

 
 

-    while ((token!="BEGIN")&(token!="{"))
+    while ((token!=_T("BEGIN"))&(token!=_T("{")))

         token=GetToken();
 
         token=GetToken();
 

-    while ((token!="END")&(token!="}"))
+    while ((token!=_T("END"))&(token!=_T("}")))

     {
     token=GetToken();
     {
     token=GetToken();

-    if (token=="POPUP")
+    token.MakeUpper();
+
+    if (token==_T("POPUP"))

         {
         ParsePopupMenu();
         }
     }
         {
         ParsePopupMenu();
         }
     }

-    m_xmlfile.Write("\t\t</children>\n");
-    m_xmlfile.Write("\t</menubar>\n");
+    m_xmlfile.Write(_T("\t</object>\n"));

 }
 
 void rc2xml::ParsePopupMenu()
 }
 
 void rc2xml::ParsePopupMenu()


@@ -422,27 +595,27 @@ void rc2xml::ParsePopupMenu()
 
 //Write Menu item
 //Generate a fake name since RC menus don't have one
 
 //Write Menu item
 //Generate a fake name since RC menus don't have one

-    name<<"Menu_"<<menucount;
-    m_xmlfile.Write("\t\t<menu");
+    name << _T("Menu_") << menucount;
+    m_xmlfile.Write(_T("\t\t<object class=\"wxMenu\""));

     WriteName(name);
     WriteName(name);

-    m_xmlfile.Write(">\n");
+    m_xmlfile.Write(_T(">\n"));

     WriteLabel(token);
     WriteLabel(token);

-    m_xmlfile.Write("\t\t\t<children>\n");

 
 

-    while ((token!="BEGIN")&(token!="{"))
+    while ((token!=_T("BEGIN"))&(token!=_T("{")))

         token=GetToken();
 
         token=GetToken();
 

-    while ((token!="END")&(token!="}"))
+    while ((token!=_T("END"))&(token!=_T("}")))

     {
     token=GetToken();
     {
     token=GetToken();

-    if (token=="POPUP")
+    token.MakeUpper();
+
+    if (token==_T("POPUP"))

         ParsePopupMenu();
         ParsePopupMenu();

-       
-    if (token=="MENUITEM")
+
+    if (token==_T("MENUITEM"))

         ParseMenuItem();
     }
         ParseMenuItem();
     }

-    m_xmlfile.Write("\t\t\t</children>\n");
-    m_xmlfile.Write("\t\t\t</menu>\n");
+    m_xmlfile.Write(_T("\t\t\t</object>\n"));

 }
 
 wxString rc2xml::PeekToken()
 }
 
 wxString rc2xml::PeekToken()


@@ -461,52 +634,52 @@ void rc2xml::ParseControlMS()
     wxString label,varname,kindctrl,token;
     token=PeekToken();
 
     wxString label,varname,kindctrl,token;
     token=PeekToken();
 

-    if (token.Contains("\""))
+    if (token.Contains(_T("\"")))

         ParseNormalMSControl();
     else
         ParseWeirdMSControl();
 
 }
 
         ParseNormalMSControl();
     else
         ParseWeirdMSControl();
 
 }
 

-/*    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH | 
+/*    CONTROL         "Slider1",IDC_SLIDER1,"msctls_trackbar32",TBS_BOTH |

                     TBS_NOTICKS | WS_TABSTOP,52,73,100,15
 */
 
                     TBS_NOTICKS | WS_TABSTOP,52,73,100,15
 */
 

-void rc2xml::ParseSlider(wxString label, wxString varname)
+void rc2xml::ParseSlider(wxString WXUNUSED(label), wxString varname)

 {
     wxString token,style;
     ReadOrs(token);
 {
     wxString token,style;
     ReadOrs(token);

-    if (token.Find("TBS_VERT")!=-1)
-        style+="wxSL_VERTICAL";
+    if (token.Find(_T("TBS_VERT"))!=wxNOT_FOUND)
+        style+=_T("wxSL_VERTICAL");

     //MFC RC Default is horizontal
     else
     //MFC RC Default is horizontal
     else

-        style+="wxSL_HORIZONTAL";
+        style+=_T("wxSL_HORIZONTAL");

 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);

-    m_xmlfile.Write("\t\t<slider");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxSlider\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);
     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);

-    m_xmlfile.Write("\n\t\t</slider>\n");
+    m_xmlfile.Write(_T("\n\t\t</object>\n"));

 
 }
 
 }

-/*    
+/*

 CONTROL         "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32",
                     WS_BORDER,15,52,154,13
 */
 CONTROL         "Progress1",CG_IDC_PROGDLG_PROGRESS,"msctls_progress32",
                     WS_BORDER,15,52,154,13
 */

-void rc2xml::ParseProgressBar(wxString label, wxString varname)
+void rc2xml::ParseProgressBar(wxString WXUNUSED(label), wxString varname)

 {
     wxString token,style;
     ReadOrs(token);
 {
     wxString token,style;
     ReadOrs(token);

-   
+

     int x,y,width,height;
     ReadRect(x,y,width,height);
 
 //Always horizontal in MFC
     int x,y,width,height;
     ReadRect(x,y,width,height);
 
 //Always horizontal in MFC

-    m_xmlfile.Write("\t\t<gauge");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxGauge\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);
     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);

-    m_xmlfile.Write("\t\t</gauge>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 }
 
 bool rc2xml::ReadOrs(wxString & orstring)
 }
 
 bool rc2xml::ReadOrs(wxString & orstring)


@@ -515,152 +688,158 @@ bool rc2xml::ReadOrs(wxString & orstring)
 
     token=PeekToken();
     if (token.IsNumber())
 
     token=PeekToken();
     if (token.IsNumber())

-        return FALSE;
+        return false;

     orstring=GetToken();
 
     while(PeekToken()==_T("|"))
     {
     orstring=GetToken();
 
     while(PeekToken()==_T("|"))
     {

-    //Grab | 
+    //Grab |

     orstring+=GetToken();
     //Grab next token
     orstring+=GetToken();
     }
     orstring+=GetToken();
     //Grab next token
     orstring+=GetToken();
     }

-    return TRUE;
+    return true;

 }
 
 }
 

-//Is it a check button or a radio button
+//Is it a checkbutton or a radiobutton or a pushbutton or a groupbox

 void rc2xml::ParseCtrlButton(wxString label, wxString varname)
 {
     wxString token;
 void rc2xml::ParseCtrlButton(wxString label, wxString varname)
 {
     wxString token;

+    int p;
+    p=m_rc.Tell();

     ReadOrs(token);
     ReadOrs(token);

-    int x,y,width,height;
-
-    if (token.Find("BS_AUTOCHECKBOX")!=-1)
-        {
-        ReadRect(x,y,width,height);
-        m_xmlfile.Write("\t\t<checkbox");
-        WriteBasicInfo(x,y,width,height,varname);
-        WriteLabel(label);
-        m_xmlfile.Write("\t\t</checkbox>\n");
-        }
-
-    if (token.Find("BS_AUTORADIOBUTTON")!=-1)
-        {
-        ReadRect(x,y,width,height);
-        m_xmlfile.Write("\t\t<radiobutton");
-        WriteBasicInfo(x,y,width,height,varname);
-        WriteLabel(label);
-        m_xmlfile.Write("\t\t</radiobutton>\n");
-        }
+    m_rc.Seek(p);

 
 

+    if (token.Find(_T("BS_AUTOCHECKBOX"))!=wxNOT_FOUND)
+        ParseCheckBox(label, varname);
+    else if ((token.Find(_T("BS_AUTORADIOBUTTON"))!=wxNOT_FOUND)||
+                  (token.Find(_T("BS_RADIOBUTTON"))!=wxNOT_FOUND))
+        ParseRadioButton(label, varname);
+    else if (token.Find(_T("BS_GROUPBOX"))!=wxNOT_FOUND)
+        ParseGroupBox(label, varname);
+    else  // if ((token.Find("BS_PUSHBUTTON")!=wxNOT_FOUND)||
+//                (token.Find("BS_DEFPUSHBUTTON")!=wxNOT_FOUND))
+        ParsePushButton(label, varname);           // make default case

 }
 
 }
 

-

 void rc2xml::WriteSize(int width, int height)
 {
     wxString msg;
 void rc2xml::WriteSize(int width, int height)
 {
     wxString msg;

-    msg<<" <size>"<<width<<","<<height<<"d</size>";
+    msg << _T(" <size>") << width << _T(",") << height << _T("d</size>");

     m_xmlfile.Write(msg);
 }
 
 void rc2xml::WritePosition(int x, int y)
 {
     wxString msg;
     m_xmlfile.Write(msg);
 }
 
 void rc2xml::WritePosition(int x, int y)
 {
     wxString msg;

-    msg<<" <pos>"<<x<<","<<y<<"d</pos>";
+    msg << _T(" <pos>") << x << _T(",") << y << _T("d</pos>");

     m_xmlfile.Write(msg);
 }
 
 void rc2xml::WriteTitle(wxString title)
 {
     wxString msg;
     m_xmlfile.Write(msg);
 }
 
 void rc2xml::WriteTitle(wxString title)
 {
     wxString msg;

-    msg=_T("\t\t<title>"+title+"</title>\n");
+    msg=_T("\t\t<title>")+title+_T("</title>\n");

     m_xmlfile.Write(msg);
 }
 
 void rc2xml::WriteName(wxString name)
 {
     m_xmlfile.Write(msg);
 }
 
 void rc2xml::WriteName(wxString name)
 {

-       
+

 //Try to convert any number ids into names
 name=LookUpId(name);
 //Try to convert any number ids into names
 name=LookUpId(name);

-//Replace common MS ids with wxWindows ids
+//Replace common MS ids with wxWidgets ids

 //I didn't do everyone of them
 //I didn't do everyone of them

-    if (name=="IDOK")
-        name="wxID_OK";
-    else if (name=="IDCANCEL")
-        name="wxID_CANCEL";
-    else if (name=="IDAPPLY")
-        name="wxID_APPLY";
-    else if (name=="ID_FILE_OPEN")
-        name="wxID_OPEN";
-    else if (name=="ID_FILE_CLOSE")
-        name="wxID_CLOSE";
-    else if (name=="ID_FILE_SAVE")
-        name="wxID_SAVE";
-    else if (name=="ID_FILE_SAVE_AS")
-        name="wxID_SAVEAS";
-    else if (name=="ID_APP_EXIT")
-        name="wxID_EXIT";
-    else if (name=="ID_FILE_PRINT")
-        name="wxID_PRINT";
-    else if (name=="ID_FILE_PRINT_PREVIEW")
-        name="wxID_PREVIEW";
-    else if (name=="ID_FILE_PRINT_SETUP")
-        name="wxID_PRINT_SETUP";
-    else if (name=="ID_APP_ABOUT")
-        name="wxID_ABOUT";
-    else if (name=="ID_EDIT_UNDO")
-        name="wxID_UNDO";
-    else if (name=="ID_EDIT_CUT")
-        name="wxID_CUT";
-    else if (name=="ID_EDIT_COPY")
-        name="wxID_COPY";
-    else if (name=="ID_EDIT_PASTE")
-        name="wxID_PASTE";
-
-    m_xmlfile.Write(" name= \""+name+"\"");
+    if (name==_T("IDOK"))
+        name=_T("wxID_OK");
+    else if (name==_T("IDCANCEL"))
+        name=_T("wxID_CANCEL");
+    else if (name==_T("IDAPPLY"))
+        name=_T("wxID_APPLY");
+    else if (name==_T("ID_FILE_OPEN"))
+        name=_T("wxID_OPEN");
+    else if (name==_T("ID_FILE_CLOSE"))
+        name=_T("wxID_CLOSE");
+    else if (name==_T("ID_FILE_SAVE"))
+        name=_T("wxID_SAVE");
+    else if (name==_T("ID_FILE_SAVE_AS"))
+        name=_T("wxID_SAVEAS");
+    else if (name==_T("ID_APP_EXIT"))
+        name=_T("wxID_EXIT");
+    else if (name==_T("ID_FILE_PRINT"))
+        name=_T("wxID_PRINT");
+    else if (name==_T("ID_FILE_PRINT_PREVIEW"))
+        name=_T("wxID_PREVIEW");
+    else if (name==_T("ID_FILE_PRINT_SETUP"))
+        name=_T("wxID_PRINT_SETUP");
+    else if (name==_T("ID_APP_ABOUT"))
+        name=_T("wxID_ABOUT");
+    else if (name==_T("ID_EDIT_UNDO"))
+        name=_T("wxID_UNDO");
+    else if (name==_T("ID_EDIT_CUT"))
+        name=_T("wxID_CUT");
+    else if (name==_T("ID_EDIT_COPY"))
+        name=_T("wxID_COPY");
+    else if (name==_T("ID_EDIT_PASTE"))
+        name=_T("wxID_PASTE");
+    else if (name==_T("IDYES"))
+        name=_T("wxID_YES");
+    else if (name==_T("IDNO"))
+        name=_T("wxID_NO");
+    else if (name==_T("IDHELP"))
+        name=_T("wxID_HELP");
+
+    m_xmlfile.Write(_T(" name= \"")+name+_T("\""));

 }
 
 void rc2xml::WriteLabel(wxString label)
 {
 }
 
 void rc2xml::WriteLabel(wxString label)
 {

-    label.Replace("&","$");
-    m_xmlfile.Write("\t\t\t<label>"+label+"</label>\n");
+    label.Replace(_T("&"),_T("$"));
+    // changes by MS, handle '<' '>' characters within a label.
+    label.Replace(_T("<"),_T("&lt;"));
+    label.Replace(_T(">"),_T("&gt;"));
+    m_xmlfile.Write(_T("\t\t\t<label>")+label+_T("</label>\n"));

 }
 
 void rc2xml::WriteBasicInfo(int x, int y, int width, int height, wxString name)
 {
     WriteName(name);
 }
 
 void rc2xml::WriteBasicInfo(int x, int y, int width, int height, wxString name)
 {
     WriteName(name);

-    m_xmlfile.Write(">\n");
-    m_xmlfile.Write("\t\t\t");
+    m_xmlfile.Write(_T(">\n"));
+    m_xmlfile.Write(_T("\t\t\t"));

     WritePosition(x,y);
     WriteSize(width,height);
     WritePosition(x,y);
     WriteSize(width,height);

-    m_xmlfile.Write("\n");
+    m_xmlfile.Write(_T("\n"));

 }
 
 void rc2xml::WriteStyle(wxString style)
 {
     if (style.Length()==0)
         return;
 }
 
 void rc2xml::WriteStyle(wxString style)
 {
     if (style.Length()==0)
         return;

-    m_xmlfile.Write("\n\t\t<style>"+style+"</style>\n");
+    m_xmlfile.Write(_T("\t\t\t<style>")+style+_T("</style>\n"));

 }
 /*
 }
 /*

-    LISTBOX         IDC_LIST1,16,89,48,40,LBS_SORT | LBS_MULTIPLESEL | 
+    LISTBOX         IDC_LIST1,16,89,48,40,LBS_SORT | LBS_MULTIPLESEL |

                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
 */
                     LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
 */

-void rc2xml::ParseListBox()
+void rc2xml::ParseListBox(wxString varname)

 {
     wxString token;
 {
     wxString token;

-    wxString varname;
-    varname=GetToken();
+    token=PeekToken();
+    while (!token.IsNumber())
+        {
+        token=GetToken();
+        token=PeekToken();
+        }

     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 

-    m_xmlfile.Write("\t\t<listbox");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxListBox\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBasicInfo(x,y,width,height,varname);

-    m_xmlfile.Write("\n\t\t</listbox>\n");
+    m_xmlfile.Write(_T("\n\t\t</object>\n"));

 
 }
 /*
 
 }
 /*

-    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER | 
+    CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER |

                     WS_TABSTOP,103,110,40,14
 */
 void rc2xml::ParseRichEdit(wxString label, wxString varname)
                     WS_TABSTOP,103,110,40,14
 */
 void rc2xml::ParseRichEdit(wxString label, wxString varname)


@@ -672,34 +851,34 @@ void rc2xml::ParseRichEdit(wxString label, wxString varname)
     ReadRect(x,y,width,height);
     wxString style;
 //Make it a rich text control
     ReadRect(x,y,width,height);
     wxString style;
 //Make it a rich text control

-    style+="wxTE_MULTILINE ";
-    m_xmlfile.Write("\t\t<textctrl");
+    style+=_T("wxTE_MULTILINE ");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxTextCtrl\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);
     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);

-    m_xmlfile.Write("\t\t</textctrl>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 /*
 CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,209,72,
                  19,26
 */
 
 }
 /*
 CONTROL         "Spin1",IDC_SPIN1,"msctls_updown32",UDS_ARROWKEYS,209,72,
                  19,26
 */

-void rc2xml::ParseSpinCtrl(wxString label, wxString varname)
+void rc2xml::ParseSpinCtrl(wxString WXUNUSED(label), wxString varname)

 {
     wxString token,style;
 {
     wxString token,style;

-    
+

     ReadOrs(token);
     ReadOrs(token);

-    if (token.Find("UDS_HORZ")!=-1)
-        style="wxSP_HORIZONTAL";
+    if (token.Find(_T("UDS_HORZ"))!=wxNOT_FOUND)
+        style=_T("wxSP_HORIZONTAL");

     //MFC default
     else
     //MFC default
     else

-        style="wxSP_VERTICAL";
+        style=_T("wxSP_VERTICAL");

 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);

-    m_xmlfile.Write("\t\t<spinbutton");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxSpinButton\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);
     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);

-    m_xmlfile.Write("\n\t\t</spinbutton>\n");
+    m_xmlfile.Write(_T("\n\t\t</object>\n"));

 
 }
 
 
 }
 


@@ -709,13 +888,13 @@ void rc2xml::FirstPass()
     while (!m_done)
         {
         token=GetToken();
     while (!m_done)
         {
         token=GetToken();

-        if (token=="BITMAP")
+        if (token==_T("BITMAP"))

             ParseBitmap(prevtok);
             ParseBitmap(prevtok);

-        else if (token=="STRINGTABLE")
+        else if (token==_T("STRINGTABLE"))

             ParseStringTable(prevtok);
             ParseStringTable(prevtok);

-        else if (token=="ICON")
+        else if (token==_T("ICON"))

             ParseIcon(prevtok);
             ParseIcon(prevtok);

-        
+

         prevtok=token;
         }
 }
         prevtok=token;
         }
 }


@@ -723,10 +902,10 @@ void rc2xml::FirstPass()
 void rc2xml::ParseBitmap(wxString varname)
 {
     wxString token,*bitmapfile;
 void rc2xml::ParseBitmap(wxString varname)
 {
     wxString token,*bitmapfile;

-    
+

     token=PeekToken();
     //Microsoft notation?
     token=PeekToken();
     //Microsoft notation?

-    if (token=="DISCARDABLE")
+    if (token==_T("DISCARDABLE"))

         {
         token=GetToken();
         token=PeekToken();
         {
         token=GetToken();
         token=PeekToken();


@@ -744,13 +923,13 @@ void rc2xml::SecondPass()
     while (!m_done)
         {
         token=GetToken();
     while (!m_done)
         {
         token=GetToken();

-        if (token=="DIALOG")
+        if ((token==_T("DIALOG"))||(token==_T("DIALOGEX")))

             ParseDialog(prevtok);
             ParseDialog(prevtok);

-        else if (token=="MENU")
+        else if (token==_T("MENU"))

             ParseMenu(prevtok);
             ParseMenu(prevtok);

-        else if (token=="TOOLBAR")
+        else if (token==_T("TOOLBAR"))

             ParseToolBar(prevtok);
             ParseToolBar(prevtok);

-        
+

         prevtok=token;
         }
 
         prevtok=token;
         }
 


@@ -758,71 +937,69 @@ void rc2xml::SecondPass()
 
 void rc2xml::ParseToolBar(wxString varname)
 {
 
 void rc2xml::ParseToolBar(wxString varname)
 {

-    wxString token;    
+    wxString token;

     token=GetToken();
     token=GetToken();

-    wxASSERT_MSG(token=="DISCARDABLE","Error in toolbar parsing");
+    wxASSERT_MSG(token==_T("DISCARDABLE"),_T("Error in toolbar parsing"));

 //Look up bitmap for toolbar and load
     wxNode *node=m_bitmaplist->Find(LookUpId(varname));
     wxString *bitmappath;
 //Look up bitmap for toolbar and load
     wxNode *node=m_bitmaplist->Find(LookUpId(varname));
     wxString *bitmappath;

-    bitmappath=(wxString *)node->Data();
+    bitmappath=(wxString *)node->GetData();

     wxBitmap bitmap;
     if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
     wxBitmap bitmap;
     if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))

-        wxLogError("Unable to load bitmap:"+*bitmappath);
+        wxLogError(_T("Unable to load bitmap:")+*bitmappath);

 
 //Write toolbar to xml file
 
 //Write toolbar to xml file

-    m_xmlfile.Write("  <toolbar");
+    m_xmlfile.Write(_T("\t<object class=\"wxToolBar\""));

 //Avoid duplicate names this way
 //Avoid duplicate names this way

-    varname.Replace("IDR_","TB_");
+    varname.Replace(_T("IDR_"),_T("TB_"));

     WriteName(varname);
     WriteName(varname);

-    m_xmlfile.Write(">\n");
+    m_xmlfile.Write(_T(">\n"));

     wxString style;
     wxString style;

-    style+="wxTB_FLAT";
+    style+=_T("wxTB_FLAT");

     WriteStyle(style);
 
     WriteStyle(style);
 

-    m_xmlfile.Write("\t\t<children>\n");

 
 //Grab width and height
     int width,height;
 
 //Grab width and height
     int width,height;

-    width=atoi(GetToken());
-    height=atoi(GetToken());
+    width=wxAtoi(GetToken());
+    height=wxAtoi(GetToken());

 
 

-    int c=0;   
+    int c=0;

     wxString buttonname,msg,tip,longhelp;
     token=GetToken();
     wxString buttonname,msg,tip,longhelp;
     token=GetToken();

-    while ((token!="BEGIN"))
+    while ((token!=_T("BEGIN"))&(token!=_T("{")))

         token=GetToken();
 
         token=GetToken();
 

-    while ((token!="END")&(token!="}"))
+    while ((token!=_T("END"))&(token!=_T("}")))

         {
         {

-        if (token=="BUTTON")
+        if (token==_T("BUTTON"))

             {
             buttonname=GetToken();
             {
             buttonname=GetToken();

-            m_xmlfile.Write("\t\t\t<tool");
+            m_xmlfile.Write(_T("\t\t\t<object class=\"tool\""));

             WriteName(buttonname);
             WriteName(buttonname);

-            m_xmlfile.Write(">\n");
+            m_xmlfile.Write(_T(">\n"));

     //Write tool tip if any
             if (LookUpString(buttonname,msg))
                 {
                 SplitHelp(msg,tip,longhelp);
     //Write tool tip if any
             if (LookUpString(buttonname,msg))
                 {
                 SplitHelp(msg,tip,longhelp);

-                m_xmlfile.Write("\t\t\t\t<tooltip>"+tip+"</tooltip>\n");
-                m_xmlfile.Write("              <longhelp>"+longhelp+"</longhelp>\n");
+                m_xmlfile.Write(_T("\t\t\t\t<tooltip>")+tip+_T("</tooltip>\n"));
+                m_xmlfile.Write(_T("\t\t<longhelp>")+longhelp+_T("</longhelp>\n"));

                 }
             //Make a bitmap file name
             buttonname=CleanName(buttonname);
                 }
             //Make a bitmap file name
             buttonname=CleanName(buttonname);

-            buttonname+=".bmp";
-            m_xmlfile.Write("\t\t\t\t<bitmap>"+buttonname+"</bitmap>\n");
+            buttonname+=_T(".bmp");
+            m_xmlfile.Write(_T("\t\t\t\t<bitmap>")+buttonname+_T("</bitmap>\n"));

         WriteToolButton(buttonname,c,width,height,bitmap);
         WriteToolButton(buttonname,c,width,height,bitmap);

-        m_xmlfile.Write("\t\t\t</tool>\n");
+        m_xmlfile.Write(_T("\t\t\t</object>\n"));

         c++;
         }
         c++;
         }

-    else if (token=="SEPARATOR")
+    else if (token==_T("SEPARATOR"))

     {
     {

-    m_xmlfile.Write("\t\t\t<separator/>\n");
+    m_xmlfile.Write(_T("\t\t\t<object class=\"separator\"/>\n"));

     }
     token=GetToken();
     }
     }
     token=GetToken();
     }

-    m_xmlfile.Write("\t</children>\n");
-    m_xmlfile.Write("\t</toolbar>\n");
+    m_xmlfile.Write(_T("\t</object>\n"));

 }
 
 //Extract bitmaps from larger toolbar bitmap
 }
 
 //Extract bitmaps from larger toolbar bitmap


@@ -833,22 +1010,22 @@ void rc2xml::WriteToolButton(wxString name,int index, int width, int height, wxB
     wxRect r(x,0,width,height);
     wxBitmap little;
     little=bitmap.GetSubBitmap(r);
     wxRect r(x,0,width,height);
     wxBitmap little;
     little=bitmap.GetSubBitmap(r);

-    little.SaveFile(name,wxBITMAP_TYPE_BMP);
+    little.SaveFile(m_targetpath+name,wxBITMAP_TYPE_BMP);

 }
 
 void rc2xml::ParseStringTable(wxString varname)
 {
     wxString token;
     token=GetToken();
 }
 
 void rc2xml::ParseStringTable(wxString varname)
 {
     wxString token;
     token=GetToken();

-    while ((token!="BEGIN"))
+    while ((token!=_T("BEGIN"))&(token!=_T("{")))

         token=GetToken();
     token=GetToken();
     wxString *msg;
 
         token=GetToken();
     token=GetToken();
     wxString *msg;
 

-    while ((token!="END")&(token!="}"))
+    while ((token!=_T("END"))&(token!=_T("}")))

         {
         msg=new wxString;
         {
         msg=new wxString;

-        *msg=GetQuoteField();
+        *msg=GetStringQuote();

         m_stringtable->Append(token,msg);
         token=GetToken();
         }
         m_stringtable->Append(token,msg);
         token=GetToken();
         }


@@ -860,19 +1037,19 @@ bool rc2xml::LookUpString(wxString strid,wxString & st)
     wxNode *node=m_stringtable->Find(strid);
     wxString *s;
     if (node==NULL)
     wxNode *node=m_stringtable->Find(strid);
     wxString *s;
     if (node==NULL)

-        return FALSE;
+        return false;

 
 

-    s=(wxString *)node->Data();
+    s=(wxString *)node->GetData();

     st=*s;
 
     st=*s;
 

-    return TRUE;
+    return true;

 }
 
 bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
 {
     int spot;
 }
 
 bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
 {
     int spot;

-    spot=msg.Find("\\n");
-    if (spot==-1)
+    spot=msg.Find(_T("\\n"));
+    if (spot==wxNOT_FOUND)

         {
         shorthelp=msg;
         longhelp=msg;
         {
         shorthelp=msg;
         longhelp=msg;


@@ -881,16 +1058,16 @@ bool rc2xml::SplitHelp(wxString msg, wxString &shorthelp, wxString &longhelp)
     longhelp=msg.Left(spot);
     spot=msg.Length()-spot-2;
     shorthelp=msg.Right(spot);
     longhelp=msg.Left(spot);
     spot=msg.Length()-spot-2;
     shorthelp=msg.Right(spot);

-    return TRUE;
+    return true;

 }
 
 void rc2xml::ParseMenuItem()
 {
     wxString token,name,msg,tip,longhelp;
 //int spot;
 }
 
 void rc2xml::ParseMenuItem()
 {
     wxString token,name,msg,tip,longhelp;
 //int spot;

-    if (PeekToken()=="SEPARATOR")
+    if (PeekToken()==_T("SEPARATOR"))

         {
         {

-        m_xmlfile.Write("\t\t\t<separator/>\n");
+        m_xmlfile.Write(_T("\t\t\t<object class=\"separator\"/>\n"));

         return;
         }
 
         return;
         }
 


@@ -899,34 +1076,40 @@ void rc2xml::ParseMenuItem()
 //Remove \t because it causes problems
 //spot=token.First("\\t");
 //token=token.Left(spot);
 //Remove \t because it causes problems
 //spot=token.First("\\t");
 //token=token.Left(spot);

-    m_xmlfile.Write("\t\t\t<menuitem");
+    m_xmlfile.Write(_T("\t\t\t<object class=\"wxMenuItem\""));

     WriteName(name);
     WriteName(name);

-    m_xmlfile.Write(">\n");
+    m_xmlfile.Write(_T(">\n"));

     WriteLabel(token);
 //Look up help if any listed in stringtable
     WriteLabel(token);
 //Look up help if any listed in stringtable

-    if (LookUpString(name,msg))
+//can't assume numbers correlate, restrict to string identifiers
+    if ((!name.IsNumber())&&(LookUpString(name,msg)))

         {
         SplitHelp(msg,tip,longhelp);
         {
         SplitHelp(msg,tip,longhelp);

-        m_xmlfile.Write("\t\t\t<help>"
-            +longhelp+"</help>\n");
+        m_xmlfile.Write(_T("\t\t\t<help>")
+            +longhelp+_T("</help>\n"));

         }
 //look for extra attributes like checked and break
     wxString ptoken;
     ptoken=PeekToken();
         }
 //look for extra attributes like checked and break
     wxString ptoken;
     ptoken=PeekToken();

-    while ((ptoken!="MENUITEM")&(ptoken!="POPUP")&(ptoken!="END"))
+    ptoken.MakeUpper();
+    while ((ptoken!=_T("MENUITEM"))&(ptoken!=_T("POPUP"))&(ptoken!=_T("END")))

         {
         token=GetToken();
         {
         token=GetToken();

-        if (token=="CHECKED")
-            m_xmlfile.Write("\t\t\t<checkable>1</checkable>\n");
-        else if (token=="MENUBREAK");
+        ptoken.MakeUpper();
+        if (token==_T("CHECKED"))
+            m_xmlfile.Write(_T("\t\t\t<checkable>1</checkable>\n"));
+        else if (token==_T("MENUBREAK"))
+            ;

 //m_xmlfile.Write("\t\t\t</break>\n");
 //m_xmlfile.Write("\t\t\t</break>\n");

-        else if (token=="GRAYED");
+        else if (token==_T("GRAYED"))
+            ;

         else
         else

-            wxLogError("Unknown Menu Item token:"+token);
-        
+            wxLogError(_T("Unknown Menu Item token:")+token);
+

         ptoken=PeekToken();
         ptoken=PeekToken();

+        ptoken.MakeUpper();

         }
         }

-    m_xmlfile.Write("\t\t\t</menuitem>\n"); 
+    m_xmlfile.Write(_T("\t\t\t</object>\n"));

 
 }
 
 
 }
 


@@ -935,6 +1118,10 @@ void rc2xml::ParseIconStatic()
 {
     wxString token;
     wxString varname,iconname;
 {
     wxString token;
     wxString varname,iconname;

+    token = PeekToken();
+    if (token.Contains(_T("\"")))
+        iconname = GetQuoteField();
+    else

     iconname=GetToken();
 //Look up icon
     varname=GetToken();
     iconname=GetToken();
 //Look up icon
     varname=GetToken();


@@ -942,11 +1129,11 @@ void rc2xml::ParseIconStatic()
     int x,y,width,height;
     ReadRect(x,y,width,height);
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 

-    m_xmlfile.Write("\t\t<staticbitmap");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticBitmap\""));

     WriteBasicInfo(x,y,width,height,varname);
 //Save icon as a bitmap
     WriteIcon(iconname);
     WriteBasicInfo(x,y,width,height,varname);
 //Save icon as a bitmap
     WriteIcon(iconname);

-    m_xmlfile.Write("\t\t</staticbitmap>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 //IDR_MAINFRAME           ICON    DISCARDABLE     "res\\mfcexample.ico"
 
 }
 //IDR_MAINFRAME           ICON    DISCARDABLE     "res\\mfcexample.ico"


@@ -958,17 +1145,21 @@ void rc2xml::ParseIcon(wxString varname)
 
     *iconfile=GetQuoteField();
     m_iconlist->Append(varname,iconfile);
 
     *iconfile=GetQuoteField();
     m_iconlist->Append(varname,iconfile);

-    
+

 
 }
 
 wxString rc2xml::CleanName(wxString name)
 {
     name.MakeLower();
 
 }
 
 wxString rc2xml::CleanName(wxString name)
 {
     name.MakeLower();

-    name.Replace("id_","");
-    name.Replace("idr_","");
-    name.Replace("idb_","");
-    name.Replace("idc_","");
+    name.Replace(_T("id_"),wxEmptyString);
+    name.Replace(_T("idr_"),wxEmptyString);
+    name.Replace(_T("idb_"),wxEmptyString);
+    name.Replace(_T("idc_"),wxEmptyString);
+
+    name.Replace(_T(".ico"),wxEmptyString);
+
+    name.Replace(_T(".bmp"),wxEmptyString);

     return name;
 }
 // And the award for most messed up control goes to...
     return name;
 }
 // And the award for most messed up control goes to...


@@ -977,17 +1168,16 @@ void rc2xml::ParseStaticBitmap(wxString bitmapname, wxString varname)
 {
     wxString token;
     //Grab SS_BITMAP
 {
     wxString token;
     //Grab SS_BITMAP

-    token=GetToken();
-
+    ReadOrs(token);

 
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 
 
 
     int x,y,width,height;
     ReadRect(x,y,width,height);
 

-    m_xmlfile.Write("\t\t<staticbitmap");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxStaticBitmap\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBitmap(bitmapname);
     WriteBasicInfo(x,y,width,height,varname);
     WriteBitmap(bitmapname);

-    m_xmlfile.Write("\t\t</staticbitmap>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 
 
 }
 


@@ -1000,22 +1190,39 @@ varname=GetToken();
 kindctrl=GetQuoteField();
 kindctrl.MakeUpper();
 
 kindctrl=GetQuoteField();
 kindctrl.MakeUpper();
 

-    if (kindctrl=="MSCTLS_UPDOWN32")
+    if (kindctrl==_T("MSCTLS_UPDOWN32"))

         ParseSpinCtrl(label,varname);
         ParseSpinCtrl(label,varname);

-    if (kindctrl=="MSCTLS_TRACKBAR32")
+    if (kindctrl==_T("MSCTLS_TRACKBAR32"))

         ParseSlider(label,varname);
         ParseSlider(label,varname);

-    if (kindctrl=="MSCTLS_PROGRESS32")
+    if (kindctrl==_T("MSCTLS_PROGRESS32"))

         ParseProgressBar(label,varname);
         ParseProgressBar(label,varname);

-    if (kindctrl=="SYSTREEVIEW32")
+    if (kindctrl==_T("SYSTREEVIEW32"))

         ParseTreeCtrl(label,varname);
         ParseTreeCtrl(label,varname);

-    if (kindctrl=="SYSMONTHCAL32")
+    if (kindctrl==_T("SYSMONTHCAL32"))

         ParseCalendar(label,varname);
         ParseCalendar(label,varname);

-    if (kindctrl=="SYSLISTVIEW32")
+    if (kindctrl==_T("SYSLISTVIEW32"))

         ParseListCtrl(label,varname);
         ParseListCtrl(label,varname);

-    if (kindctrl=="BUTTON")
+    if (kindctrl==_T("BUTTON"))

         ParseCtrlButton(label,varname);
         ParseCtrlButton(label,varname);

-    if (kindctrl=="RICHEDIT")
+    if (kindctrl==_T("RICHEDIT"))

         ParseRichEdit(label,varname);
         ParseRichEdit(label,varname);

+    if (kindctrl==_T("STATIC"))
+        {
+        wxString token;
+        int p=m_rc.Tell();
+        ReadOrs(token);
+        m_rc.Seek(p);
+        if (token.Find(_T("SS_BITMAP"))!=wxNOT_FOUND)
+            ParseStaticBitmap(label,varname);
+        else
+            ParseStaticText(label,varname);
+        }
+    if (kindctrl==_T("EDIT"))
+        ParseTextCtrl(varname);
+    if (kindctrl==_T("LISTBOX"))
+        ParseListBox(varname);
+    if (kindctrl==_T("COMBOBOX"))
+        ParseComboBox(varname);

 
 }
 
 
 }
 


@@ -1029,12 +1236,12 @@ void rc2xml::ParseWeirdMSControl()
     kindctrl=GetQuoteField();
     kindctrl.MakeUpper();
 //    CONTROL         IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30
     kindctrl=GetQuoteField();
     kindctrl.MakeUpper();
 //    CONTROL         IDB_FACE,IDC_STATIC,"Static",SS_BITMAP,26,62,32,30

-    if (kindctrl=="STATIC")
+    if (kindctrl==_T("STATIC"))

         {
         {

-        if (PeekToken()=="SS_BITMAP")
+        if (PeekToken()==_T("SS_BITMAP"))

             ParseStaticBitmap(id,varname);
         else
             ParseStaticBitmap(id,varname);
         else

-            wxLogError("Unknown MS Control Static token");
+            wxLogError(_T("Unknown MS Control Static token"));

         }
 
 }
         }
 
 }


@@ -1051,61 +1258,61 @@ void rc2xml::ParseScrollBar()
     wxString style;
 
     ReadOrs(token);
     wxString style;
 
     ReadOrs(token);

-    
-if (token.Find("SBS_VERT")!=-1)
+
+if (token.Find(_T("SBS_VERT"))!=wxNOT_FOUND)

     style=_T("wxSB_VERTICAL");
 //Default MFC style is horizontal
     else
         style=_T("wxSB_HORIZONTAL");
 
     style=_T("wxSB_VERTICAL");
 //Default MFC style is horizontal
     else
         style=_T("wxSB_HORIZONTAL");
 

-    m_xmlfile.Write("\t\t<scrollbar");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxScrollBar\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);
     WriteBasicInfo(x,y,width,height,varname);
     WriteStyle(style);

-    m_xmlfile.Write("\n\t\t</scrollbar>\n");
+    m_xmlfile.Write(_T("\n\t\t</object>\n"));

 
 }
 //    CONTROL         "Tree1",IDC_TREE1,"SysTreeView32",WS_BORDER | WS_TABSTOP,
 //                      7,7,66,61
 
 
 }
 //    CONTROL         "Tree1",IDC_TREE1,"SysTreeView32",WS_BORDER | WS_TABSTOP,
 //                      7,7,66,61
 

-void rc2xml::ParseTreeCtrl(wxString label, wxString varname)
+void rc2xml::ParseTreeCtrl(wxString WXUNUSED(label), wxString varname)

 {
     wxString token;
 //while (ReadOrs(token));
     ReadOrs(token);
     int x,y,width,height;
     ReadRect(x,y,width,height);
 {
     wxString token;
 //while (ReadOrs(token));
     ReadOrs(token);
     int x,y,width,height;
     ReadRect(x,y,width,height);

-    m_xmlfile.Write("\t\t<treectrl");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxTreeCtrl\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBasicInfo(x,y,width,height,varname);

-    m_xmlfile.Write("\t\t</treectrl>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 //    CONTROL         "MonthCalendar1",IDC_MONTHCALENDAR1,"SysMonthCal32",
                     //MCS_NOTODAY | WS_TABSTOP,105,71,129,89
 
 
 }
 //    CONTROL         "MonthCalendar1",IDC_MONTHCALENDAR1,"SysMonthCal32",
                     //MCS_NOTODAY | WS_TABSTOP,105,71,129,89
 

-void rc2xml::ParseCalendar(wxString label, wxString varname)
+void rc2xml::ParseCalendar(wxString WXUNUSED(label), wxString varname)

 {
     wxString token;
 //while (ReadOrs(token));
     ReadOrs(token);
     int x,y,width,height;
     ReadRect(x,y,width,height);
 {
     wxString token;
 //while (ReadOrs(token));
     ReadOrs(token);
     int x,y,width,height;
     ReadRect(x,y,width,height);

-    m_xmlfile.Write("\t\t<calendarctrl");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxCalendarCtrl\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBasicInfo(x,y,width,height,varname);

-    m_xmlfile.Write("\t\t</calendarctrl>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 }
 //    CONTROL         "List1",IDC_LIST1,"SysListView32",WS_BORDER | WS_TABSTOP,
   //                  7,89,68,71
 
 }
 //    CONTROL         "List1",IDC_LIST1,"SysListView32",WS_BORDER | WS_TABSTOP,
   //                  7,89,68,71
 

-void rc2xml::ParseListCtrl(wxString label, wxString varname)
+void rc2xml::ParseListCtrl(wxString WXUNUSED(label), wxString varname)

 {
     wxString token;
     //while (ReadOrs(token));
     ReadOrs(token);
     int x,y,width,height;
     ReadRect(x,y,width,height);
 {
     wxString token;
     //while (ReadOrs(token));
     ReadOrs(token);
     int x,y,width,height;
     ReadRect(x,y,width,height);

-    m_xmlfile.Write("\t\t<listctrl");
+    m_xmlfile.Write(_T("\t\t<object class=\"wxListCtrl\""));

     WriteBasicInfo(x,y,width,height,varname);
     WriteBasicInfo(x,y,width,height,varname);

-    m_xmlfile.Write("\t\t</listctrl>\n");
+    m_xmlfile.Write(_T("\t\t</object>\n"));

 
 }
 
 
 }
 


@@ -1115,22 +1322,24 @@ void rc2xml::WriteBitmap(wxString bitmapname)
     wxNode *node=m_bitmaplist->Find(LookUpId(bitmapname));
     if (node==NULL)
         {
     wxNode *node=m_bitmaplist->Find(LookUpId(bitmapname));
     if (node==NULL)
         {

-        m_xmlfile.Write("\t\t\t<bitmap>missingfile</bitmap>\n");
-        wxLogError("Unable to find bitmap:"+bitmapname);
+        m_xmlfile.Write(_T("\t\t\t<bitmap>missingfile</bitmap>\n"));
+        wxLogError(_T("Unable to find bitmap:")+bitmapname);

         return;
         }
         return;
         }

-    
+

     wxString *bitmappath;
     wxString *bitmappath;

-    bitmappath=(wxString *)node->Data();
+    bitmappath=(wxString *)node->GetData();
+
+    bitmapname=wxFileNameFromPath(*bitmappath);

     wxBitmap bitmap;
     if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))
     wxBitmap bitmap;
     if (!bitmap.LoadFile(*bitmappath,wxBITMAP_TYPE_BMP ))

-        wxLogError("Unable to load bitmap:"+*bitmappath);
+        wxLogError(_T("Unable to load bitmap:")+*bitmappath);

 
     //Make a bitmap file name
     bitmapname=CleanName(bitmapname);
 
     //Make a bitmap file name
     bitmapname=CleanName(bitmapname);

-    bitmapname+=".bmp";
-    m_xmlfile.Write("\t\t\t<bitmap>"+bitmapname+"</bitmap>\n");
-    bitmap.SaveFile(bitmapname,wxBITMAP_TYPE_BMP);
+    bitmapname+=_T(".bmp");
+    m_xmlfile.Write(_T("\t\t\t<bitmap>")+bitmapname+_T("</bitmap>\n"));
+    bitmap.SaveFile(m_targetpath+bitmapname,wxBITMAP_TYPE_BMP);

 }
 
 void rc2xml::WriteIcon(wxString iconname)
 }
 
 void rc2xml::WriteIcon(wxString iconname)


@@ -1138,28 +1347,28 @@ void rc2xml::WriteIcon(wxString iconname)
 wxNode *node=m_iconlist->Find(iconname);
     if (node==NULL)
         {
 wxNode *node=m_iconlist->Find(iconname);
     if (node==NULL)
         {

-        m_xmlfile.Write("\t\t\t<bitmap>missing_file</bitmap>\n");
-        wxLogError("Unable to find icon:"+iconname);
+        m_xmlfile.Write(_T("\t\t\t<bitmap>missing_file</bitmap>\n"));
+        wxLogError(_T("Unable to find icon:")+iconname);

         }
     wxString *iconpath;
         }
     wxString *iconpath;

-    iconpath=(wxString *)node->Data();
+    iconpath=(wxString *)node->GetData();

     wxIcon icon;
     wxBitmap bitmap;
     if (!icon.LoadFile(*iconpath,wxBITMAP_TYPE_ICO ))
     wxIcon icon;
     wxBitmap bitmap;
     if (!icon.LoadFile(*iconpath,wxBITMAP_TYPE_ICO ))

-        wxLogError("Unable to load icon:"+*iconpath);
+        wxLogError(_T("Unable to load icon:")+*iconpath);

 #ifdef __WXMSW__
     bitmap.CopyFromIcon(icon);
 #else
     bitmap = icon;
 #endif
 #ifdef __WXMSW__
     bitmap.CopyFromIcon(icon);
 #else
     bitmap = icon;
 #endif

-
+    iconname=wxFileNameFromPath(*iconpath);

     //Make a bitmap file name
     iconname=CleanName(iconname);
     //Make a bitmap file name
     iconname=CleanName(iconname);

-    iconname+=".bmp";
-    m_xmlfile.Write("\t\t\t<bitmap>"+iconname+"</bitmap>\n");
-    bitmap.SaveFile(iconname,wxBITMAP_TYPE_BMP);
+    iconname+=_T(".bmp");
+    m_xmlfile.Write(_T("\t\t\t<bitmap>")+iconname+_T("</bitmap>\n"));
+    bitmap.SaveFile(m_targetpath+iconname,wxBITMAP_TYPE_BMP);
+

 
 

-    

 }
 /*Unfortunately sometimes the great MSVC Resource editor decides
 to use numbers instead of the word id.  I have no idea why they
 }
 /*Unfortunately sometimes the great MSVC Resource editor decides
 to use numbers instead of the word id.  I have no idea why they


@@ -1172,24 +1381,24 @@ void rc2xml::ParseResourceHeader()
 {
 wxTextFile r;
 //Attempt to load resource.h in current path
 {
 wxTextFile r;
 //Attempt to load resource.h in current path

-    if (!r.Open("resource.h"))
+    if (!r.Open(_T("resource.h")))

         {
         {

-        wxLogError("Warining Unable to load resource.h file");
+        wxLogError(_T("Warining Unable to load resource.h file"));

         return;
         }
         return;
         }

-    
+

     wxString str;
     wxString id,v;
     wxStringTokenizer tok;
     wxString *varname;
     wxString str;
     wxString id,v;
     wxStringTokenizer tok;
     wxString *varname;

-    
-    
+
+

     long n;
 
 //Read through entire file
     for ( str = r.GetFirstLine(); !r.Eof(); str = r.GetNextLine() )
     {
     long n;
 
 //Read through entire file
     for ( str = r.GetFirstLine(); !r.Eof(); str = r.GetNextLine() )
     {

-    if (str.Find("#define")!=-1)
+    if (str.Find(_T("#define"))!=wxNOT_FOUND)

         {
         tok.SetString(str);
         //Just ignore #define token
         {
         tok.SetString(str);
         //Just ignore #define token


@@ -1206,8 +1415,8 @@ wxTextFile r;
         }
     }
 
         }
     }
 

-  
-    
+
+

 }
 
 
 }
 
 


@@ -1224,7 +1433,7 @@ wxNode *node=m_resourcelist->Find(n);
     if (node==NULL)
         return id;
 
     if (node==NULL)
         return id;
 

-    s=(wxString *)node->Data();
+    s=(wxString *)node->GetData();

     st=*s;
 return st;
 }
     st=*s;
 return st;
 }