No real changes, just spelling fixes to comments. Closes #15030.

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

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index 23b27952a7d38fd2558cc9463019d12baa00f582..8fc4ee0ac57945e9ff65ac90ab70f4b1bd9a3571 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -1,18 +1,13 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wxrc.cpp
 // Purpose:     XML resource compiler
 /////////////////////////////////////////////////////////////////////////////
 // Name:        wxrc.cpp
 // Purpose:     XML resource compiler

-// Author:      Vaclav Slavik
+// Author:      Vaclav Slavik, Eduardo Marques <edrdo@netcabo.pt>

 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik
 // 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"
 


@@ -20,39 +15,219 @@
     #pragma hdrstop
 #endif
 
     #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
+// for all others, include the necessary headers

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/wx.h"
+    #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/wxcrtvararg.h"

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

-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"

 #include "wx/ffile.h"
 #include "wx/ffile.h"

+#include "wx/filename.h"

 #include "wx/wfstream.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
+{
+public:
+    XRCWidgetData(const wxString& vname,const wxString& vclass)
+        : m_class(vclass), m_name(vname)  {}
+    const wxString& GetName() const { return m_name; }
+    const wxString& GetClass() const { return m_class; }
+private:
+    wxString m_class;
+    wxString m_name;
+};

 
 

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

 
 

+class XRCWndClassData
+{
+private:
+    wxString m_className;
+    wxString m_parentClassName;
+    StringSet m_ancestorClassNames;
+    ArrayOfXRCWidgetData m_wdata;

 
 

-/*
-#if wxUSE_GUI
-#error "You must compile the resource compiler with wxBase!"
-#endif
-*/
+    void BrowseXmlNode(wxXmlNode* node)
+    {
+        wxString classValue;
+        wxString nameValue;
+        wxXmlNode* children;
+        while (node)
+        {
+            if (node->GetName() == wxT("object")
+                && node->GetAttribute(wxT("class"),&classValue)
+                && node->GetAttribute(wxT("name"),&nameValue))
+            {
+                m_wdata.Add(XRCWidgetData(nameValue,classValue));
+            }
+            children = node->GetChildren();
+            if (children)
+                    BrowseXmlNode(children);
+            node = node->GetNext();
+        }
+    }

 
 

-class XmlResApp : public wxApp
-{

 public:
 public:

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

 
 

-#if wxUSE_GUI
-    bool OnInit();
-#else
+        BrowseXmlNode(node->GetChildren());
+    }
+
+    const ArrayOfXRCWidgetData& GetWidgetData()
+    {
+        return m_wdata;
+    }
+
+    bool CanBeUsedWithXRCCTRL(const wxString& name)
+    {
+        if (name == wxT("tool") ||
+            name == wxT("data") ||
+            name == wxT("unknown") ||
+            name == wxT("notebookpage") ||
+            name == wxT("separator") ||
+            name == wxT("sizeritem") ||
+            name == wxT("wxMenu") ||
+            name == wxT("wxMenuBar") ||
+            name == wxT("wxMenuItem") ||
+            name.EndsWith(wxT("Sizer")) )
+        {
+            return false;
+        }
+        return true;
+    }
+
+    void GenerateHeaderCode(wxFFile& file)
+    {
+
+        file.Write(wxT("class ") + m_className + wxT(" : public ") + m_parentClassName
+                   + wxT(" {\nprotected:\n"));
+        size_t i;
+        for(i=0;i<m_wdata.GetCount();++i)
+        {
+            const XRCWidgetData& w = m_wdata.Item(i);
+            if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
+            if( w.GetName().empty() ) continue;
+            file.Write(
+                wxT(" ") + w.GetClass() + wxT("* ") + w.GetName()
+                + wxT(";\n"));
+        }
+        file.Write(wxT("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n")
+                   wxT("  wxXmlResource::Get()->LoadObject(this,parent,wxT(\"")
+                   +  m_className
+                   +  wxT("\"), wxT(\"")
+                   +  m_parentClassName
+                   +  wxT("\"));\n"));
+        for(i=0;i<m_wdata.GetCount();++i)
+        {
+            const XRCWidgetData& w = m_wdata.Item(i);
+            if( !CanBeUsedWithXRCCTRL(w.GetClass()) ) continue;
+            if( w.GetName().empty() ) continue;
+            file.Write( wxT("  ")
+                        + w.GetName()
+                        + wxT(" = XRCCTRL(*this,\"")
+                        + w.GetName()
+                        + wxT("\",")
+                        + w.GetClass()
+                        + wxT(");\n"));
+        }
+        file.Write(wxT(" }\n"));
+
+        file.Write( wxT("public:\n"));
+
+        if ( m_ancestorClassNames.size() == 1 )
+        {
+            file.Write
+                 (
+                    m_className +
+                    wxT("(") +
+                        *m_ancestorClassNames.begin() +
+                        wxT(" *parent=NULL){\n") +
+                    wxT("  InitWidgetsFromXRC((wxWindow *)parent);\n")
+                    wxT(" }\n")
+                    wxT("};\n")
+                 );
+        }
+        else
+        {
+            file.Write(m_className + wxT("(){\n") +
+                       wxT("  InitWidgetsFromXRC(NULL);\n")
+                       wxT(" }\n")
+                       wxT("};\n"));
+
+            for ( StringSet::const_iterator it = m_ancestorClassNames.begin();
+                  it != m_ancestorClassNames.end();
+                  ++it )
+            {
+                file.Write(m_className + wxT("(") + *it + wxT(" *parent){\n") +
+                            wxT("  InitWidgetsFromXRC((wxWindow *)parent);\n")
+                            wxT(" }\n")
+                            wxT("};\n"));
+            }
+        }
+    }
+};
+WX_DECLARE_OBJARRAY(XRCWndClassData,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
+{
+public:
+    // don't use builtin cmd line parsing:
+    virtual bool OnInit() { return true; }

     virtual int OnRun();
     virtual int OnRun();

-#endif
-    
+

 private:
 private:

-    

     void ParseParams(const wxCmdLineParser& cmdline);
     void CompileRes();
     wxArrayString PrepareTempFiles();
     void ParseParams(const wxCmdLineParser& cmdline);
     void CompileRes();
     wxArrayString PrepareTempFiles();


@@ -65,41 +240,41 @@ 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;
     wxArrayString parFiles;
     int retCode;
     bool flagVerbose, flagCPP, flagPython, flagGettext;
     wxString parOutput, parFuncname, parOutputPath;
     wxArrayString parFiles;
     int retCode;

+
+    ArrayOfXRCWndClassData aXRCWndClassData;
+        bool flagH;
+        void GenCPPHeader();

 };
 
 };
 

