Deprecated and obsolete parts marked up for backward compatibility.

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

diff --git a/contrib/utils/convertrc/wxr2xml.cpp b/contrib/utils/convertrc/wxr2xml.cpp
index 6aa5ad54f70e106656441ccfcbc6cbd23de7ec71..cbef29444b532645a1c4923c7d7ae5a1d5680ee2 100644 (file)
--- a/contrib/utils/convertrc/wxr2xml.cpp
+++ b/contrib/utils/convertrc/wxr2xml.cpp
@@ -1,7 +1,7 @@
 // wxr2xml.cpp: implementation of the wxr2xml class.
 // 8/30/00  Brian Gavin
 // only tested on wxMSW so far
 // wxr2xml.cpp: implementation of the wxr2xml class.
 // 8/30/00  Brian Gavin
 // only tested on wxMSW so far

-//License: wxWindows Liscense
+// License: wxWindows Liscense

 // ////////////////////////////////////////////////////////////////////
 
 /*
 // ////////////////////////////////////////////////////////////////////
 
 /*


@@ -11,9 +11,6 @@ How to use class:
 wxr2xml trans;
 trans->Convert("Myfile.wxr","Myfile.xml");
 */
 wxr2xml trans;
 trans->Convert("Myfile.wxr","Myfile.xml");
 */

-#ifdef __GNUG__
-#pragma implementation "wxr2xml.h"
-#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"


