X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..7608a6837f5cee96f31972bc69c8af24f51641b5:/utils/wxrc/wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index ff536b0ef8..ea2c0ffe9c 100644
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
@@ -20,39 +20,125 @@
     #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
-    #include "wx/wx.h"
+    #include "wx/app.h"
+    #include "wx/log.h"
 #endif
 
 #include "wx/cmdline.h"
-#include "wx/xrc/xml.h"
+#include "wx/xml/xml.h"
 #include "wx/ffile.h"
+#include "wx/filename.h"
 #include "wx/wfstream.h"
 
 
+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;
+    ArrayOfXRCWidgetData m_wdata;
+    
+    void BrowseXmlNode(wxXmlNode* node)
+    {
+        wxString classValue;
+        wxString nameValue;
+        wxXmlNode* children;    
+        while (node)
+        {
+            if (node->GetName() == _T("object")
+                && node->GetPropVal(_T("class"),&classValue)
+                && node->GetPropVal(_T("name"),&nameValue))
+            {
+                m_wdata.Add(XRCWidgetData(nameValue,classValue));
+            }
+            children = node->GetChildren();
+            if (children)
+                    BrowseXmlNode(children);    
+            node = node->GetNext();
+        }
+    }
+    
+public:
+    XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) :
+        m_className(className) , m_parentClassName(parentClassName) { 
+                        
+        BrowseXmlNode(node->GetChildren());
+                
+    }
+                
+    const ArrayOfXRCWidgetData& GetWidgetData(){
+        return m_wdata;
+    }
+    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){
+            const XRCWidgetData& w = m_wdata.Item(i);
+            file.Write(
+                _T(" ") + w.GetClass() + _T("* ") + w.GetName()
+                + _T(";\n"));
+        }
+        file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(){\n")
+                   _T("  wxXmlResource::Get()->LoadObject(this,NULL,\"")
+                   +  m_className 
+                   +  _T("\",\"")
+                   +  m_parentClassName 
+                   +  _T("\");\n"));       
+        for(i=0;i<m_wdata.Count();++i){
+            const XRCWidgetData& w = m_wdata.Item(i);
+            file.Write( _T("  ") 
+                        + w.GetName() 
+                        + _T(" = XRCCTRL(*this,\"")
+                        + w.GetName() 
+                        + _T("\",")
+                        + w.GetClass()
+                        + _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_DEFINE_OBJARRAY(ArrayOfXRCWndClassData);
 
 
-/*
-#if wxUSE_GUI
-#error "You must compile the resource compiler with wxBase!"
-#endif
-*/
-
-class XmlResApp : public wxApp
+class XmlResApp : public wxAppConsole
 {
 public:
-
-#if wxUSE_GUI
-    bool OnInit();
-#else
+    // don't use builtin cmd line parsing:
+    virtual bool OnInit() { return true; } 
     virtual int OnRun();
-#endif
-    
-private:
     
+private:   
     void ParseParams(const wxCmdLineParser& cmdline);
     void CompileRes();
     wxArrayString PrepareTempFiles();
@@ -72,21 +158,22 @@ private:
     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()
-#endif
 {
     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)") },
@@ -108,7 +195,10 @@ int XmlResApp::OnRun()
     {
         case -1:
             return 0;
+            #if 0
+            // break is unreachable because of return earlier
             break;
+            #endif
 
         case 0:
             retCode = 0;
@@ -117,21 +207,20 @@ int XmlResApp::OnRun()
                 OutputGettext();
             else
                 CompileRes();
-#if wxUSE_GUI
-            return FALSE;
-#else
             return retCode;
-#endif
+            #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:
-#if wxUSE_GUI
-            return FALSE;
-#else
             return 1;
-#endif
             break;
+        #endif
     }
+    return 1;
 }
 
 
@@ -143,6 +232,8 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
     flagVerbose = cmdline.Found(_T("v"));
     flagCPP = cmdline.Found(_T("c"));
     flagPython = cmdline.Found(_T("p"));
+    flagH = flagCPP && cmdline.Found(_T("e"));
+
 
     if (!cmdline.Found(_T("o"), &parOutput)) 
     {
@@ -158,14 +249,31 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
                 parOutput = _T("resource.xrs");
         }
     }
-    parOutputPath = wxPathOnly(parOutput);
+    if (!parOutput.empty())
+    {
+        wxFileName fn(parOutput);
+        fn.Normalize();
+        parOutput = fn.GetFullPath();
+        parOutputPath = wxPathOnly(parOutput);
+    }
     if (!parOutputPath) parOutputPath = _T(".");
 
     if (!cmdline.Found(_T("n"), &parFuncname)) 
         parFuncname = _T("InitXmlResource");
 
     for (size_t i = 0; i < cmdline.GetParamCount(); i++)
+    {
+#ifdef __WINDOWS__
+        wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);
+        while (!fn.IsEmpty())
+        {
+            parFiles.Add(fn);
+            fn=wxFindNextFile();
+        }
+#else
         parFiles.Add(cmdline.GetParam(i));
+#endif
+    }
 }
 
 