-IMPLEMENT_APP(XmlResApp)
+IMPLEMENT_APP_CONSOLE(XmlResApp)

 
 

-#if wxUSE_GUI
-bool XmlResApp::OnInit()
-#else

 int XmlResApp::OnRun()
 int XmlResApp::OnRun()

-#endif

 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {
 {
     static const wxCmdLineEntryDesc cmdLineDesc[] =
     {

-        { wxCMD_LINE_SWITCH, "h", "help",  "show help message", 
-              wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
+        { 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, "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
         { 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

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

 #endif
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file(s)",
 #endif
         { wxCMD_LINE_PARAM,  NULL, NULL, "input file(s)",

-              wxCMD_LINE_VAL_STRING, 
+              wxCMD_LINE_VAL_STRING,

               wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
 
               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);


@@ -108,7 +283,6 @@ int XmlResApp::OnRun()
     {
         case -1:
             return 0;
     {
         case -1:
             return 0;

-            break;

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


@@ -117,21 +291,9 @@ int XmlResApp::OnRun()
                 OutputGettext();
             else
                 CompileRes();
                 OutputGettext();
             else
                 CompileRes();

-#if wxUSE_GUI
-            return FALSE;
-#else

             return retCode;
             return retCode;

-#endif
-            break;
-
-        default:
-#if wxUSE_GUI
-            return FALSE;
-#else
-            return 1;
-#endif
-            break;

     }
     }

+    return 1;

 }
 
 
 }
 
 


@@ -143,29 +305,48 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
     flagVerbose = cmdline.Found("v");
     flagCPP = cmdline.Found("c");
     flagPython = cmdline.Found("p");
     flagVerbose = cmdline.Found("v");
     flagCPP = cmdline.Found("c");
     flagPython = cmdline.Found("p");

+    flagH = flagCPP && cmdline.Found("e");
+

 
 

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

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

-                parOutput = "resource.cpp";
+                parOutput = wxT("resource.cpp");

             else if (flagPython)
             else if (flagPython)

-                parOutput = "resource.py";
+                parOutput = wxT("resource.py");

             else
             else

-                parOutput = "resource.xrs";
+                parOutput = wxT("resource.xrs");

         }
     }
         }
     }