@@ -34,31 +31,29 @@ trans->Convert("Myfile.wxr","Myfile.xml");
 
 wxr2xml::wxr2xml()
 {
 
 wxr2xml::wxr2xml()
 {

-

 }
 
 wxr2xml::~wxr2xml()
 {
 }
 
 wxr2xml::~wxr2xml()
 {

-

 }
 
 bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
 {
     bool result;
 }
 
 bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
 {
     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;

 
     result = m_table.ParseResourceFile(wxrfile);
 
     result = m_table.ParseResourceFile(wxrfile);

-    wxASSERT_MSG(result, "Couldn't Load WXR file");
+    wxASSERT_MSG(result, _T("Couldn't Load WXR file"));

     if (!result)
     if (!result)

-        return FALSE;
+        return false;

     // Write basic xml header
     // Write basic xml header

-    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"));

     result = ParseResources();
     result = ParseResources();

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

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


@@ -68,95 +63,93 @@ bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
 bool wxr2xml::ParseResources()
 {
     m_table.BeginFind();
 bool wxr2xml::ParseResources()
 {
     m_table.BeginFind();

-    wxNode *node;
+    wxHashTable::Node *node;

 
 

-    while ((node = m_table.Next())) 
+    node = m_table.Next();
+    while (node)

         {
         {

-        wxItemResource *res = (wxItemResource *) node->Data();
+        wxItemResource *res = (wxItemResource *) node->GetData();

         wxString resType(res->GetType());
         wxString resType(res->GetType());

-        if (resType == "wxDialog")
+        if (resType == _T("wxDialog"))

             ParseDialog(res);
             ParseDialog(res);

-        else if (resType == "wxPanel")
+        else if (resType == _T("wxPanel"))

             ParsePanel(res);
             ParsePanel(res);

-        else if (resType == "wxPanel")
+        else if (resType == _T("wxPanel"))

             ParsePanel(res);
             ParsePanel(res);

-        else if (resType == "wxMenu")
+        else if (resType == _T("wxMenu"))

             ParseMenuBar(res);
             ParseMenuBar(res);

-        else if (resType == "wxBitmap")
+        else if (resType == _T("wxBitmap"))

             ParseBitmap(res);
         else
             ParseBitmap(res);
         else

-            wxLogError("Found unsupported resource " + resType);
+            wxLogError(_T("Found unsupported resource ") + resType);
+        node = m_table.Next();

     }
     }

-    return TRUE;
+    return true;

 }
 
 void wxr2xml::ParsePanel(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParsePanel(wxItemResource * res)
 {

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

     PanelStuff(res);
     WriteControlInfo(res);
     PanelStuff(res);
     WriteControlInfo(res);

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

     ParseControls(res);
     ParseControls(res);

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

 }
 
 void wxr2xml::ParseDialog(wxItemResource * res)
 {
     PanelStuff(res);
 }
 
 void wxr2xml::ParseDialog(wxItemResource * res)
 {
     PanelStuff(res);

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetTitle(res));
 
     WriteControlInfo(res);
     m_xmlfile.Write(GetTitle(res));
 

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

     ParseControls(res);
     ParseControls(res);

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

 }
 
 void wxr2xml::ParseControls(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseControls(wxItemResource * res)
 {

-    wxNode *node = res->GetChildren().First();
-    while (node) 
+    wxNode *node = res->GetChildren().GetFirst();
+    while (node)

         {
         {

-        wxItemResource *res = (wxItemResource *) node->Data();
+        wxItemResource *res = (wxItemResource *) node->GetData();

         wxString resType(res->GetType());
         wxString resType(res->GetType());

-        if (resType == "wxButton")
+        if (resType == _T("wxButton"))

             ParseButton(res);
             ParseButton(res);

-        else if ((resType == "wxTextCtrl") | (resType == "wxText")
-         | (resType == "wxMultiText"))
+        else if ((resType == _T("wxTextCtrl")) | (resType == _T("wxText"))
+         | (resType == _T("wxMultiText")))

             ParseTextCtrl(res);
             ParseTextCtrl(res);

-        else if (resType == "wxCheckBox")
+        else if (resType == _T("wxCheckBox"))

             ParseCheckBox(res);
             ParseCheckBox(res);

-        else if (resType == "wxRadioBox")
+        else if (resType == _T("wxRadioBox"))

             ParseRadioBox(res);
             ParseRadioBox(res);

-        else if (resType == "wxListBox")
+        else if (resType == _T("wxListBox"))

             ParseListBox(res);
             ParseListBox(res);

-        else if ((resType == "wxStaticText") | (resType == "wxMessage"))
+        else if ((resType == _T("wxStaticText")) | (resType == _T("wxMessage")))

             ParseStaticText(res);
             ParseStaticText(res);

-        else if (resType == "wxChoice")
+        else if (resType == _T("wxChoice"))

             ParseChoice(res);
             ParseChoice(res);

-        else if (resType == "wxGauge")
+        else if (resType == _T("wxGauge"))

            ParseGauge(res);
            ParseGauge(res);

-        else if (resType == "wxSlider")
+        else if (resType == _T("wxSlider"))

             ParseSlider(res);
             ParseSlider(res);

-        else if (resType == "wxComboBox")
+        else if (resType == _T("wxComboBox"))

             ParseComboBox(res);
             ParseComboBox(res);

-        else if (resType == "wxRadioButton")
+        else if (resType == _T("wxRadioButton"))

             ParseRadioButton(res);
             ParseRadioButton(res);

-        else if (resType == "wxStaticBitmap")
+        else if (resType == _T("wxStaticBitmap"))

             ParseStaticBitmap(res);
             ParseStaticBitmap(res);

-        else if (resType == "wxScrollBar")
+        else if (resType == _T("wxScrollBar"))

             ParseScrollBar(res);
             ParseScrollBar(res);

-        else if ((resType == "wxStaticBox") | (resType == "wxGroupBox"))
+        else if ((resType == _T("wxStaticBox")) | (resType == _T("wxGroupBox")))

             ParseStaticBox(res);
             ParseStaticBox(res);

-        else if (resType == "wxBitmapButton")
+        else if (resType == _T("wxBitmapButton"))

             ParseBitmapButton(res);
         else
             ParseBitmapButton(res);
         else

-            wxLogError("Found unsupported resource " + resType);
-        node = node->Next();
+            wxLogError(_T("Found unsupported resource ") + resType);
+        node = node->GetNext();

         }
 }
 
         }
 }
 


@@ -165,7 +158,7 @@ void wxr2xml::ParseControls(wxItemResource * res)
 void wxr2xml::WriteControlInfo(wxItemResource * res)
 {
     m_xmlfile.Write(GenerateName(res));
 void wxr2xml::WriteControlInfo(wxItemResource * res)
 {
     m_xmlfile.Write(GenerateName(res));

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

     m_xmlfile.Write(GetPosition(res));
     m_xmlfile.Write(GetSize(res));
     m_xmlfile.Write(GetStyles(res));
     m_xmlfile.Write(GetPosition(res));
     m_xmlfile.Write(GetSize(res));
     m_xmlfile.Write(GetStyles(res));


@@ -176,9 +169,9 @@ wxString wxr2xml::GetSize(wxItemResource * res)
 {
     wxString msg;
     if (m_dlgunits)
 {
     wxString msg;
     if (m_dlgunits)

-        msg << "\t\t\t\t<size>" << res->GetWidth() << "," << res->GetHeight() << "d</size>\n";
+        msg << _T("\t\t\t\t<size>") << res->GetWidth() << _T(",") << res->GetHeight() << _T("d</size>\n");

     else
     else

-        msg << "\t\t\t\t<size>" << res->GetWidth() << "," << res->GetHeight() << "</size>\n";
+        msg << _T("\t\t\t\t<size>") << res->GetWidth() << _T(",") << res->GetHeight() << _T("</size>\n");

     return msg;
 }
 
     return msg;
 }
 


@@ -186,196 +179,196 @@ wxString wxr2xml::GetPosition(wxItemResource * res)
 {
     wxString msg;
     if (m_dlgunits)
 {
     wxString msg;
     if (m_dlgunits)

-        msg << "\t\t\t\t<pos>" << res->GetX() << "," << res->GetY() << "d</pos>\n";
+        msg << _T("\t\t\t\t<pos>") << res->GetX() << _T(",") << res->GetY() << _T("d</pos>\n");

     else
     else

-        msg << "\t\t\t\t<pos>" << res->GetX() << "," << res->GetY() << "</pos>\n";
+        msg << _T("\t\t\t\t<pos>") << res->GetX() << _T(",") << res->GetY() << _T("</pos>\n");

     return msg;
 }
 
 void wxr2xml::ParseButton(wxItemResource * res)
 {
     return msg;
 }
 
 void wxr2xml::ParseButton(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));

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

 }
 
 void wxr2xml::ParseTextCtrl(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseTextCtrl(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetValue4(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetValue4(res));

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

 
 }
 
 wxString wxr2xml::GetTitle(wxItemResource * res)
 {
     wxString msg;
 
 }
 
 wxString wxr2xml::GetTitle(wxItemResource * res)
 {
     wxString msg;

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

     return msg;
 }
 
 wxString wxr2xml::GetValue4(wxItemResource * res)
 {
     wxString msg;
     return msg;
 }
 
 wxString wxr2xml::GetValue4(wxItemResource * res)
 {
     wxString msg;

-    msg = _T("\t\t\t\t<value>" + res->GetValue4() + "</value>\n");
+    msg = _T("\t\t\t\t<value>") + res->GetValue4() + _T("</value>\n");

     return msg;
 }
 
 void wxr2xml::ParseCheckBox(wxItemResource * res)
 {
     return msg;
 }
 
 void wxr2xml::ParseCheckBox(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     m_xmlfile.Write(GetCheckStatus(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     m_xmlfile.Write(GetCheckStatus(res));

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

 }
 
 wxString wxr2xml::GetLabel(wxItemResource * res)
 {
 }
 
 wxString wxr2xml::GetLabel(wxItemResource * res)
 {

-    return _T("\t\t\t\t<label>" + res->GetTitle() + "</label>\n");
+    return _T("\t\t\t\t<label>") + res->GetTitle() + _T("</label>\n");

 }
 
 void wxr2xml::ParseRadioBox(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseRadioBox(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     // Add radio box items
     WriteStringList(res);
     // Value1
     m_xmlfile.Write(GetDimension(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     // Add radio box items
     WriteStringList(res);
     // Value1
     m_xmlfile.Write(GetDimension(res));

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

 }
 
 void wxr2xml::ParseListBox(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseListBox(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     WriteStringList(res);
     WriteControlInfo(res);
     WriteStringList(res);

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

 }
 
 void wxr2xml::ParseStaticText(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseStaticText(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));

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

 }
 
 void wxr2xml::ParseStaticBox(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseStaticBox(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));

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

 }
 
 void wxr2xml::WriteStringList(wxItemResource * res)
 {
 }
 
 void wxr2xml::WriteStringList(wxItemResource * res)
 {

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

     for (wxStringListNode * node = res->GetStringValues().GetFirst();
         node;node = node->GetNext()) {
         const wxString s1 = node->GetData();
     for (wxStringListNode * node = res->GetStringValues().GetFirst();
         node;node = node->GetNext()) {
         const wxString s1 = node->GetData();

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

     }
     }

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

 }
 
 void wxr2xml::ParseChoice(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseChoice(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     // Add choice items
     WriteStringList(res);
     WriteControlInfo(res);
     // Add choice items
     WriteStringList(res);

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

 }
 
 void wxr2xml::ParseGauge(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseGauge(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetValue1(res));
     m_xmlfile.Write(GetRange(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetValue1(res));
     m_xmlfile.Write(GetRange(res));

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

 }
 
 wxString wxr2xml::GetValue1(wxItemResource * res)
 {
     wxString msg;
 }
 
 wxString wxr2xml::GetValue1(wxItemResource * res)
 {
     wxString msg;

-    msg << "\t\t\t\t<value>" << res->GetValue1() << "</value>\n";
+    msg << _T("\t\t\t\t<value>") << res->GetValue1() << _T("</value>\n");

     return msg;
 }
 
 wxString wxr2xml::GetRange(wxItemResource * res)
 {
     wxString msg;
     return msg;
 }
 
 wxString wxr2xml::GetRange(wxItemResource * res)
 {
     wxString msg;

-    msg << "\t\t\t\t<range>" << res->GetValue2() << "</range>";
+    msg << _T("\t\t\t\t<range>") << res->GetValue2() << _T("</range>");

     return msg;
 }
 
 void wxr2xml::ParseSlider(wxItemResource * res)
 {
     return msg;
 }
 
 void wxr2xml::ParseSlider(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetValue1(res));
     m_xmlfile.Write(GetMax(res));
     m_xmlfile.Write(GetMin(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetValue1(res));
     m_xmlfile.Write(GetMax(res));
     m_xmlfile.Write(GetMin(res));

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

 }
 
 wxString wxr2xml::GetMax(wxItemResource * res)
 {
     wxString msg;
 }
 
 wxString wxr2xml::GetMax(wxItemResource * res)
 {
     wxString msg;

-    msg << "\t\t\t\t<max>" << res->GetValue3() << "</max>\n";
+    msg << _T("\t\t\t\t<max>") << res->GetValue3() << _T("</max>\n");

     return msg;
 }
 
 wxString wxr2xml::GetMin(wxItemResource * res)
 {
     wxString msg;
     return msg;
 }
 
 wxString wxr2xml::GetMin(wxItemResource * res)
 {
     wxString msg;

-    msg << "\t\t\t\t<min>" << res->GetValue2() << "</min>";
+    msg << _T("\t\t\t\t<min>") << res->GetValue2() << _T("</min>");

     return msg;
 }
 
 void wxr2xml::ParseComboBox(wxItemResource * res)
 {
     return msg;
 }
 
 void wxr2xml::ParseComboBox(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     // Add combo items
     WriteStringList(res);
     WriteControlInfo(res);
     // Add combo items
     WriteStringList(res);

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

 }
 
 void wxr2xml::ParseRadioButton(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseRadioButton(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
 
     wxString msg;
     m_xmlfile.Write(GetValue1(res));
     m_xmlfile.Write(GetCheckStatus(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetLabel(res));
 
     wxString msg;
     m_xmlfile.Write(GetValue1(res));
     m_xmlfile.Write(GetCheckStatus(res));

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

 }
 
 void wxr2xml::ParseScrollBar(wxItemResource * res)
 {
 }
 
 void wxr2xml::ParseScrollBar(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     m_xmlfile.Write(GetValue1(res));
     WriteControlInfo(res);
     m_xmlfile.Write(GetValue1(res));

-    m_xmlfile.Write("\t\t\t\t<thumbsize>"+GetValue2(res)+"</thumbsize>\n");
-    m_xmlfile.Write("\t\t\t\t<range>"+GetValue3(res)+"</range>\n");
-    m_xmlfile.Write("\t\t\t\t<pagesize>"+GetValue5(res)+"</pagesize>\n");
-    m_xmlfile.Write("\t\t\t</scrollbar>\n");
+    m_xmlfile.Write(_T("\t\t\t\t<thumbsize>")+GetValue2(res)+_T("</thumbsize>\n"));
+    m_xmlfile.Write(_T("\t\t\t\t<range>")+GetValue3(res)+_T("</range>\n"));
+    m_xmlfile.Write(_T("\t\t\t\t<pagesize>")+GetValue5(res)+_T("</pagesize>\n"));
+    m_xmlfile.Write(_T("\t\t\t</object>\n"));

 }
 
 wxString wxr2xml::GetCheckStatus(wxItemResource * res)
 {
     wxString msg;
 }
 
 wxString wxr2xml::GetCheckStatus(wxItemResource * res)
 {
     wxString msg;

-    msg << "\t\t\t\t<checked>" << res->GetValue1() << "</checked>\n";
+    msg << _T("\t\t\t\t<checked>") << res->GetValue1() << _T("</checked>\n");

     return msg;
 }
 
     return msg;
 }
 


@@ -387,176 +380,179 @@ wxString wxr2xml::GetStyles(wxItemResource * res)
     restype = res->GetType();
     style = res->GetStyle();
 
     restype = res->GetType();
     style = res->GetStyle();
 

-    s = "\t\t\t\t<style>";
+    s = _T("\t\t\t\t<style>");

 
     // Common styles for all controls
     if (style & wxSIMPLE_BORDER)
 
     // Common styles for all controls
     if (style & wxSIMPLE_BORDER)

-        s += "wxSIMPLE_BORDER|";
+        s += _T("wxSIMPLE_BORDER|");

     if (style & wxSUNKEN_BORDER)
     if (style & wxSUNKEN_BORDER)

-        s += "wxSUNKEN_BORDER|";
+        s += _T("wxSUNKEN_BORDER|");

     if (style & wxSIMPLE_BORDER)
     if (style & wxSIMPLE_BORDER)

-        s += "wxSIMPLE_BORDER|";
+        s += _T("wxSIMPLE_BORDER|");

     if (style & wxDOUBLE_BORDER)
     if (style & wxDOUBLE_BORDER)

-        s += "wxDOUBLE_BORDER|";
+        s += _T("wxDOUBLE_BORDER|");

     if (style & wxRAISED_BORDER)
     if (style & wxRAISED_BORDER)

-        s += "wxRAISED_BORDER|";
+        s += _T("wxRAISED_BORDER|");

     if (style & wxTRANSPARENT_WINDOW)
     if (style & wxTRANSPARENT_WINDOW)

-        s += "wxTRANSPARENT_WINDOW|";
+        s += _T("wxTRANSPARENT_WINDOW|");

     if (style & wxWANTS_CHARS)
     if (style & wxWANTS_CHARS)

-        s += "wxWANTS_CHARS|";
+        s += _T("wxWANTS_CHARS|");

     if (style & wxNO_FULL_REPAINT_ON_RESIZE)
     if (style & wxNO_FULL_REPAINT_ON_RESIZE)

-        s += "wxNO_FULL_REPAINT_ON_RESIZE|";
+        s += _T("wxNO_FULL_REPAINT_ON_RESIZE|");

 
 

-    if (restype == "wxDialog") 
+    if (restype == _T("wxDialog"))

         {
         {

-        if (style & wxDIALOG_MODAL)
-            s += "wxDIALOG_MODAL|";

         if (style & wxDEFAULT_DIALOG_STYLE)
         if (style & wxDEFAULT_DIALOG_STYLE)

-            s += "wxDEFAULT_DIALOG_STYLE|";
+            s += _T("wxDEFAULT_DIALOG_STYLE|");
+#if WXWIN_COMPATIBILITY_2_6
+        if (style & wxDIALOG_MODAL)
+            s += _T("wxDIALOG_MODAL|");

         if (style & wxDIALOG_MODELESS)
         if (style & wxDIALOG_MODELESS)

-            s += "wxDIALOG_MODELESS|";
+            s += _T("wxDIALOG_MODELESS|");

         if (style & wxNO_3D)
         if (style & wxNO_3D)

-            s += "wxNO_3D|";
+            s += _T("wxNO_3D|");
+#endif // WXWIN_COMPATIBILITY_2_6

         if (style & wxTAB_TRAVERSAL)
         if (style & wxTAB_TRAVERSAL)

-            s += "wxTAB_TRAVERSAL|";
+            s += _T("wxTAB_TRAVERSAL|");

         if (style & wxWS_EX_VALIDATE_RECURSIVELY)
         if (style & wxWS_EX_VALIDATE_RECURSIVELY)

-            s += "wxWS_EX_VALIDATE_RECURSIVELY|";
+            s += _T("wxWS_EX_VALIDATE_RECURSIVELY|");

         if (style & wxSTAY_ON_TOP)
         if (style & wxSTAY_ON_TOP)

-            s += "wxSTAY_ON_TOP|";
+            s += _T("wxSTAY_ON_TOP|");

         if (style & wxCAPTION)
         if (style & wxCAPTION)

-            s += "wxCAPTION|";
-        if (style & wxTHICK_FRAME)
-            s += "wxTHICK_FRAME|";
+            s += _T("wxCAPTION|");
+        if (style & wxRESIZE_BORDER)
+            s += _T("wxRESIZE_BORDER|");
+#if WXWIN_COMPATIBILITY_2_6

         if (style & wxRESIZE_BOX)
         if (style & wxRESIZE_BOX)

-            s += "wxRESIZE_BOX|";
+            s += _T("wxRESIZE_BOX|");
+#endif // WXWIN_COMPATIBILITY_2_6

         if (style & wxRESIZE_BORDER)
         if (style & wxRESIZE_BORDER)

-            s += "wxRESIZE_BORDER|";
+            s += _T("wxRESIZE_BORDER|");

         if (style & wxSYSTEM_MENU)
         if (style & wxSYSTEM_MENU)

-            s += "wxSYSTEM_MENU|";
+            s += _T("wxSYSTEM_MENU|");

         if (style & wxCLIP_CHILDREN)
         if (style & wxCLIP_CHILDREN)

-            s += "wxCLIP_CHILDREN|";
+            s += _T("wxCLIP_CHILDREN|");

         }
 
         }
 

-    if (restype == "wxPanel") 
+    if (restype == _T("wxPanel"))

         {
         if (style & wxCLIP_CHILDREN)
         {
         if (style & wxCLIP_CHILDREN)

-            s += "wxCLIP_CHILDREN|";
+            s += _T("wxCLIP_CHILDREN|");
+#if WXWIN_COMPATIBILITY_2_6

         if (style & wxNO_3D)
         if (style & wxNO_3D)

-            s += "wxNO_3D|";
+            s += _T("wxNO_3D|");
+#endif // WXWIN_COMPATIBILITY_2_6

         if (style & wxTAB_TRAVERSAL)
         if (style & wxTAB_TRAVERSAL)

-            s += "wxTAB_TRAVERSAL|";
+            s += _T("wxTAB_TRAVERSAL|");

         if (style & wxWS_EX_VALIDATE_RECURSIVELY)
         if (style & wxWS_EX_VALIDATE_RECURSIVELY)

-            s += "wxWS_EX_VALIDATE_RECURSIVELY|";
+            s += _T("wxWS_EX_VALIDATE_RECURSIVELY|");

         }
 
         }
 

-    if (restype == "wxComboBox") 
+    if (restype == _T("wxComboBox"))

         {
         if (style & wxCB_SORT)
         {
         if (style & wxCB_SORT)

-            s += "wxCB_SORT|";
+            s += _T("wxCB_SORT|");

         if (style & wxCB_SIMPLE)
         if (style & wxCB_SIMPLE)

-            s += "wxCB_SIMPLE|";
+            s += _T("wxCB_SIMPLE|");

         if (style & wxCB_READONLY)
         if (style & wxCB_READONLY)

-            s += "wxCB_READONLY|";
+            s += _T("wxCB_READONLY|");

         if (style & wxCB_DROPDOWN)
         if (style & wxCB_DROPDOWN)

-            s += "wxCB_DROPDOWN|";
+            s += _T("wxCB_DROPDOWN|");

         }
 
         }
 

-    if (restype == "wxGauge") 
+    if (restype == _T("wxGauge"))

         {
         if (style & wxGA_HORIZONTAL)
         {
         if (style & wxGA_HORIZONTAL)

-            s += "wxGA_HORIZONTAL|";
+            s += _T("wxGA_HORIZONTAL|");

         if (style & wxGA_VERTICAL)
         if (style & wxGA_VERTICAL)

-            s += "wxGA_VERTICAL|";
-        if (style & wxGA_PROGRESSBAR)
-            s += "wxGA_PROGRESSBAR|";
+            s += _T("wxGA_VERTICAL|");

     // windows only
         if (style & wxGA_SMOOTH)
     // windows only
         if (style & wxGA_SMOOTH)

-            s += "wxGA_SMOOTH|";
+            s += _T("wxGA_SMOOTH|");

         }
 
         }
 

-    if (restype == "wxRadioButton") 
+    if (restype == _T("wxRadioButton"))

         {
         if (style & wxRB_GROUP)
         {
         if (style & wxRB_GROUP)

-        s += "wxRB_GROUP|";
+        s += _T("wxRB_GROUP|");

         }
 
         }
 

-    if (restype == "wxStaticText") 
+    if (restype == _T("wxStaticText"))

         {
         if (style & wxST_NO_AUTORESIZE)
         {
         if (style & wxST_NO_AUTORESIZE)

-            s += "wxST_NO_AUTORESIZEL|";
+            s += _T("wxST_NO_AUTORESIZEL|");

         }
 
         }
 

-    if (restype == "wxRadioBox") 
+    if (restype == _T("wxRadioBox"))

         {
         if (style & wxRA_HORIZONTAL)
         {
         if (style & wxRA_HORIZONTAL)

-            s += "wxRA_HORIZONTAL|";
+            s += _T("wxRA_HORIZONTAL|");

         if (style & wxRA_SPECIFY_COLS)
         if (style & wxRA_SPECIFY_COLS)

-            s += "wxRA_SPECIFY_COLS|";
+            s += _T("wxRA_SPECIFY_COLS|");

         if (style & wxRA_SPECIFY_ROWS)
         if (style & wxRA_SPECIFY_ROWS)

-            s += "wxRA_SPECIFY_ROWS|";
+            s += _T("wxRA_SPECIFY_ROWS|");

         if (style & wxRA_VERTICAL)
         if (style & wxRA_VERTICAL)

-            s += "wxRA_VERTICAL|";
+            s += _T("wxRA_VERTICAL|");

         }
 
         }
 

-    if (restype == "wxListBox") 
+    if (restype == _T("wxListBox"))

         {
         if (style & wxLB_SINGLE)
         {
         if (style & wxLB_SINGLE)

-            s += "wxLB_SINGLE|";
+            s += _T("wxLB_SINGLE|");

         if (style & wxLB_MULTIPLE)
         if (style & wxLB_MULTIPLE)

-            s += "wxLB_MULTIPLE|";
+            s += _T("wxLB_MULTIPLE|");

         if (style & wxLB_EXTENDED)
         if (style & wxLB_EXTENDED)

-            s += "wxLB_EXTENDED|";
+            s += _T("wxLB_EXTENDED|");

         if (style & wxLB_HSCROLL)
         if (style & wxLB_HSCROLL)

-            s += "wxLB_HSCROLL|";
+            s += _T("wxLB_HSCROLL|");

         if (style & wxLB_ALWAYS_SB)
         if (style & wxLB_ALWAYS_SB)

-            s += "wxLB_ALWAYS_SB|";
+            s += _T("wxLB_ALWAYS_SB|");

         if (style & wxLB_NEEDED_SB)
         if (style & wxLB_NEEDED_SB)

-            s += "wxLB_NEEDED_SB|";
+            s += _T("wxLB_NEEDED_SB|");

         if (style & wxLB_SORT)
         if (style & wxLB_SORT)

-        s += "wxLB_SORT|";
+        s += _T("wxLB_SORT|");

         }
 
         }
 

-    if (restype == "wxTextCtrl") 
+    if (restype == _T("wxTextCtrl"))

         {
         if (style & wxTE_PROCESS_ENTER)
         {
         if (style & wxTE_PROCESS_ENTER)

-            s += "wxTE_PROCESS_ENTER|";
+            s += _T("wxTE_PROCESS_ENTER|");

         if (style & wxTE_PROCESS_TAB)
         if (style & wxTE_PROCESS_TAB)

-            s += "wxTE_PROCESS_TAB|";
+            s += _T("wxTE_PROCESS_TAB|");

         if (style & wxTE_MULTILINE)
         if (style & wxTE_MULTILINE)

-            s += "wxTE_MULTILINE|";
+            s += _T("wxTE_MULTILINE|");

         if (style & wxTE_PASSWORD)
         if (style & wxTE_PASSWORD)

-            s += "wxTE_PASSWORD|";
+            s += _T("wxTE_PASSWORD|");

         if (style & wxTE_READONLY)
         if (style & wxTE_READONLY)

-            s += "wxTE_READONLY|";
+            s += _T("wxTE_READONLY|");

         if (style & wxHSCROLL)
         if (style & wxHSCROLL)

-            s += "wxHSCROLL|";
+            s += _T("wxHSCROLL|");

         }
 
 
         }
 
 

-    if (restype == "wxScrollBar")
+    if (restype == _T("wxScrollBar"))

         {
         if (style & wxSB_HORIZONTAL)
         {
         if (style & wxSB_HORIZONTAL)

-            s += "wxSB_HORIZONTAL|";
-        if (style & wxSB_VERTICAL)  
-            s += "wxSB_VERTICAL|";
+            s += _T("wxSB_HORIZONTAL|");
+        if (style & wxSB_VERTICAL)
+            s += _T("wxSB_VERTICAL|");

         }
 
         }
 

-    int l;
-    l = s.Length();
+    int l = s.length();

     // No styles defined
     if (l == 11)
     // No styles defined
     if (l == 11)

-        return _T("");
+        return wxEmptyString;

     // Trim off last |
     s = s.Truncate(l - 1);
 
     // Trim off last |
     s = s.Truncate(l - 1);
 

-    s += "</style>\n";
+    s += _T("</style>\n");

     return s;
 }
 
 wxString wxr2xml::GetDimension(wxItemResource * res)
 {
     wxString msg;
     return s;
 }
 
 wxString wxr2xml::GetDimension(wxItemResource * res)
 {
     wxString msg;

-    msg << "\t\t\t\t<dimension>" << res->GetValue1() << "</dimension>\n";
+    msg << _T("\t\t\t\t<dimension>") << res->GetValue1() << _T("</dimension>\n");

     return msg;
 }
 
     return msg;
 }
 


@@ -575,89 +571,85 @@ wxString wxr2xml::GenerateName(wxItemResource * res)
         name += res->GetName();
     }
 
         name += res->GetName();
     }
 

-    name += "\"";
+    name += _T("\"");

     return name;
 }
 
 void wxr2xml::ParseMenuBar(wxItemResource * res)
 {
     wxItemResource *child;
     return name;
 }
 
 void wxr2xml::ParseMenuBar(wxItemResource * res)
 {
     wxItemResource *child;

-    wxNode *node = res->GetChildren().First();
+    wxNode *node = res->GetChildren().GetFirst();

     // Get Menu Bar Name
     // Get Menu Bar Name

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

     m_xmlfile.Write(GenerateName(res));
     m_xmlfile.Write(GenerateName(res));

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

     while (node) {
     while (node) {

-        child = (wxItemResource *) node->Data();
+        child = (wxItemResource *) node->GetData();

         ParseMenu(child);
         ParseMenu(child);

-        node = node->Next();
+        node = node->GetNext();

     }
 
     }
 

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

 }
 
 void wxr2xml::ParseMenu(wxItemResource * res)
 {
     wxItemResource *child;
 }
 
 void wxr2xml::ParseMenu(wxItemResource * res)
 {
     wxItemResource *child;

-    wxNode *node = res->GetChildren().First();
-    // Get Menu 
-    m_xmlfile.Write("\t\t\t<menu ");
+    wxNode *node = res->GetChildren().GetFirst();
+    // Get Menu
+    m_xmlfile.Write(_T("\t\t\t<object class=\"wxMenu\" "));

     wxString menuname;
     wxString menuname;

-    menuname << "name = \"menu_" << res->GetValue1() << "\"";
+    menuname << _T("name = \"menu_") << res->GetValue1() << _T("\"");

     m_xmlfile.Write(menuname);
     m_xmlfile.Write(menuname);

-    m_xmlfile.Write(">\n");
-    m_xmlfile.Write("\t\t\t\t<label>"
-        + FixMenuString(res->GetTitle()) + "</label>\n");
-    if (res->GetValue4() != "")
-        m_xmlfile.Write("\t\t\t\t<help>" + res->GetValue4() +
-        "</help>\n");
-        m_xmlfile.Write("\t\t\t<children>\n");
+    m_xmlfile.Write(_T(">\n"));
+    m_xmlfile.Write(_T("\t\t\t\t<label>")
+        + FixMenuString(res->GetTitle()) + _T("</label>\n"));
+    if (!res->GetValue4().empty())
+        m_xmlfile.Write(_T("\t\t\t\t<help>") + res->GetValue4() +
+        _T("</help>\n"));

     // Read in menu items and additional menus
     while (node) {
     // Read in menu items and additional menus
     while (node) {

-        child = (wxItemResource *) node->Data();
-        if (!child->GetChildren().First())
+        child = (wxItemResource *) node->GetData();
+        if (!child->GetChildren().GetFirst())

             ParseMenuItem(child);
         else
             ParseMenu(child);
             ParseMenuItem(child);
         else
             ParseMenu(child);

-            node = node->Next();
+            node = node->GetNext();

     }
     }

-    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"));

 }
 
 void wxr2xml::ParseMenuItem(wxItemResource * res)
 {
     // Get Menu Item or Separator
 }
 
 void wxr2xml::ParseMenuItem(wxItemResource * res)
 {
     // Get Menu Item or Separator

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

     } else {
     } else {

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

         wxString menuname;
         wxString menuname;

-        menuname << "name = \"menuitem_" << res->GetValue1() << "\"";
+        menuname << _T("name = \"menuitem_") << res->GetValue1() << _T("\"");

         m_xmlfile.Write(menuname);
         m_xmlfile.Write(menuname);

-        m_xmlfile.Write(">\n");
-            m_xmlfile.Write("                  <label>"
-            + FixMenuString(res->GetTitle()) + "</label>\n");
-        if (res->GetValue4() != "")
-            m_xmlfile.Write("                  <help>" +
-        res->GetValue4() + "</help>\n");
+        m_xmlfile.Write(_T(">\n"));
+            m_xmlfile.Write(_T("\t\t\t<label>")
+            + FixMenuString(res->GetTitle()) + _T("</label>\n"));
+        if (!res->GetValue4().empty())
+            m_xmlfile.Write(_T("\t\t\t<help>") +
+        res->GetValue4() + _T("</help>\n"));

         if (res->GetValue2())
         if (res->GetValue2())

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

     }
 }
 
 wxString wxr2xml::FixMenuString(wxString phrase)
 {
     }
 }
 
 wxString wxr2xml::FixMenuString(wxString phrase)
 {

-    phrase.Replace("&", "$");
+    phrase.Replace(_T("&"), _T("$"));

     return phrase;
 }
 
 void wxr2xml::ParseStaticBitmap(wxItemResource * res)
 {
     return phrase;
 }
 
 void wxr2xml::ParseStaticBitmap(wxItemResource * res)
 {

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

     WriteControlInfo(res);
     // value4 holds bitmap name
     wxString bitmapname;
     WriteControlInfo(res);
     // value4 holds bitmap name
     wxString bitmapname;


@@ -666,15 +658,15 @@ void wxr2xml::ParseStaticBitmap(wxItemResource * res)
     bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
     bitmapname += _T(".bmp");
     bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
     bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
     bitmapname += _T(".bmp");
     bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);

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

     // bitmap5
 }
 //Parse a bitmap resource
 void wxr2xml::ParseBitmap(wxItemResource * res)
 {
     // bitmap5
 }
 //Parse a bitmap resource
 void wxr2xml::ParseBitmap(wxItemResource * res)
 {

-    m_xmlfile.Write("\t<bitmap ");
-    m_xmlfile.Write(GenerateName(res)+">");
+    m_xmlfile.Write(_T("\t<object class=\"wxBitmap\" "));
+    m_xmlfile.Write(GenerateName(res)+_T(">"));

     wxString bitmapname;
     bitmapname = res->GetName();
     wxBitmap bitmap;
     wxString bitmapname;
     bitmapname = res->GetName();
     wxBitmap bitmap;


@@ -682,22 +674,22 @@ void wxr2xml::ParseBitmap(wxItemResource * res)
     bitmapname += _T(".bmp");
     bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
     m_xmlfile.Write(bitmapname);
     bitmapname += _T(".bmp");
     bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
     m_xmlfile.Write(bitmapname);

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

 }
 
 void wxr2xml::PanelStuff(wxItemResource * res)
 {
     if ((res->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
 }
 
 void wxr2xml::PanelStuff(wxItemResource * res)
 {
     if ((res->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)

-        m_dlgunits = TRUE;
+        m_dlgunits = true;

     else
     else

-        m_dlgunits = FALSE;
+        m_dlgunits = false;

 
     // If this is true ignore fonts, background color and use system
     // defaults instead
     if ((res->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
 
     // If this is true ignore fonts, background color and use system
     // defaults instead
     if ((res->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)

-        m_systemdefaults = TRUE;
+        m_systemdefaults = true;

     else
     else

-        m_systemdefaults = FALSE;
+        m_systemdefaults = false;

 
 }
 
 
 }
 


@@ -726,8 +718,8 @@ wxString wxr2xml::GetValue5(wxItemResource *res)
 
 void wxr2xml::ParseBitmapButton(wxItemResource *res)
 {
 
 void wxr2xml::ParseBitmapButton(wxItemResource *res)
 {

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

     WriteControlInfo(res);
     // value4 holds bitmap name
     wxString bitmapname;
     WriteControlInfo(res);
     // value4 holds bitmap name
     wxString bitmapname;


@@ -736,9 +728,9 @@ void wxr2xml::ParseBitmapButton(wxItemResource *res)
     bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
     bitmapname += _T(".bmp");
     bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);
     bitmap = wxResourceCreateBitmap(bitmapname, &m_table);
     bitmapname += _T(".bmp");
     bitmap.SaveFile(bitmapname, wxBITMAP_TYPE_BMP);

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

 }
 
 void wxr2xml::WriteFontInfo(wxItemResource *res)
 }
 
 void wxr2xml::WriteFontInfo(wxItemResource *res)


@@ -751,21 +743,21 @@ void wxr2xml::WriteFontInfo(wxItemResource *res)
     if (!font.GetRefData())
         return;
 
     if (!font.GetRefData())
         return;
 

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

     //Get font point size,font family,weight,font style,underline
     int pt;
     wxString msg;
     pt=font.GetPointSize();
     //Get font point size,font family,weight,font style,underline
     int pt;
     wxString msg;
     pt=font.GetPointSize();

-    msg<<"\t\t\t\t<size>"<<pt<<"</size>\n";
+    msg<<_T("\t\t\t\t<size>")<<pt<<_T("</size>\n");

     m_xmlfile.Write(msg);
     GetFontFace(font);
     GetFontStyle(font);
     GetFontWeight(font);
     m_xmlfile.Write(msg);
     GetFontFace(font);
     GetFontStyle(font);
     GetFontWeight(font);

-    
+

     if (font.GetUnderlined())
     if (font.GetUnderlined())

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

 }
 
 //WARNING possible make here
 }
 
 //WARNING possible make here


@@ -773,28 +765,28 @@ void wxr2xml::WriteFontInfo(wxItemResource *res)
 void wxr2xml::GetFontFace(wxFont font)
 {
     int family=font.GetFamily();
 void wxr2xml::GetFontFace(wxFont font)
 {
     int family=font.GetFamily();

-    
+

     switch (family)
         {
         case wxDEFAULT:
             break;
         case wxDECORATIVE:
     switch (family)
         {
         case wxDEFAULT:
             break;
         case wxDECORATIVE:

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

             break;
         case wxROMAN:
             break;
         case wxROMAN:

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

             break;
         case wxSCRIPT:
             break;
         case wxSCRIPT:

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

             break;
         case wxSWISS:
             break;
         case wxSWISS:

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

             break;
         case wxMODERN:
             break;
         case wxMODERN:

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

             break;
         default:
             break;
         default:

-            wxLogError("Unknown font face");
+            wxLogError(_T("Unknown font face"));

         }
 }
 
         }
 }
 


@@ -809,13 +801,13 @@ void wxr2xml::GetFontStyle(wxFont font)
         case wxNORMAL:
             break;
         case wxITALIC:
         case wxNORMAL:
             break;
         case wxITALIC:

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

             break;
         case wxSLANT:
             break;
         case wxSLANT:

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

             break;
         default:
             break;
         default:

-            wxLogError("Unknown font style");
+            wxLogError(_T("Unknown font style"));

         }
 }
 
         }
 }
 


@@ -829,12 +821,12 @@ void wxr2xml::GetFontWeight(wxFont font)
         case wxNORMAL:
             break;
         case wxLIGHT:
         case wxNORMAL:
             break;
         case wxLIGHT:

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

             break;
         case wxBOLD:
             break;
         case wxBOLD:

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

             break;
         default:
             break;
         default:

-            wxLogError("Unknown font weight");
+            wxLogError(_T("Unknown font weight"));

         }
 }
         }
 }