@@ -179,8 +287,11 @@ void XmlResApp::CompileRes()
 
     if (!retCode)
     {        
-        if (flagCPP)
+        if (flagCPP){
             MakePackageCPP(files);
+            if (flagH)
+                GenCPPHeader();
+        }
         else if (flagPython)
             MakePackagePython(files);
         else
@@ -236,10 +347,25 @@ wxArrayString XmlResApp::PrepareTempFiles()
         wxSplitPath(parFiles[i], &path, &name, &ext);
 
         FindFilesInXML(doc.GetRoot(), flist, path);
-
+        if (flagH)
+        {
+            wxXmlNode* node = (doc.GetRoot())->GetChildren();
+                wxString classValue,nameValue;
+                while(node){
+                    if(node->GetName() == _T("object")
+                     && node->GetPropVal(_T("class"),&classValue)
+                     && node->GetPropVal(_T("name"),&nameValue)){
+
+                      aXRCWndClassData.Add(
+                        XRCWndClassData(nameValue,classValue,node)
+                      );
+                    }
+                    node = node -> GetNext();
+            }
+        }
         wxString internalName = GetInternalFileName(parFiles[i], flist);
         
-        doc.Save(parOutputPath + _T("/") + internalName);
+        doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName);
         flist.Add(internalName);
     }
     
@@ -247,6 +373,36 @@ wxArrayString XmlResApp::PrepareTempFiles()
 }
 
 
+// Does 'node' contain filename information at all?
+static bool NodeContainsFilename(wxXmlNode *node)
+{
+   // Any bitmaps:
+   if (node->GetName() == _T("bitmap"))
+       return TRUE;
+
+   // URLs in wxHtmlWindow:
+   if (node->GetName() == _T("url"))
+       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")))
+       return TRUE;
+   
+   // wxBitmap or wxIcon toplevel resources:
+   if (node->GetName() == _T("object"))
+   {
+       wxString klass = node->GetPropVal(_T("class"), wxEmptyString);
+       if (klass == _T("wxBitmap") || klass == _T("wxIcon"))
+           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)
@@ -255,19 +411,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
     if (node == NULL) return;
     if (node->GetType() != wxXML_ELEMENT_NODE) return;
 
-    // Does 'node' contain filename information at all?
-    bool containsFilename = (
-        // Any bitmaps:
-        (node->GetName() == _T("bitmap")) ||
-        // URLs in wxHtmlWindow:
-        (node->GetName() == _T("url")) ||
-        // wxBitmapButton:
-        (node->GetParent() != NULL && 
-         node->GetParent()->GetPropVal(_T("class"), _T("")) == _T("wxBitmapButton") &&
-           (node->GetName() == _T("focus") || 
-            node->GetName() == _T("disabled") ||
-            node->GetName() == _T("selected")))
-        );
+    bool containsFilename = NodeContainsFilename(node);
 
     wxXmlNode *n = node->GetChildren();
     while (n)
@@ -280,7 +424,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
             if (wxIsAbsolutePath(n->GetContent()) || inputPath.empty())
                 fullname = n->GetContent();
             else
-                fullname = inputPath + _T("/") + n->GetContent();
+                fullname = inputPath + wxFILE_SEP_PATH + n->GetContent();
 
             if (flagVerbose) 
                 wxPrintf(_T("adding     ") + fullname +  _T("...\n"));
@@ -292,7 +436,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
                 flist.Add(filename);
 
             wxFileInputStream sin(fullname);
-            wxFileOutputStream sout(parOutputPath + _T("/") + filename);
+            wxFileOutputStream sout(parOutputPath + wxFILE_SEP_PATH + filename);
             sin.Read(sout); // copy the stream
         }
 