-    parOutputPath = wxPathOnly(parOutput);
-    if (!parOutputPath) parOutputPath = ".";
+    if (!parOutput.empty())
+    {
+        wxFileName fn(parOutput);
+        fn.Normalize();
+        parOutput = fn.GetFullPath();
+        parOutputPath = wxPathOnly(parOutput);
+    }
+    if (!parOutputPath) parOutputPath = wxT(".");

 
 

-    if (!cmdline.Found("n", &parFuncname)) 
-        parFuncname = "InitXmlResource";
+    if (!cmdline.Found("n", &parFuncname))
+        parFuncname = wxT("InitXmlResource");

 
     for (size_t i = 0; i < cmdline.GetParamCount(); i++)
 
     for (size_t i = 0; i < cmdline.GetParamCount(); i++)

+    {
+#ifdef __WINDOWS__
+        wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);
+        while (!fn.empty())
+        {
+            parFiles.Add(fn);
+            fn=wxFindNextFile();
+        }
+#else

         parFiles.Add(cmdline.GetParam(i));
         parFiles.Add(cmdline.GetParam(i));

+#endif
+    }

 }
 
 
 }
 
 


@@ -178,15 +359,18 @@ void XmlResApp::CompileRes()
     wxRemoveFile(parOutput);
 
     if (!retCode)
     wxRemoveFile(parOutput);
 
     if (!retCode)

-    {        
-        if (flagCPP)
+    {
+        if (flagCPP){

             MakePackageCPP(files);
             MakePackageCPP(files);

+            if (flagH)
+                GenCPPHeader();
+        }

         else if (flagPython)
             MakePackagePython(files);
         else
             MakePackageZIP(files);
     }
         else if (flagPython)
             MakePackagePython(files);
         else
             MakePackageZIP(files);
     }

-        
+

     DeleteTempFiles(files);
 }
 
     DeleteTempFiles(files);
 }
 


@@ -194,19 +378,19 @@ void XmlResApp::CompileRes()
 wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist)
 {
     wxString name2 = name;
 wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayString& flist)
 {
     wxString name2 = name;

-    name2.Replace(":", "_");
-    name2.Replace("/", "_");
-    name2.Replace("\\", "_");
-    name2.Replace("*", "_");
-    name2.Replace("?", "_");
-    
-    wxString s = wxFileNameFromPath(parOutput) + "$" + name2;
+    name2.Replace(wxT(":"), wxT("_"));
+    name2.Replace(wxT("/"), wxT("_"));
+    name2.Replace(wxT("\\"), wxT("_"));
+    name2.Replace(wxT("*"), wxT("_"));
+    name2.Replace(wxT("?"), wxT("_"));
+
+    wxString s = wxFileNameFromPath(parOutput) + wxT("$") + name2;

 
     if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND)
 
     if (wxFileExists(s) && flist.Index(s) == wxNOT_FOUND)

