Unicode markup.

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

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 7cd81a8a682ec903be4982eb10746495a546f1c6..4279eaef82fe48a761c34afc94a5d9ac9b947657 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -796,8 +796,8 @@ void rc2xml::WriteLabel(wxString label)
 {
     label.Replace(_T("&"),_T("$"));
     // changes by MS, handle '<' '>' characters within a label.
 {
     label.Replace(_T("&"),_T("$"));
     // changes by MS, handle '<' '>' characters within a label.

-    label.Replace("<","&lt;");
-    label.Replace(">","&gt;");
+    label.Replace(_T("<"),_T("&lt;"));
+    label.Replace(_T(">"),_T("&gt;"));

     m_xmlfile.Write(_T("\t\t\t<label>")+label+_T("</label>\n"));
 }
 
     m_xmlfile.Write(_T("\t\t\t<label>")+label+_T("</label>\n"));
 }
 


@@ -842,7 +842,7 @@ void rc2xml::ParseListBox(wxString varname)
     CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER |
                     WS_TABSTOP,103,110,40,14
 */
     CONTROL         "",IDC_RICHEDIT1,"RICHEDIT",ES_AUTOHSCROLL | WS_BORDER |
                     WS_TABSTOP,103,110,40,14
 */

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

 {
     wxString token;
     //while (ReadOrs(token));
 {
     wxString token;
     //while (ReadOrs(token));


@@ -1013,7 +1013,7 @@ void rc2xml::WriteToolButton(wxString name,int index, int width, int height, wxB
     little.SaveFile(m_targetpath+name,wxBITMAP_TYPE_BMP);
 }
 
     little.SaveFile(m_targetpath+name,wxBITMAP_TYPE_BMP);
 }
 

-void rc2xml::ParseStringTable(wxString varname)
+void rc2xml::ParseStringTable(wxString WXUNUSED(varname))

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


@@ -1023,13 +1023,12 @@ void rc2xml::ParseStringTable(wxString varname)
     wxString *msg;
 
     while ((token!=_T("END"))&(token!=_T("}")))
     wxString *msg;
 
     while ((token!=_T("END"))&(token!=_T("}")))

-        {
+    {

         msg=new wxString;
         *msg=GetStringQuote();
         m_stringtable->Append(token,msg);
         token=GetToken();
         msg=new wxString;
         *msg=GetStringQuote();
         m_stringtable->Append(token,msg);
         token=GetToken();

-        }
-
+    }

 }
 
 bool rc2xml::LookUpString(wxString strid,wxString & st)
 }
 
 bool rc2xml::LookUpString(wxString strid,wxString & st)