This should work on SuSE and Mandrake icon themes.

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

diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp
index efac3d2f93cfece588e591b5f8a1f343a6a38fa3..bc4a9df795ebb7692a57f60ee734a4c99a94e7ef 100644 (file)
--- a/contrib/utils/wxrc/wxrc.cpp
+++ b/contrib/utils/wxrc/wxrc.cpp
@@ -1,7 +1,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // 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
 // Created:     2000/03/05
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vaclav Slavik


@@ -20,10 +20,10 @@
     #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"

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


@@ -33,14 +33,112 @@
 #include "wx/wfstream.h"
 
 
 #include "wx/wfstream.h"
 
 

-class XmlResApp : public wxAppConsole
+class XRCWidgetData

 {
 public:
 {
 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);

 
 

-    virtual int OnRun();
+class XRCWndClassData
+{
+private: 
+    wxString m_className;
+    wxString m_parentClassName;
+    ArrayOfXRCWidgetData m_wdata;

     
     

-private:
+    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"));
+               for(size_t 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(size_t 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);
+
+
+class XmlResApp : public wxAppConsole
+{
+public:
+    // don't use builtin cmd line parsing:
+    virtual bool OnInit() { return true; } 
+    virtual int OnRun();
+    
+private:   

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


@@ -60,9 +158,13 @@ private:
     wxString parOutput, parFuncname, parOutputPath;
     wxArrayString parFiles;
     int retCode;
     wxString parOutput, parFuncname, parOutputPath;
     wxArrayString parFiles;
     int retCode;

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

 };
 
 };
 

-IMPLEMENT_APP(XmlResApp)
+IMPLEMENT_APP_CONSOLE(XmlResApp)

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


@@ -71,6 +173,7 @@ int XmlResApp::OnRun()
         { 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("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_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)") },


@@ -92,7 +195,10 @@ int XmlResApp::OnRun()
     {
         case -1:
             return 0;
     {
         case -1:
             return 0;

+            #if 0
+            // break is unreachable because of return earlier

             break;
             break;

+            #endif

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


@@ -102,12 +208,19 @@ int XmlResApp::OnRun()
             else
                 CompileRes();
             return retCode;
             else
                 CompileRes();
             return retCode;

+            #if 0
+            // break is unreachable because of return earlier

             break;
             break;

+            #endif

 
 

+        #if 0
+        // default return moved outside of switch to avoid warning about lack of return in function

         default:
             return 1;
             break;
         default:
             return 1;
             break;

+        #endif

     }
     }

+    return 1;

 }
 
 
 }
 
 


@@ -119,6 +232,8 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
     flagVerbose = cmdline.Found(_T("v"));
     flagCPP = cmdline.Found(_T("c"));
     flagPython = cmdline.Found(_T("p"));
     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)) 
     {
 
     if (!cmdline.Found(_T("o"), &parOutput)) 
     {


@@ -134,10 +249,13 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
                 parOutput = _T("resource.xrs");
         }
     }
                 parOutput = _T("resource.xrs");
         }
     }

-    wxFileName fn(parOutput);
-    fn.Normalize();
-    parOutput = fn.GetFullPath();
-    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)) 
     if (!parOutputPath) parOutputPath = _T(".");
 
     if (!cmdline.Found(_T("n"), &parFuncname)) 


@@ -169,8 +287,11 @@ void XmlResApp::CompileRes()
 
     if (!retCode)
     {        
 
     if (!retCode)
     {        

-        if (flagCPP)
+        if (flagCPP){

             MakePackageCPP(files);
             MakePackageCPP(files);

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

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


@@ -226,7 +347,22 @@ wxArrayString XmlResApp::PrepareTempFiles()
         wxSplitPath(parFiles[i], &path, &name, &ext);
 
         FindFilesInXML(doc.GetRoot(), flist, path);
         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 + wxFILE_SEP_PATH + internalName);
         wxString internalName = GetInternalFileName(parFiles[i], flist);
         
         doc.Save(parOutputPath + wxFILE_SEP_PATH + internalName);


@@ -350,7 +486,6 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist)
 
 
 
 
 
 

-

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


@@ -455,6 +590,28 @@ _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;
 static wxString FileToPythonArray(wxString filename, int num)
 {
     wxString output;


@@ -538,8 +695,10 @@ void XmlResApp::OutputGettext()
     wxArrayString str = FindStrings();
     
     wxFFile fout;
     wxArrayString str = FindStrings();
     
     wxFFile fout;

-    if (!parOutput) fout.Attach(stdout);
-    else fout.Open(parOutput, wxT("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"));
     
     for (size_t i = 0; i < str.GetCount(); i++)
         fout.Write(_T("_(\"") + str[i] + _T("\");\n"));