@@ -309,7 +453,7 @@ void XmlResApp::FindFilesInXML(wxXmlNode *node, wxArrayString& flist, const wxSt
 void XmlResApp::DeleteTempFiles(const wxArrayString& flist)
 {
     for (size_t i = 0; i < flist.Count(); i++)
-        wxRemoveFile(parOutputPath + _T("/") + flist[i]);
+        wxRemoveFile(parOutputPath + wxFILE_SEP_PATH + flist[i]);
 }
 
 
@@ -324,9 +468,14 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
     
     if (flagVerbose) 
         wxPrintf(_T("compressing ") + parOutput +  _T("...\n"));
-
-    if (wxExecute(_T("zip -9 -j ") + wxString(flagVerbose ? _T("") : _T("-q ")) + 
-                  parOutput + _T(" ") + files, TRUE) == -1)
+    
+    wxString cwd = wxGetCwd();
+    wxSetWorkingDirectory(parOutputPath);
+    int execres = wxExecute(_T("zip -9 -j ") + 
+                            wxString(flagVerbose ? _T("") : _T("-q ")) + 
+                            parOutput + _T(" ") + files, TRUE);
+    wxSetWorkingDirectory(cwd);
+    if (execres == -1)
     {
         wxLogError(_T("Unable to execute zip program. Make sure it is in the path."));
         wxLogError(_T("You can download it at http://www.cdrom.com/pub/infozip/"));
@@ -337,13 +486,12 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
 
 
 
-
 static wxString FileToCppArray(wxString filename, int num)
 {
     wxString output;
     wxString tmp;
     wxString snum;
-    wxFFile file(filename, "rb");
+    wxFFile file(filename, wxT("rb"));
     size_t lng = file.Length();
     
     snum.Printf(_T("%i"), num);
@@ -378,7 +526,7 @@ static wxString FileToCppArray(wxString filename, int num)
 
 void XmlResApp::MakePackageCPP(const wxArrayString& flist)
 {
-    wxFFile file(parOutput, "wt");
+    wxFFile file(parOutput, wxT("wt"));
     size_t i;
 
     if (flagVerbose) 
@@ -405,18 +553,19 @@ _T("#include <wx/xrc/xh_all.h>\n")
 _T("\n"));
 
     for (i = 0; i < flist.Count(); i++)
-        file.Write(FileToCppArray(flist[i], i));
+        file.Write(
+              FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
     
     file.Write(_T("")
-_T("void " + parFuncname + "()\n")
+_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(\"XRC_resource/dummy_file\", \"dummy one\");\n")
+_T("        wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n")
 _T("        wxFileSystem fsys;\n")
-_T("        wxFSFile *f = fsys.OpenFile(\"memory:XRC_resource/dummy_file\");\n")
-_T("        wxMemoryFSHandler::RemoveFile(\"XRC_resource/dummy_file\");\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")
@@ -425,15 +574,15 @@ _T("\n"));
     for (i = 0; i < flist.Count(); i++)
     {
         wxString s;
-        s.Printf(_T("    wxMemoryFSHandler::AddFile(\"XRC_resource/") + flist[i] +
-                 _T("\", xml_res_file_%i, xml_res_size_%i);\n"), i, i);
+        s.Printf(_T("    wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/") + flist[i] +
+                 _T("\"), xml_res_file_%i, xml_res_size_%i);\n"), i, i);
         file.Write(s);
     }
 
     for (i = 0; i < parFiles.Count(); i++)
     {
-        file.Write(_T("    wxXmlResource::Get()->Load(\"memory:XRC_resource/") + 
-                   GetInternalFileName(parFiles[i], flist) + _T("\");\n"));
+        file.Write(_T("    wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
+                   GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
     }
     
     file.Write(_T("}\n"));
@@ -441,12 +590,34 @@ _T("\n"));
 
 }
 
+void XmlResApp::GenCPPHeader()
+{
+    wxString fileSpec = (parOutput.BeforeLast('.')).AfterLast('/');
+    wxString heaFileName = fileSpec + _T(".h");
+        
+    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")
+);      
+    for(size_t i=0;i<aXRCWndClassData.Count();++i){
+                aXRCWndClassData.Item(i).GenerateHeaderCode(file);              
+    } 
+    file.Write(
+                _T("\nvoid \n")
+                + parFuncname
+                + _T("();\n#endif\n"));
+}
+
 static wxString FileToPythonArray(wxString filename, int num)
 {
     wxString output;
     wxString tmp;
     wxString snum;
-    wxFFile file(filename, "rb");
+    wxFFile file(filename, wxT("rb"));
     size_t lng = file.Length();
     
     snum.Printf(_T("%i"), num);
@@ -488,7 +659,7 @@ static wxString FileToPythonArray(wxString filename, int num)
 
 void XmlResApp::MakePackagePython(const wxArrayString& flist)
 {
-    wxFFile file(parOutput, "wt");
+    wxFFile file(parOutput, wxT("wt"));
     size_t i;
 
     if (flagVerbose) 
@@ -506,7 +677,8 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist)
     file.Write(_T("def ") + parFuncname + _T("():\n"));
 
     for (i = 0; i < flist.Count(); i++)
-        file.Write(FileToPythonArray(flist[i], i));
+        file.Write(
+          FileToPythonArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
 
     for (i = 0; i < flist.Count(); i++)
     {
@@ -523,8 +695,10 @@ void XmlResApp::OutputGettext()
     wxArrayString str = FindStrings();
     
     wxFFile fout;
-    if (!parOutput) fout.Attach(stdout);
-    else fout.Open(parOutput, "wt");
+    if (parOutput.empty())
+        fout.Attach(stdout);
+    else
+        fout.Open(parOutput, wxT("wt"));
     
     for (size_t i = 0; i < str.GetCount(); i++)
         fout.Write(_T("_(\"") + str[i] + _T("\");\n"));