-    {        
+    {

         for (int i = 0;; i++)
         {
         for (int i = 0;; i++)
         {

-            s.Printf(wxFileNameFromPath(parOutput) + "$%03i-" + name2, i);
+            s.Printf(wxFileNameFromPath(parOutput) + wxT("$%03i-") + name2, i);

             if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND)
                 break;
         }
             if (!wxFileExists(s) || flist.Index(s) != wxNOT_FOUND)
                 break;
         }


@@ -217,76 +401,135 @@ wxString XmlResApp::GetInternalFileName(const wxString& name, const wxArrayStrin
 wxArrayString XmlResApp::PrepareTempFiles()
 {
     wxArrayString flist;
 wxArrayString XmlResApp::PrepareTempFiles()
 {
     wxArrayString flist;

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

     {
     {

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

 
         wxXmlDocument doc;
 
         wxXmlDocument doc;

-        
+

         if (!doc.Load(parFiles[i]))
         {
         if (!doc.Load(parFiles[i]))
         {

-            wxLogError("Error parsing file " + parFiles[i]);
+            wxLogError(wxT("Error parsing file ") + parFiles[i]);

             retCode = 1;
             continue;
         }
             retCode = 1;
             continue;
         }

-        
+

         wxString name, ext, path;
         wxString name, ext, path;

-        wxSplitPath(parFiles[i], &path, &name, &ext);
+        wxFileName::SplitPath(parFiles[i], &path, &name, &ext);

 
         FindFilesInXML(doc.GetRoot(), flist, path);
 
         FindFilesInXML(doc.GetRoot(), flist, path);

-
+        if (flagH)
+        {
+            wxXmlNode* node = (doc.GetRoot())->GetChildren();
+                wxString classValue,nameValue;
+                while(node){
+                    if(node->GetName() == wxT("object")
+                     && node->GetAttribute(wxT("class"),&classValue)
+                     && node->GetAttribute(wxT("name"),&nameValue)){
+
+                      aXRCWndClassData.Add(
+                        XRCWndClassData(nameValue,classValue,node)
+                      );
+                    }
+                    node = node -> GetNext();
+            }
+        }

         wxString internalName = GetInternalFileName(parFiles[i], flist);
         wxString internalName = GetInternalFileName(parFiles[i], flist);

-        
-        doc.Save(parOutputPath + "/" + internalName);
+
+        doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName);

         flist.Add(internalName);
     }
         flist.Add(internalName);
     }

-    
+

     return flist;
 }
 
 
     return flist;
 }
 
 

+// Does 'node' contain filename information at all?
+static bool NodeContainsFilename(wxXmlNode *node)
+{
+   const wxString name = node->GetName();
+
+   // Any bitmaps (bitmap2 is used for disabled toolbar buttons):
+   if ( name == wxT("bitmap") || name == wxT("bitmap2") )
+       return true;
+
+   if ( name == wxT("icon") )
+       return true;
+
+   // wxBitmapButton:
+   wxXmlNode *parent = node->GetParent();
+   if (parent != NULL &&
+       parent->GetAttribute(wxT("class"), wxT("")) == wxT("wxBitmapButton") &&
+       (name == wxT("focus") ||
+        name == wxT("disabled") ||
+        name == wxT("hover") ||
+        name == wxT("selected")))
+       return true;
+
+   // wxBitmap or wxIcon toplevel resources:
+   if ( name == wxT("object") )
+   {
+       wxString klass = node->GetAttribute(wxT("class"), wxEmptyString);
+       if (klass == wxT("wxBitmap") ||
+               klass == wxT("wxIcon") ||
+                klass == wxT("data") )
+           return true;
+   }
+
+   // URLs in wxHtmlWindow:
+   if ( name == wxT("url") &&
+        parent != NULL &&
+        parent->GetAttribute(wxT("class"), wxT("")) == wxT("wxHtmlWindow") )
+   {
+       // FIXME: this is wrong for e.g. http:// URLs
+       return true;
+   }
+
+   return false;
+}

 
 // find all files mentioned in structure, e.g. <bitmap>filename</bitmap>
 void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath)
 {
 
 // find all files mentioned in structure, e.g. <bitmap>filename</bitmap>
 void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxString& inputPath)
 {

-    wxXmlNode *n = node;
-    if (n == NULL) return;
-    n = n->GetChildren();
-    
+    // Is 'node' XML node element?
+    if (node == NULL) return;
+    if (node->GetType() != wxXML_ELEMENT_NODE) return;
+
+    bool containsFilename = NodeContainsFilename(node);
+
+    wxXmlNode *n = node->GetChildren();

     while (n)
     {
     while (n)
     {

-        if ((node->GetType() == wxXML_ELEMENT_NODE) &&
-            // parent is an element, i.e. has subnodes...
-            (n->GetType() == wxXML_TEXT_NODE || 
-            n->GetType() == wxXML_CDATA_SECTION_NODE) &&
-            // ...it is textnode...
-            ((node/*not n!*/->GetName() == "bitmap") ||
-             (node/*not n!*/->GetName() == "url")))
-            // ...and known to contain filename
+        if (containsFilename &&
+            (n->GetType() == wxXML_TEXT_NODE ||
+             n->GetType() == wxXML_CDATA_SECTION_NODE))

         {
             wxString fullname;
         {
             wxString fullname;

-            if (wxIsAbsolutePath(n->GetContent()) || inputPath == "") fullname = n->GetContent();
-            else fullname = inputPath + "/" + n->GetContent();
+            if (wxIsAbsolutePath(n->GetContent()) || inputPath.empty())
+                fullname = n->GetContent();
+            else
+                fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
+
+            if (flagVerbose)
+                wxPrintf(wxT("adding     ") + fullname +  wxT("...\n"));

 
 

-            if (flagVerbose) 
-                wxPrintf("adding     " + fullname +  "...\n");
-            

             wxString filename = GetInternalFileName(n->GetContent(), flist);
             n->SetContent(filename);
 
             wxString filename = GetInternalFileName(n->GetContent(), flist);
             n->SetContent(filename);
 

-            flist.Add(filename);
+            if (flist.Index(filename) == wxNOT_FOUND)
+                flist.Add(filename);

 
             wxFileInputStream sin(fullname);
 
             wxFileInputStream sin(fullname);

-            wxFileOutputStream sout(parOutputPath + "/" + filename);
+            wxFileOutputStream sout(parOutputPath + wxFILE_SEP_PATH + filename);

             sin.Read(sout); // copy the stream
         }
             sin.Read(sout); // copy the stream
         }

-        
+

         // subnodes:
         if (n->GetType() == wxXML_ELEMENT_NODE)
             FindFilesInXML(n, flist, inputPath);
         // subnodes:
         if (n->GetType() == wxXML_ELEMENT_NODE)
             FindFilesInXML(n, flist, inputPath);

-        
+

         n = n->GetNext();
     }
 }
         n = n->GetNext();
     }
 }


