fix a bug in the test which was corrupting 1 byte beyond wxImage buffer

[wxWidgets.git] / utils / wxrc / wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 0660b7e176ed85c5c7b141f8ee84aa66d0925663..fef806dec4516408526bfb93e25d5d81dca59d6c 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -8,11 +8,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma implementation
-    #pragma interface
-#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"
 


@@ -24,6 +19,7 @@
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"
 #ifndef WX_PRECOMP
     #include "wx/app.h"
     #include "wx/log.h"

+    #include "wx/wxcrtvararg.h"

 #endif
 
 #include "wx/cmdline.h"
 #endif
 
 #include "wx/cmdline.h"


@@ -31,7 +27,12 @@
 #include "wx/ffile.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"
 #include "wx/ffile.h"
 #include "wx/filename.h"
 #include "wx/wfstream.h"

+#include "wx/utils.h"
+#include "wx/hashset.h"
+#include "wx/mimetype.h"
+#include "wx/vector.h"

 
 

+WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet);

 
 class XRCWidgetData
 {
 
 class XRCWidgetData
 {


@@ -44,15 +45,17 @@ private:
     wxString m_class;
     wxString m_name;
 };
     wxString m_class;
     wxString m_name;
 };

+

 #include "wx/arrimpl.cpp"
 WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData);
 #include "wx/arrimpl.cpp"
 WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData);

-WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData);
+WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData)

 
 class XRCWndClassData
 {
 private:
     wxString m_className;
     wxString m_parentClassName;
 
 class XRCWndClassData
 {
 private:
     wxString m_className;
     wxString m_parentClassName;

+    StringSet m_ancestorClassNames;

     ArrayOfXRCWidgetData m_wdata;
 
     void BrowseXmlNode(wxXmlNode* node)
     ArrayOfXRCWidgetData m_wdata;
 
     void BrowseXmlNode(wxXmlNode* node)


@@ -63,8 +66,8 @@ private:
         while (node)
         {
             if (node->GetName() == _T("object")
         while (node)
         {
             if (node->GetName() == _T("object")

-                && node->GetPropVal(_T("class"),&classValue)
-                && node->GetPropVal(_T("name"),&nameValue))
+                && node->GetAttribute(_T("class"),&classValue)
+                && node->GetAttribute(_T("name"),&nameValue))

             {
                 m_wdata.Add(XRCWidgetData(nameValue,classValue));
             }
             {
                 m_wdata.Add(XRCWidgetData(nameValue,classValue));
             }


@@ -76,79 +79,144 @@ private:
     }
 
 public:
     }
 
 public:

-    XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) :
-        m_className(className) , m_parentClassName(parentClassName) {
+    XRCWndClassData(const wxString& className,
+                    const wxString& parentClassName,
+                    const wxXmlNode* node) :
+        m_className(className) , m_parentClassName(parentClassName)
+    {
+        if ( className == _T("wxMenu") )
+        {
+            m_ancestorClassNames.insert(_T("wxMenu"));
+            m_ancestorClassNames.insert(_T("wxMenuBar"));
+        }
+        else if ( className == _T("wxMDIChildFrame") )
+        {
+            m_ancestorClassNames.insert(_T("wxMDIParentFrame"));
+        }
+        else if( className == _T("wxMenuBar") ||
+                    className == _T("wxStatusBar") ||
+                        className == _T("wxToolBar") )
+        {
+            m_ancestorClassNames.insert(_T("wxFrame"));
+        }
+        else
+        {
+            m_ancestorClassNames.insert(_T("wxWindow"));
+        }

 
         BrowseXmlNode(node->GetChildren());
 
         BrowseXmlNode(node->GetChildren());

-

     }
 
     }
 

-    const ArrayOfXRCWidgetData& GetWidgetData(){
+    const ArrayOfXRCWidgetData& GetWidgetData()
+    {

         return m_wdata;
     }
 
         return m_wdata;
     }
 

-    bool IsRealClass(const wxString& name)
+    bool CanBeUsedWithXRCCTRL(const wxString& name)

     {
     {

-        if (name == _T("tool") || name == _T("unknown") ||
-            name == _T("notebookpage") || name == _T("separator") ||
+        if (name == _T("tool") ||
+            name == _T("data") ||
+            name == _T("unknown") ||
+            name == _T("notebookpage") ||
+            name == _T("separator") ||

             name == _T("sizeritem") ||
             name == _T("sizeritem") ||

-            name == _T("wxMenuItem"))
+            name == _T("wxMenuBar") ||
+            name == _T("wxMenuItem") ||
+            name == _T("wxStaticBoxSizer") )

         {
             return false;
         }
         return true;
     }
         {
             return false;
         }
         return true;
     }

-    
+

     void GenerateHeaderCode(wxFFile& file)
     {
 
         file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
                    + _T(" {\nprotected:\n"));
         size_t i;
     void GenerateHeaderCode(wxFFile& file)
     {
 
         file.Write(_T("class ") + m_className + _T(" : public ") + m_parentClassName
                    + _T(" {\nprotected:\n"));
         size_t i;

-        for(i=0;i<m_wdata.Count();++i)
+        for(i=0;i<m_wdata.GetCount();++i)

         {
             const XRCWidgetData& w = m_wdata.Item(i);
         {
             const XRCWidgetData& w = m_wdata.Item(i);

-               if( !IsRealClass(w.GetClass()) ) continue;
-           if( w.GetName().Length() == 0 ) continue;
+            if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
+            if( w.GetName().Length() == 0 ) continue;

             file.Write(
                 _T(" ") + w.GetClass() + _T("* ") + w.GetName()
                 + _T(";\n"));
         }
             file.Write(
                 _T(" ") + w.GetClass() + _T("* ") + w.GetName()
                 + _T(";\n"));
         }

-        file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(){\n")
-                   _T("  wxXmlResource::Get()->LoadObject(this,NULL,\"")
+        file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n")
+                   _T("  wxXmlResource::Get()->LoadObject(this,parent,_T(\"")

                    +  m_className
                    +  m_className

-                   +  _T("\",\"")
+                   +  _T("\"), _T(\"")

                    +  m_parentClassName
                    +  m_parentClassName

-                   +  _T("\");\n"));
-        for(i=0;i<m_wdata.Count();++i)
+                   +  _T("\"));\n"));
+        for(i=0;i<m_wdata.GetCount();++i)

         {
             const XRCWidgetData& w = m_wdata.Item(i);
         {
             const XRCWidgetData& w = m_wdata.Item(i);

-               if( !IsRealClass(w.GetClass()) ) continue;
-           if( w.GetName().Length() == 0 ) continue;
+            if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
+            if( w.GetName().Length() == 0 ) continue;

             file.Write( _T("  ")
                         + w.GetName()
                         + _T(" = XRCCTRL(*this,\"")
                         + w.GetName()
                         + _T("\",")
                         + w.GetClass()
             file.Write( _T("  ")
                         + w.GetName()
                         + _T(" = XRCCTRL(*this,\"")
                         + w.GetName()
                         + _T("\",")
                         + w.GetClass()

-                        + _T(");\n")
-                );
+                        + _T(");\n"));
+        }
+        file.Write(_T(" }\n"));
+
+        file.Write( _T("public:\n"));
+
+        if ( m_ancestorClassNames.size() == 1 )
+        {
+            file.Write
+                 (
+                    m_className +
+                    _T("(") +
+                        *m_ancestorClassNames.begin() +
+                        _T(" *parent=NULL){\n") +
+                    _T("  InitWidgetsFromXRC((wxWindow *)parent);\n")
+                    _T(" }\n")
+                    _T("};\n")
+                 );
+        }
+        else
+        {
+            file.Write(m_className + _T("(){\n") +
+                       _T("  InitWidgetsFromXRC(NULL);\n")
+                       _T(" }\n")
+                       _T("};\n"));
+
+            for ( StringSet::const_iterator it = m_ancestorClassNames.begin();
+                  it != m_ancestorClassNames.end();
+                  ++it )
+            {
+                file.Write(m_className + _T("(") + *it + _T(" *parent){\n") +
+                            _T("  InitWidgetsFromXRC((wxWindow *)parent);\n")
+                            _T(" }\n")
+                            _T("};\n"));
+            }

         }
         }

-file.Write(_T(" }\n"));
-
-file.Write(
-        _T("public:\n")
-        + m_className
-        + _T("::")
-        + m_className
-        + _T("(){\n")
-        + _T("  InitWidgetsFromXRC();\n")
-         _T(" }\n")
-        _T("};\n"));
-        };
+    }

 };
 WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);
 };
 WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);

-WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData);
+WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData)
+
+struct ExtractedString
+{
+    ExtractedString() : lineNo(-1) {}
+    ExtractedString(const wxString& str_,
+                    const wxString& filename_, int lineNo_)
+        : str(str_), filename(filename_), lineNo(lineNo_)
+    {}
+
+    wxString str;
+
+    wxString filename;
+    int      lineNo;
+};
+
+typedef wxVector<ExtractedString> ExtractedStrings;

 
 
 class XmlResApp : public wxAppConsole
 
 
 class XmlResApp : public wxAppConsole


@@ -171,8 +239,8 @@ private:
     void MakePackagePython(const wxArrayString& flist);
 
     void OutputGettext();
     void MakePackagePython(const wxArrayString& flist);
 
     void OutputGettext();

-    wxArrayString FindStrings();
-    wxArrayString FindStrings(wxXmlNode *node);
+    ExtractedStrings FindStrings();
+    ExtractedStrings FindStrings(const wxString& filename, wxXmlNode *node);

 
     bool flagVerbose, flagCPP, flagPython, flagGettext;
     wxString parOutput, parFuncname, parOutputPath;
 
     bool flagVerbose, flagCPP, flagPython, flagGettext;
     wxString parOutput, parFuncname, parOutputPath;


@@ -190,23 +258,22 @@ int XmlResApp::OnRun()
 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {

-        { wxCMD_LINE_SWITCH, _T("h"), _T("help"),  _T("show help message"),
-              wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
-        { wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose") },
-        { wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"),  _T("output C++ header file with XRC derived classes") },
-        { wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"),  _T("output C++ source rather than .rsc file") },
-        { wxCMD_LINE_SWITCH, _T("p"), _T("python-code"),  _T("output wxPython source rather than .rsc file") },
-        { wxCMD_LINE_SWITCH, _T("g"), _T("gettext"),  _T("output list of translatable strings (to stdout or file if -o used)") },
-        { wxCMD_LINE_OPTION, _T("n"), _T("function"),  _T("C++/Python function name (with -c or -p) [InitXmlResource]") },
-        { wxCMD_LINE_OPTION, _T("o"), _T("output"),  _T("output file [resource.xrs/cpp]") },
+        { wxCMD_LINE_SWITCH, "h", "help",  "show help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+        { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
+        { wxCMD_LINE_SWITCH, "e", "extra-cpp-code",  "output C++ header file with XRC derived classes" },
+        { wxCMD_LINE_SWITCH, "c", "cpp-code",  "output C++ source rather than .rsc file" },
+        { wxCMD_LINE_SWITCH, "p", "python-code",  "output wxPython source rather than .rsc file" },
+        { wxCMD_LINE_SWITCH, "g", "gettext",  "output list of translatable strings (to stdout or file if -o used)" },
+        { wxCMD_LINE_OPTION, "n", "function",  "C++/Python function name (with -c or -p) [InitXmlResource]" },
+        { wxCMD_LINE_OPTION, "o", "output",  "output file [resource.xrs/cpp]" },

 #if 0 // not yet implemented
 #if 0 // not yet implemented

-        { wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers",  _T("output list of neccessary handlers to this file" },
+        { wxCMD_LINE_OPTION, "l", "list-of-handlers",  "output list of necessary handlers to this file" },

 #endif
 #endif

-        { wxCMD_LINE_PARAM,  NULL, NULL, _T("input file(s)"),
+        { wxCMD_LINE_PARAM,  NULL, NULL, "input file(s)",

               wxCMD_LINE_VAL_STRING,
               wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
 
               wxCMD_LINE_VAL_STRING,
               wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
 

-        { wxCMD_LINE_NONE }
+        wxCMD_LINE_DESC_END 

     };
 
     wxCmdLineParser parser(cmdLineDesc, argc, argv);
     };
 
     wxCmdLineParser parser(cmdLineDesc, argc, argv);


@@ -215,10 +282,6 @@ int XmlResApp::OnRun()
     {
         case -1:
             return 0;
     {
         case -1:
             return 0;

-            #if 0
-            // break is unreachable because of return earlier
-            break;
-            #endif

 
         case 0:
             retCode = 0;
 
         case 0:
             retCode = 0;


@@ -228,17 +291,6 @@ int XmlResApp::OnRun()
             else
                 CompileRes();
             return retCode;
             else
                 CompileRes();
             return retCode;

-            #if 0
-            // break is unreachable because of return earlier
-            break;
-            #endif
-
-        #if 0
-        // default return moved outside of switch to avoid warning about lack of return in function
-        default:
-            return 1;
-            break;
-        #endif

     }
     return 1;
 }
     }
     return 1;
 }


@@ -248,14 +300,14 @@ int XmlResApp::OnRun()
 
 void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
 {
 
 void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
 {

-    flagGettext = cmdline.Found(_T("g"));
-    flagVerbose = cmdline.Found(_T("v"));
-    flagCPP = cmdline.Found(_T("c"));
-    flagPython = cmdline.Found(_T("p"));
-    flagH = flagCPP && cmdline.Found(_T("e"));
+    flagGettext = cmdline.Found("g");
+    flagVerbose = cmdline.Found("v");
+    flagCPP = cmdline.Found("c");
+    flagPython = cmdline.Found("p");
+    flagH = flagCPP && cmdline.Found("e");

 
 
 
 

-    if (!cmdline.Found(_T("o"), &parOutput))
+    if (!cmdline.Found("o", &parOutput))

     {
         if (flagGettext)
             parOutput = wxEmptyString;
     {
         if (flagGettext)
             parOutput = wxEmptyString;


@@ -278,14 +330,14 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
     }
     if (!parOutputPath) parOutputPath = _T(".");
 
     }
     if (!parOutputPath) parOutputPath = _T(".");
 

-    if (!cmdline.Found(_T("n"), &parFuncname))
+    if (!cmdline.Found("n", &parFuncname))

         parFuncname = _T("InitXmlResource");
 
     for (size_t i = 0; i < cmdline.GetParamCount(); i++)
     {
 #ifdef __WINDOWS__
         wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);
         parFuncname = _T("InitXmlResource");
 
     for (size_t i = 0; i < cmdline.GetParamCount(); i++)
     {
 #ifdef __WINDOWS__
         wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);

-        while (!fn.IsEmpty())
+        while (!fn.empty())

         {
             parFiles.Add(fn);
             fn=wxFindNextFile();
         {
             parFiles.Add(fn);
             fn=wxFindNextFile();


@@ -349,7 +401,7 @@ wxArrayString XmlResApp::PrepareTempFiles()
 {
     wxArrayString flist;
 
 {
     wxArrayString flist;
 

-    for (size_t i = 0; i < parFiles.Count(); i++)
+    for (size_t i = 0; i < parFiles.GetCount(); i++)

     {
         if (flagVerbose)
             wxPrintf(_T("processing ") + parFiles[i] +  _T("...\n"));
     {
         if (flagVerbose)
             wxPrintf(_T("processing ") + parFiles[i] +  _T("...\n"));


@@ -373,8 +425,8 @@ wxArrayString XmlResApp::PrepareTempFiles()
                 wxString classValue,nameValue;
                 while(node){
                     if(node->GetName() == _T("object")
                 wxString classValue,nameValue;
                 while(node){
                     if(node->GetName() == _T("object")

-                     && node->GetPropVal(_T("class"),&classValue)
-                     && node->GetPropVal(_T("name"),&nameValue)){
+                     && node->GetAttribute(_T("class"),&classValue)
+                     && node->GetAttribute(_T("name"),&nameValue)){

 
                       aXRCWndClassData.Add(
                         XRCWndClassData(nameValue,classValue,node)
 
                       aXRCWndClassData.Add(
                         XRCWndClassData(nameValue,classValue,node)


@@ -396,31 +448,44 @@ wxArrayString XmlResApp::PrepareTempFiles()
 // Does 'node' contain filename information at all?
 static bool NodeContainsFilename(wxXmlNode *node)
 {
 // Does 'node' contain filename information at all?
 static bool NodeContainsFilename(wxXmlNode *node)
 {

-   // Any bitmaps:
-   if (node->GetName() == _T("bitmap"))
+   const wxString name = node->GetName();
+
+   // Any bitmaps (bitmap2 is used for disabled toolbar buttons):
+   if ( name == _T("bitmap") || name == _T("bitmap2") )

        return true;
 
        return true;
 

-   // URLs in wxHtmlWindow:
-   if (node->GetName() == _T("url"))
+   if ( name == _T("icon") )

        return true;
 
    // wxBitmapButton:
    wxXmlNode *parent = node->GetParent();
    if (parent != NULL &&
        return true;
 
    // wxBitmapButton:
    wxXmlNode *parent = node->GetParent();
    if (parent != NULL &&

-       parent->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
-       (node->GetName() == _T("focus") ||
-        node->GetName() == _T("disabled") ||
-        node->GetName() == _T("selected")))
+       parent->GetAttribute(_T("class"), _T("")) == _T("wxBitmapButton") &&
+       (name == _T("focus") ||
+        name == _T("disabled") ||
+        name == _T("hover") ||
+        name == _T("selected")))

        return true;
 
    // wxBitmap or wxIcon toplevel resources:
        return true;
 
    // wxBitmap or wxIcon toplevel resources:

-   if (node->GetName() == _T("object"))
+   if ( name == _T("object") )

    {
    {

-       wxString klass = node->GetPropVal(_T("class"), wxEmptyString);
-       if (klass == _T("wxBitmap") || klass == _T("wxIcon"))
+       wxString klass = node->GetAttribute(_T("class"), wxEmptyString);
+       if (klass == _T("wxBitmap") ||
+               klass == _T("wxIcon") ||
+                klass == _T("data") )

            return true;
    }
 
            return true;
    }
 

+   // URLs in wxHtmlWindow:
+   if ( name == _T("url") &&
+        parent != NULL &&
+        parent->GetAttribute(_T("class"), _T("")) == _T("wxHtmlWindow") )
+   {
+       // FIXME: this is wrong for e.g. http:// URLs
+       return true;
+   }
+

    return false;
 }
 
    return false;
 }
 


@@ -472,7 +537,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
 
 void XmlResApp::DeleteTempFiles(const wxArrayString& flist)
 {
 
 void XmlResApp::DeleteTempFiles(const wxArrayString& flist)
 {

-    for (size_t i = 0; i < flist.Count(); i++)
+    for (size_t i = 0; i < flist.GetCount(); i++)

         wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]);
 }
 
         wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]);
 }
 


@@ -482,7 +547,7 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
 {
     wxString files;
 
 {
     wxString files;
 

-    for (size_t i = 0; i < flist.Count(); i++)
+    for (size_t i = 0; i < flist.GetCount(); i++)

         files += flist[i] + _T(" ");
     files.RemoveLast();
 
         files += flist[i] + _T(" ");
     files.RemoveLast();
 


@@ -492,8 +557,8 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
     wxString cwd = wxGetCwd();
     wxSetWorkingDirectory(parOutputPath);
     int execres = wxExecute(_T("zip -9 -j ") +
     wxString cwd = wxGetCwd();
     wxSetWorkingDirectory(parOutputPath);
     int execres = wxExecute(_T("zip -9 -j ") +

-                            wxString(flagVerbose ? _T("") : _T("-q ")) +
-                            parOutput + _T(" ") + files, true);
+                            wxString(flagVerbose ? _T("\"") : _T("-q \"")) +
+                            parOutput + _T("\" ") + files, true);

     wxSetWorkingDirectory(cwd);
     if (execres == -1)
     {
     wxSetWorkingDirectory(cwd);
     if (execres == -1)
     {


@@ -512,7 +577,12 @@ static wxString FileToCppArray(wxString filename, int num)
     wxString tmp;
     wxString snum;
     wxFFile file(filename, wxT("rb"));
     wxString tmp;
     wxString snum;
     wxFFile file(filename, wxT("rb"));

-    size_t lng = file.Length();
+    wxFileOffset offset = file.Length();
+    wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
+
+    const size_t lng = wx_truncate_cast(size_t, offset);
+    wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset,
+                  wxT("Huge file not supported") );

 
     snum.Printf(_T("%i"), num);
     output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);
 
     snum.Printf(_T("%i"), num);
     output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);


@@ -552,57 +622,83 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
     if (flagVerbose)
         wxPrintf(_T("creating C++ source file ") + parOutput +  _T("...\n"));
 
     if (flagVerbose)
         wxPrintf(_T("creating C++ source file ") + parOutput +  _T("...\n"));
 

-    file.Write(_T("")
-_T("//\n")
-_T("// This file was automatically generated by wxrc, do not edit by hand.\n")
-_T("//\n\n")
-_T("#include <wx/wxprec.h>\n")
-_T("\n")
-_T("#ifdef __BORLANDC__\n")
-_T("    #pragma hdrstop\n")
-_T("#endif\n")
-_T("\n")
-_T("")
-_T("#include <wx/filesys.h>\n")
-_T("#include <wx/fs_mem.h>\n")
-_T("#include <wx/xrc/xmlres.h>\n")
-_T("#include <wx/xrc/xh_all.h>\n")
-_T("\n"));
-
-    for (i = 0; i < flist.Count(); i++)
+    file.Write(""
+"//\n"
+"// This file was automatically generated by wxrc, do not edit by hand.\n"
+"//\n\n"
+"#include <wx/wxprec.h>\n"
+"\n"
+"#ifdef __BORLANDC__\n"
+"    #pragma hdrstop\n"
+"#endif\n"
+"\n"
+""
+"#include <wx/filesys.h>\n"
+"#include <wx/fs_mem.h>\n"
+"#include <wx/xrc/xmlres.h>\n"
+"#include <wx/xrc/xh_all.h>\n"
+"\n"
+"#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805\n"
+"    #define XRC_ADD_FILE(name, data, size, mime) \\\n"
+"        wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)\n"
+"#else\n"
+"    #define XRC_ADD_FILE(name, data, size, mime) \\\n"
+"        wxMemoryFSHandler::AddFile(name, data, size)\n"
+"#endif\n"
+"\n");
+
+    for (i = 0; i < flist.GetCount(); i++)

         file.Write(
               FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
 
         file.Write(
               FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
 

-    file.Write(_T("")
-_T("void ") + parFuncname + wxT("()\n")
-_T("{\n")
-_T("\n")
-_T("    // Check for memory FS. If not present, load the handler:\n")
-_T("    {\n")
-_T("        wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n")
-_T("        wxFileSystem fsys;\n")
-_T("        wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n")
-_T("        wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n")
-_T("        if (f) delete f;\n")
-_T("        else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n")
-_T("    }\n")
-_T("\n"));
-
-    for (i = 0; i < flist.Count(); i++)
+    file.Write(""
+"void " + parFuncname + "()\n"
+"{\n"
+"\n"
+"    // Check for memory FS. If not present, load the handler:\n"
+"    {\n"
+"        wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n"
+"        wxFileSystem fsys;\n"
+"        wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n"
+"        wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n"
+"        if (f) delete f;\n"
+"        else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n"
+"    }\n"
+"\n");
+
+    for (i = 0; i < flist.GetCount(); i++)

     {
         wxString s;
     {
         wxString s;

-        s.Printf(_T("    wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] +
-                 _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i);
+
+        wxString mime;
+        wxString ext = wxFileName(flist[i]).GetExt();
+        if ( ext.Lower() == _T("xrc") )
+            mime = _T("text/xml");
+#if wxUSE_MIMETYPE
+        else
+        {
+            wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
+            if ( ft )
+            {
+                ft->GetMimeType(&mime);
+                delete ft;
+            }
+        }
+#endif // wxUSE_MIMETYPE
+
+        s.Printf("    XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] +
+                 "\"), xml_res_file_%i, xml_res_size_%i, _T(\"%s\"));\n",
+                 i, i, mime.c_str());

         file.Write(s);
     }
 
         file.Write(s);
     }
 

-    for (i = 0; i < parFiles.Count(); i++)
+    for (i = 0; i < parFiles.GetCount(); i++)

     {
     {

-        file.Write(_T("    wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
-                   GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
+        file.Write("    wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/" +
+                   GetInternalFileName(parFiles[i], flist) + "\"));\n");

     }
 
     }
 

-    file.Write(_T("}\n"));
+    file.Write("}\n");

 
 
 }
 
 
 }


@@ -614,19 +710,19 @@ void XmlResApp::GenCPPHeader()
 
     wxFFile file(heaFileName, wxT("wt"));
     file.Write(
 
     wxFFile file(heaFileName, wxT("wt"));
     file.Write(

-_T("//\n")
-_T("// This file was automatically generated by wxrc, do not edit by hand.\n")
-_T("//\n\n")
-_T("#ifndef __")  + fileSpec + _T("_h__\n")
-_T("#define __")  + fileSpec + _T("_h__\n")
+"//\n"
+"// This file was automatically generated by wxrc, do not edit by hand.\n"
+"//\n\n"
+"#ifndef __"  + fileSpec + "_h__\n"
+"#define __"  + fileSpec + "_h__\n"

 );
 );

-    for(size_t i=0;i<aXRCWndClassData.Count();++i){
+    for(size_t i=0;i<aXRCWndClassData.GetCount();++i){

                 aXRCWndClassData.Item(i).GenerateHeaderCode(file);
     }
     file.Write(
                 aXRCWndClassData.Item(i).GenerateHeaderCode(file);
     }
     file.Write(

-                _T("\nvoid \n")
+                "\nvoid \n"

                 + parFuncname
                 + parFuncname

-                + _T("();\n#endif\n"));
+                + "();\n#endif\n");

 }
 
 static wxString FileToPythonArray(wxString filename, int num)
 }
 
 static wxString FileToPythonArray(wxString filename, int num)


@@ -635,10 +731,15 @@ static wxString FileToPythonArray(wxString filename, int num)
     wxString tmp;
     wxString snum;
     wxFFile file(filename, wxT("rb"));
     wxString tmp;
     wxString snum;
     wxFFile file(filename, wxT("rb"));

-    size_t lng = file.Length();
+    wxFileOffset offset = file.Length();
+    wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
+
+    const size_t lng = wx_truncate_cast(size_t, offset);
+    wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset,
+                  wxT("Huge file not supported") );

 
     snum.Printf(_T("%i"), num);
 
     snum.Printf(_T("%i"), num);

-    output = _T("    xml_res_file_") + snum + _T(" = '''\\\n");
+    output = "    xml_res_file_" + snum + " = '''\\\n";

 
     unsigned char *buffer = new unsigned char[lng];
     file.Read(buffer, lng);
 
     unsigned char *buffer = new unsigned char[lng];
     file.Read(buffer, lng);


@@ -683,56 +784,56 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist)
         wxPrintf(_T("creating Python source file ") + parOutput +  _T("...\n"));
 
     file.Write(
         wxPrintf(_T("creating Python source file ") + parOutput +  _T("...\n"));
 
     file.Write(

-       _T("#\n")
-       _T("# This file was automatically generated by wxrc, do not edit by hand.\n")
-       _T("#\n\n")
-       _T("import wx\n")
-       _T("import wx.xrc\n\n")
+       "#\n"
+       "# This file was automatically generated by wxrc, do not edit by hand.\n"
+       "#\n\n"
+       "import wx\n"
+       "import wx.xrc\n\n"

     );
 
 
     );
 
 

-    file.Write(_T("def ") + parFuncname + _T("():\n"));
+    file.Write("def " + parFuncname + "():\n");

 
 

-    for (i = 0; i < flist.Count(); i++)
+    for (i = 0; i < flist.GetCount(); i++)

         file.Write(
           FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
 
         file.Write(
           FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
 

-    file.Write(        
-        _T("    # check if the memory filesystem handler has been loaded yet, and load it if not\n")
-        _T("    wx.MemoryFSHandler.AddFile('XRC_resource/dummy_file', 'dummy value')\n")
-        _T("    fsys = wx.FileSystem()\n")
-        _T("    f = fsys.OpenFile('memory:XRC_resource/dummy_file')\n")
-        _T("    wx.MemoryFSHandler.RemoveFile('XRC_resource/dummy_file')\n")
-        _T("    if f is not None:\n")
-        _T("        f.Destroy()\n")
-        _T("    else:\n")
-        _T("        wx.FileSystem.AddHandler(wx.MemoryFSHandler())\n")
-        _T("\n")
-        _T("    # load all the strings as memory files and load into XmlRes\n")
+    file.Write(
+        "    # check if the memory filesystem handler has been loaded yet, and load it if not\n"
+        "    wx.MemoryFSHandler.AddFile('XRC_resource/dummy_file', 'dummy value')\n"
+        "    fsys = wx.FileSystem()\n"
+        "    f = fsys.OpenFile('memory:XRC_resource/dummy_file')\n"
+        "    wx.MemoryFSHandler.RemoveFile('XRC_resource/dummy_file')\n"
+        "    if f is not None:\n"
+        "        f.Destroy()\n"
+        "    else:\n"
+        "        wx.FileSystem.AddHandler(wx.MemoryFSHandler())\n"
+        "\n"
+        "    # load all the strings as memory files and load into XmlRes\n"

         );
 
         );
 

-    
-    for (i = 0; i < flist.Count(); i++)
+
+    for (i = 0; i < flist.GetCount(); i++)

     {
         wxString s;
     {
         wxString s;

-        s.Printf(_T("    wx.MemoryFSHandler.AddFile('XRC_resource/") + flist[i] +
-                 _T("', xml_res_file_%i)\n"), i);
+        s.Printf("    wx.MemoryFSHandler.AddFile('XRC_resource/" + flist[i] +
+                 "', xml_res_file_%i)\n", i);

         file.Write(s);
     }
         file.Write(s);
     }

-    for (i = 0; i < parFiles.Count(); i++)
+    for (i = 0; i < parFiles.GetCount(); i++)

     {
     {

-        file.Write(_T("    wx.xrc.XmlResource.Get().Load('memory:XRC_resource/") +
-                   GetInternalFileName(parFiles[i], flist) + _T("')\n"));
+        file.Write("    wx.xrc.XmlResource.Get().Load('memory:XRC_resource/" +
+                   GetInternalFileName(parFiles[i], flist) + "')\n");

     }
 
     }
 

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

 }
 
 
 
 void XmlResApp::OutputGettext()
 {
 }
 
 
 
 void XmlResApp::OutputGettext()
 {

-    wxArrayString str = FindStrings();
+    ExtractedStrings str = FindStrings();

 
     wxFFile fout;
     if (parOutput.empty())
 
     wxFFile fout;
     if (parOutput.empty())


@@ -740,19 +841,25 @@ void XmlResApp::OutputGettext()
     else
         fout.Open(parOutput, wxT("wt"));
 
     else
         fout.Open(parOutput, wxT("wt"));
 

-    for (size_t i = 0; i < str.GetCount(); i++)
-        fout.Write(_T("_(\"") + str[i] + _T("\");\n"));
+    for (ExtractedStrings::const_iterator i = str.begin(); i != str.end(); ++i)
+    {
+        wxString s;
+
+        s.Printf("#line %d \"%s\"\n", i->lineNo, i->filename);
+        fout.Write(s);
+        fout.Write("_(\"" + i->str + "\");\n");
+    }

 
     if (!parOutput) fout.Detach();
 }
 
 
 
 
     if (!parOutput) fout.Detach();
 }
 
 
 

-wxArrayString XmlResApp::FindStrings()
+ExtractedStrings XmlResApp::FindStrings()

 {
 {

-    wxArrayString arr, a2;
+    ExtractedStrings arr, a2;

 
 

-    for (size_t i = 0; i < parFiles.Count(); i++)
+    for (size_t i = 0; i < parFiles.GetCount(); i++)

     {
         if (flagVerbose)
             wxPrintf(_T("processing ") + parFiles[i] +  _T("...\n"));
     {
         if (flagVerbose)
             wxPrintf(_T("processing ") + parFiles[i] +  _T("...\n"));


@@ -764,7 +871,8 @@ wxArrayString XmlResApp::FindStrings()
             retCode = 1;
             continue;
         }
             retCode = 1;
             continue;
         }

-        a2 = FindStrings(doc.GetRoot());
+        a2 = FindStrings(parFiles[i], doc.GetRoot());
+

         WX_APPEND_ARRAY(arr, a2);
     }
 
         WX_APPEND_ARRAY(arr, a2);
     }
 


@@ -811,9 +919,10 @@ static wxString ConvertText(const wxString& str)
 }
 
 
 }
 
 

-wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
+ExtractedStrings
+XmlResApp::FindStrings(const wxString& filename, wxXmlNode *node)

 {
 {

-    wxArrayString arr;
+    ExtractedStrings arr;

 
     wxXmlNode *n = node;
     if (n == NULL) return arr;
 
     wxXmlNode *n = node;
     if (n == NULL) return arr;


@@ -840,16 +949,24 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
             // ...and known to contain translatable string
         {
             if (!flagGettext ||
             // ...and known to contain translatable string
         {
             if (!flagGettext ||

-                node->GetPropVal(_T("translate"), _T("1")) != _T("0"))
+                node->GetAttribute(_T("translate"), _T("1")) != _T("0"))

             {
             {

-                arr.Add(ConvertText(n->GetContent()));
+                arr.push_back
+                    (
+                        ExtractedString
+                        (
+                            ConvertText(n->GetContent()),
+                            filename,
+                            n->GetLineNumber()
+                        )
+                    );

             }
         }
 
         // subnodes:
         if (n->GetType() == wxXML_ELEMENT_NODE)
         {
             }
         }
 
         // subnodes:
         if (n->GetType() == wxXML_ELEMENT_NODE)
         {

-            wxArrayString a2 = FindStrings(n);
+            ExtractedStrings a2 = FindStrings(filename, n);

             WX_APPEND_ARRAY(arr, a2);
         }
 
             WX_APPEND_ARRAY(arr, a2);
         }