corrected typo in Darwin specific code

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

diff --git a/contrib/utils/convertrc/rc2xml.cpp b/contrib/utils/convertrc/rc2xml.cpp
index 15f7ac44eeecb842bea8011267755317fa8f84e3..ee909b0256b7b1a46a4efd82a9fc572c06b3a94d 100644 (file)
--- a/contrib/utils/convertrc/rc2xml.cpp
+++ b/contrib/utils/convertrc/rc2xml.cpp
@@ -21,7 +21,7 @@ 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
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -68,11 +68,16 @@ 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_workingpath=wxPathOnly(rcfile);

+

     m_targetpath=wxPathOnly(xmlfile)+"\\";
 
     m_targetpath=wxPathOnly(xmlfile)+"\\";
 

+
+

     wxSetWorkingDirectory(m_workingpath);
 
     wxSetWorkingDirectory(m_workingpath);
 

+

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


@@ -1029,7 +1034,9 @@ wxString rc2xml::CleanName(wxString name)
     name.Replace("idr_","");
     name.Replace("idb_","");
     name.Replace("idc_","");
     name.Replace("idr_","");
     name.Replace("idb_","");
     name.Replace("idc_","");

+

     name.Replace(".ico","");
     name.Replace(".ico","");

+

     name.Replace(".bmp","");
     return name;
 }
     name.Replace(".bmp","");
     return name;
 }


@@ -1184,6 +1191,7 @@ void rc2xml::WriteBitmap(wxString bitmapname)
     
     wxString *bitmappath;
     bitmappath=(wxString *)node->Data();
     
     wxString *bitmappath;
     bitmappath=(wxString *)node->Data();

+

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