@@ -295,8 +538,8 @@ 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++)
-        wxRemoveFile(parOutputPath + "/" + flist[i]);
+    for (size_t i = 0; i < flist.GetCount(); i++)
+        wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]);

 }
 
 
 }
 
 


@@ -304,19 +547,24 @@ void XmlResApp::DeleteTempFiles(const wxArrayString& flist)
 void XmlResApp::MakePackageZIP(const wxArrayString& flist)
 {
     wxString files;
 void XmlResApp::MakePackageZIP(const wxArrayString& flist)
 {
     wxString files;

-    
-    for (size_t i = 0; i < flist.Count(); i++)
-        files += flist[i] + " ";
+
+    for (size_t i = 0; i < flist.GetCount(); i++)
+        files += flist[i] + wxT(" ");

     files.RemoveLast();
     files.RemoveLast();

-    
-    if (flagVerbose) 
-        wxPrintf("compressing " + parOutput +  "...\n");

 
 

-    if (wxExecute("zip -9 -j " + wxString(flagVerbose ? "" : "-q ") + 
-                  parOutput + " " + files, TRUE) == -1)
+    if (flagVerbose)
+        wxPrintf(wxT("compressing ") + parOutput +  wxT("...\n"));
+
+    wxString cwd = wxGetCwd();
+    wxSetWorkingDirectory(parOutputPath);
+    int execres = wxExecute(wxT("zip -9 -j ") +
+                            wxString(flagVerbose ? wxT("\"") : wxT("-q \"")) +
+                            parOutput + wxT("\" ") + files, true);
+    wxSetWorkingDirectory(cwd);
+    if (execres == -1)

     {
     {

-        wxLogError("Unable to execute zip program. Make sure it is in the path.");
-        wxLogError("You can download it at http://www.cdrom.com/pub/infozip/");
+        wxLogError(wxT("Unable to execute zip program. Make sure it is in the path."));
+        wxLogError(wxT("You can download it at http://www.cdrom.com/pub/infozip/"));

         retCode = 1;
         return;
     }
         retCode = 1;
         return;
     }


@@ -324,124 +572,181 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
 
 
 
 
 
 

-

 static wxString FileToCppArray(wxString filename, int num)
 {
     wxString output;
     wxString tmp;
     wxString snum;
 static wxString FileToCppArray(wxString filename, int num)
 {
     wxString output;
     wxString tmp;
     wxString snum;

-    wxFFile file(filename, "rb");
-    size_t lng = file.Length();
-    
-    snum.Printf("%i", num);
-    output.Printf("static size_t xml_res_size_" + snum + " = %i;\n", lng);
-    output += "static unsigned char xml_res_file_" + snum + "[] = {\n";
+    wxFFile file(filename, wxT("rb"));
+    wxFileOffset offset = file.Length();
+    wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
+
+    const size_t lng = wx_truncate_cast(size_t, offset);
+    wxASSERT_MSG( static_cast<wxFileOffset>(lng) == offset,
+                  wxT("Huge file not supported") );
+
+    snum.Printf(wxT("%i"), num);
+    output.Printf(wxT("static size_t xml_res_size_") + snum + wxT(" = %lu;\n"),
+                  static_cast<unsigned long>(lng));
+    output += wxT("static unsigned char xml_res_file_") + snum + wxT("[] = {\n");

     // we cannot use string literals because MSVC is dumb wannabe compiler
     // with arbitrary limitation to 2048 strings :(
     // we cannot use string literals because MSVC is dumb wannabe compiler
     // with arbitrary limitation to 2048 strings :(

-    
+

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

-    
+

     for (size_t i = 0, linelng = 0; i < lng; i++)
     {
     for (size_t i = 0, linelng = 0; i < lng; i++)
     {

-        tmp.Printf("%i", buffer[i]);
-        if (i != 0) output << ',';
+        tmp.Printf(wxT("%i"), buffer[i]);
+        if (i != 0) output << wxT(',');

         if (linelng > 70)
         {
             linelng = 0;
         if (linelng > 70)
         {
             linelng = 0;

-            output << "\n";
+            output << wxT("\n");

         }
         output << tmp;
         linelng += tmp.Length()+1;
     }
         }
         output << tmp;
         linelng += tmp.Length()+1;
     }

-    
+

     delete[] buffer;
     delete[] buffer;

-    
-    output += "};\n\n";
-    
+
+    output += wxT("};\n\n");
+

     return output;
 }
 
 
 void XmlResApp::MakePackageCPP(const wxArrayString& flist)
 {
     return output;
 }
 
 
 void XmlResApp::MakePackageCPP(const wxArrayString& flist)
 {

-    wxFFile file(parOutput, "wt");
-    size_t i;
-
-    if (flagVerbose) 
-        wxPrintf("creating C++ source file " + parOutput +  "...\n");
-    
-    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\
-#ifndef WX_PRECOMP\n\
-    #include <wx/wx.h>\n\
-#endif\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");
-
-    for (i = 0; i < flist.Count(); i++)
-        file.Write(FileToCppArray(flist[i], i));
-    
-    file.Write("\
-void " + parFuncname + "()\n\
-{\n\
-\n\
-    // Check for memory FS. If not present, load the handler:\n\
-    {\n\
-        wxMemoryFSHandler::AddFile(\"XRC_resource/dummy_file\", \"dummy one\");\n\
-        wxFileSystem fsys;\n\
-        wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n\
-        wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\n\
-        if (f) delete f;\n\
-        else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n\
-    }\n\
-\n");
-
-    for (i = 0; i < flist.Count(); i++)
+    wxFFile file(parOutput, wxT("wt"));
+    unsigned i;
+
+    if (flagVerbose)
+        wxPrintf(wxT("creating C++ source file ") + parOutput +  wxT("...\n"));
+
+    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(""
+"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("    wxMemoryFSHandler::AddFile(\"XRC_resource/" + flist[i] +
-                 "\", xml_res_file_%i, xml_res_size_%i);\n", i, i);
+
+        wxString mime;
+        wxString ext = wxFileName(flist[i]).GetExt();
+        if ( ext.Lower() == wxT("xrc") )
+            mime = wxT("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_%u, xml_res_size_%u, wxT(\"%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("    wxXmlResource::Get()->Load(\"memory:XRC_resource/" + 
-                   GetInternalFileName(parFiles[i], flist) + "\");\n");
+        file.Write("    wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/" +
+                   GetInternalFileName(parFiles[i], flist) + "\"));\n");

     }
     }

-    
+

     file.Write("}\n");
 
 
 }
 
     file.Write("}\n");
 
 
 }
 

+void XmlResApp::GenCPPHeader()
+{
+    // Generate the output header in the same directory as the source file.
+    wxFileName headerName(parOutput);
+    headerName.SetExt("h");
+
+    wxFFile file(headerName.GetFullPath(), wxT("wt"));
+    file.Write(
+"//\n"
+"// This file was automatically generated by wxrc, do not edit by hand.\n"
+"//\n\n"
+"#ifndef __"  + headerName.GetName() + "_h__\n"
+"#define __"  + headerName.GetName() + "_h__\n"
+);
+    for(size_t i=0;i<aXRCWndClassData.GetCount();++i){
+                aXRCWndClassData.Item(i).GenerateHeaderCode(file);
+    }
+    file.Write(
+                "\nvoid \n"
+                + parFuncname
+                + "();\n#endif\n");
+}
+

 static wxString FileToPythonArray(wxString filename, int num)
 {
     wxString output;
     wxString tmp;
     wxString snum;
 static wxString FileToPythonArray(wxString filename, int num)
 {
     wxString output;
     wxString tmp;
     wxString snum;

-    wxFFile file(filename, "rb");
-    size_t lng = file.Length();
-    
-    snum.Printf("%i", num);
-    output = "    xml_res_file_" + snum + " = \"\"\"\\\n";
-    
+    wxFFile file(filename, wxT("rb"));
+    wxFileOffset offset = file.Length();
+    wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
+
+    const size_t lng = wx_truncate_cast(size_t, offset);
+    wxASSERT_MSG( static_cast<wxFileOffset>(lng) == offset,
+                  wxT("Huge file not supported") );
+
+    snum.Printf(wxT("%i"), num);
+    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);

-    
+

     for (size_t i = 0, linelng = 0; i < lng; i++)
     {
         unsigned char c = buffer[i];
     for (size_t i = 0, linelng = 0; i < lng; i++)
     {
         unsigned char c = buffer[i];


@@ -450,97 +755,133 @@ static wxString FileToPythonArray(wxString filename, int num)
             tmp = (wxChar)c;
             linelng = 0;
         }
             tmp = (wxChar)c;
             linelng = 0;
         }

-        else if (c < 32 || c > 127)
-            tmp.Printf("\\x%02x", c);
+        else if (c < 32 || c > 127 || c == '\'')
+            tmp.Printf(wxT("\\x%02x"), c);

         else if (c == '\\')
         else if (c == '\\')

-            tmp = "\\\\";
+            tmp = wxT("\\\\");

         else
             tmp = (wxChar)c;
         if (linelng > 70)
         {
             linelng = 0;
         else
             tmp = (wxChar)c;
         if (linelng > 70)
         {
             linelng = 0;

-            output << "\\\n";
+            output << wxT("\\\n");

         }
         output << tmp;
         linelng += tmp.Length();
     }
         }
         output << tmp;
         linelng += tmp.Length();
     }

-    
+

     delete[] buffer;
     delete[] buffer;

-    
-    output += "\"\"\"\n\n";
-    
+
+    output += wxT("'''\n\n");
+

     return output;
 }
 
 
 void XmlResApp::MakePackagePython(const wxArrayString& flist)
 {
     return output;
 }
 
 
 void XmlResApp::MakePackagePython(const wxArrayString& flist)
 {

-    wxFFile file(parOutput, "wt");
-    size_t i;
+    wxFFile file(parOutput, wxT("wt"));
+    unsigned i;
+
+    if (flagVerbose)
+        wxPrintf(wxT("creating Python source file ") + parOutput +  wxT("...\n"));

 
 

-    if (flagVerbose) 
-        wxPrintf("creating Python source file " + parOutput +  "...\n");
-    

     file.Write(
        "#\n"
        "# This file was automatically generated by wxrc, do not edit by hand.\n"
        "#\n\n"
     file.Write(
        "#\n"
        "# This file was automatically generated by wxrc, do not edit by hand.\n"
        "#\n\n"

-       "from wxPython.wx import *\n"
-       "from wxPython.xrc import *\n\n"
+       "import wx\n"
+       "import wx.xrc\n\n"

     );
 
     );
 

-    
+

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

-    for (i = 0; i < flist.Count(); i++)
-        file.Write(FileToPythonArray(flist[i], i));
+    for (i = 0; i < flist.GetCount(); i++)
+        file.Write(
+          FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));

 
 

