compilation fix for !wxUSE_THREADS

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

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index aa5e0476a17a96eca0594c9b3729be55f7d8a755..3894c54a92a668e440260f54d29bd6181f7bfc21 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -30,6 +30,7 @@
 #include "wx/utils.h"
 #include "wx/hashset.h"
 #include "wx/mimetype.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);
 
 
 WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet);
 


@@ -201,6 +202,22 @@ public:
 WX_DECLARE_OBJARRAY(XRCWndClassData,ArrayOfXRCWndClassData);
 WX_DEFINE_OBJARRAY(ArrayOfXRCWndClassData)
 
 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
 {
 
 class XmlResApp : public wxAppConsole
 {


@@ -222,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;


@@ -241,19 +258,18 @@ 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"), (wxCmdLineParamType)0, 0 },
-        { wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"),  _T("output C++ header file with XRC derived classes"), (wxCmdLineParamType)0, 0 },
-        { wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"),  _T("output C++ source rather than .rsc file"), (wxCmdLineParamType)0, 0 },
-        { wxCMD_LINE_SWITCH, _T("p"), _T("python-code"),  _T("output wxPython source rather than .rsc file"), (wxCmdLineParamType)0, 0 },
-        { wxCMD_LINE_SWITCH, _T("g"), _T("gettext"),  _T("output list of translatable strings (to stdout or file if -o used)"), (wxCmdLineParamType)0, 0 },
-        { wxCMD_LINE_OPTION, _T("n"), _T("function"),  _T("C++/Python function name (with -c or -p) [InitXmlResource]"), (wxCmdLineParamType)0, 0 },
-        { wxCMD_LINE_OPTION, _T("o"), _T("output"),  _T("output file [resource.xrs/cpp]"), (wxCmdLineParamType)0, 0 },
+        { 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 necessary handlers to this file"), (wxCmdLineParamType)0, 0 },
+        { 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 },
 


@@ -284,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;


@@ -314,7 +330,7 @@ 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++)
         parFuncname = _T("InitXmlResource");
 
     for (size_t i = 0; i < cmdline.GetParamCount(); i++)


@@ -657,12 +673,17 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
         wxString ext = wxFileName(flist[i]).GetExt();
         if ( ext.Lower() == _T("xrc") )
             mime = _T("text/xml");
         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 )
         else
         {
             wxFileType *ft = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
             if ( ft )

+            {

                 ft->GetMimeType(&mime);
                 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",
 
         s.Printf("    XRC_ADD_FILE(wxT(\"XRC_resource/" + flist[i] +
                  "\"), xml_res_file_%i, xml_res_size_%i, _T(\"%s\"));\n",


@@ -810,7 +831,7 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist)
 
 void XmlResApp::OutputGettext()
 {
 
 void XmlResApp::OutputGettext()
 {

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

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


@@ -818,17 +839,23 @@ 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("_(\"" + str[i] + "\");\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.GetCount(); i++)
     {
 
     for (size_t i = 0; i < parFiles.GetCount(); i++)
     {


@@ -842,7 +869,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);
     }
 


@@ -889,9 +917,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;


@@ -920,14 +949,22 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node)
             if (!flagGettext ||
                 node->GetAttribute(_T("translate"), _T("1")) != _T("0"))
             {
             if (!flagGettext ||
                 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);
         }