-    for (i = 0; i < flist.Count(); i++)
+    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.GetCount(); i++)

     {
         wxString s;
     {
         wxString s;

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

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

+    for (i = 0; i < parFiles.GetCount(); i++)
+    {
+        file.Write("    wx.xrc.XmlResource.Get().Load('memory:XRC_resource/" +
+                   GetInternalFileName(parFiles[i], flist) + "')\n");
+    }
+
+    file.Write("\n");

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

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

     wxFFile fout;
     wxFFile fout;

-    if (!parOutput) fout.Attach(stdout);
-    else fout.Open(parOutput, _T("wt"));
-    
-    for (size_t i = 0; i < str.GetCount(); i++)
-        fout.Write(_T("_(\"") + str[i] + _T("\");\n"));
-    
+    if (parOutput.empty())
+        fout.Attach(stdout);
+    else
+        fout.Open(parOutput, wxT("wt"));
+
+    for (ExtractedStrings::const_iterator i = str.begin(); i != str.end(); ++i)
+    {
+        const wxFileName filename(i->filename);
+
+        wxString s;
+        s.Printf("#line %d \"%s\"\n",
+                 i->lineNo, filename.GetFullPath(wxPATH_UNIX));
+
+        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("processing " + parFiles[i] +  "...\n");
+        if (flagVerbose)
+            wxPrintf(wxT("processing ") + parFiles[i] +  wxT("...\n"));

 
 

-        wxXmlDocument doc;        
+        wxXmlDocument doc;

         if (!doc.Load(parFiles[i]))
         {
         if (!doc.Load(parFiles[i]))
         {

-            wxLogError("Error parsing file " + parFiles[i]);
+            wxLogError(wxT("Error parsing file ") + parFiles[i]);

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

-    
+

     return arr;
 }
 
     return arr;
 }
 


@@ -555,19 +896,27 @@ static wxString ConvertText(const wxString& str)
     {
         if (*dt == wxT('_'))
         {
     {
         if (*dt == wxT('_'))
         {

-            if ( *(++dt) == wxT('_') )
+            if ( *(dt+1) == 0 )
+                str2 << wxT('_');
+            else if ( *(++dt) == wxT('_') )

                 str2 << wxT('_');
             else
                 str2 << wxT('&') << *dt;
         }
                 str2 << wxT('_');
             else
                 str2 << wxT('&') << *dt;
         }

-        else 
+        else

         {
             switch (*dt)
             {
                 case wxT('\n') : str2 << wxT("\\n"); break;
                 case wxT('\t') : str2 << wxT("\\t"); break;
                 case wxT('\r') : str2 << wxT("\\r"); break;
         {
             switch (*dt)
             {
                 case wxT('\n') : str2 << wxT("\\n"); break;
                 case wxT('\t') : str2 << wxT("\\t"); break;
                 case wxT('\r') : str2 << wxT("\\r"); break;

-                case wxT('\\') : str2 << wxT("\\\\"); break;
+                case wxT('\\') : if ((*(dt+1) != 'n') &&
+                                     (*(dt+1) != 't') &&
+                                     (*(dt+1) != 'r'))
+                                     str2 << wxT("\\\\");
+                                 else
+                                     str2 << wxT("\\");
+                                 break;

                 case wxT('"')  : str2 << wxT("\\\""); break;
                 default        : str2 << *dt; break;
             }
                 case wxT('"')  : str2 << wxT("\\\""); break;
                 default        : str2 << *dt; break;
             }


@@ -578,44 +927,64 @@ 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;
     n = n->GetChildren();
 
     wxXmlNode *n = node;
     if (n == NULL) return arr;
     n = n->GetChildren();

-    
+

     while (n)
     {
         if ((node->GetType() == wxXML_ELEMENT_NODE) &&
             // parent is an element, i.e. has subnodes...
     while (n)
     {
         if ((node->GetType() == wxXML_ELEMENT_NODE) &&
             // parent is an element, i.e. has subnodes...

-            (n->GetType() == wxXML_TEXT_NODE || 
+            (n->GetType() == wxXML_TEXT_NODE ||

             n->GetType() == wxXML_CDATA_SECTION_NODE) &&
             // ...it is textnode...
             (
             n->GetType() == wxXML_CDATA_SECTION_NODE) &&
             // ...it is textnode...
             (

-                node/*not n!*/->GetName() == _T("label") ||
-                (node/*not n!*/->GetName() == _T("value") &&
+                node/*not n!*/->GetName() == wxT("label") ||
+                (node/*not n!*/->GetName() == wxT("value") &&

                                !n->GetContent().IsNumber()) ||
                                !n->GetContent().IsNumber()) ||

-                node/*not n!*/->GetName() == _T("help") ||
-                node/*not n!*/->GetName() == _T("longhelp") ||
-                node/*not n!*/->GetName() == _T("tooltip") ||
-                node/*not n!*/->GetName() == _T("htmlcode") ||
-                node/*not n!*/->GetName() == _T("title") ||
-                node/*not n!*/->GetName() == _T("item")
+                node/*not n!*/->GetName() == wxT("help") ||
+                node/*not n!*/->GetName() == wxT("longhelp") ||
+                node/*not n!*/->GetName() == wxT("tooltip") ||
+                node/*not n!*/->GetName() == wxT("htmlcode") ||
+                node/*not n!*/->GetName() == wxT("title") ||
+                node/*not n!*/->GetName() == wxT("item") ||
+                node/*not n!*/->GetName() == wxT("message") ||
+                node/*not n!*/->GetName() == wxT("note") ||
+                node/*not n!*/->GetName() == wxT("defaultdirectory") ||
+                node/*not n!*/->GetName() == wxT("defaultfilename") ||
+                node/*not n!*/->GetName() == wxT("defaultfolder") ||
+                node/*not n!*/->GetName() == wxT("filter") ||
+                node/*not n!*/->GetName() == wxT("caption")

             ))
             // ...and known to contain translatable string
         {
             ))
             // ...and known to contain translatable string
         {

-            arr.Add(ConvertText(n->GetContent()));
+            if (!flagGettext ||
+                node->GetAttribute(wxT("translate"), wxT("1")) != wxT("0"))
+            {
+                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);
         }

-        
+

         n = n->GetNext();
     }
     return arr;
         n = n->GetNext();
     }
     return arr;