X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76ee04978931bcd1c570ac63833baeb25e506446..084ad0c2424aa998a640c151f8fa762435364449:/utils/wxrc/wxrc.cpp diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index 46703402d9..8ac5aaef2f 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -8,11 +8,6 @@ // 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" @@ -31,7 +26,10 @@ #include "wx/ffile.h" #include "wx/filename.h" #include "wx/wfstream.h" +#include "wx/utils.h" +#include "wx/hashset.h" +WX_DECLARE_HASH_SET(wxString, wxStringHash, wxStringEqual, StringSet); class XRCWidgetData { @@ -44,15 +42,17 @@ private: wxString m_class; wxString m_name; }; + #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; + StringSet m_ancestorClassNames; ArrayOfXRCWidgetData m_wdata; void BrowseXmlNode(wxXmlNode* node) @@ -76,21 +76,45 @@ private: } 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()); - } - const ArrayOfXRCWidgetData& GetWidgetData(){ + const ArrayOfXRCWidgetData& GetWidgetData() + { return m_wdata; } bool IsRealClass(const wxString& name) { - if (name == _T("tool") || name == _T("unknown") || - name == _T("notebookpage") || name == _T("separator") || + if (name == _T("tool") || + name == _T("unknown") || + name == _T("notebookpage") || + name == _T("separator") || name == _T("sizeritem") || name == _T("wxMenuItem")) { @@ -98,7 +122,7 @@ public: } return true; } - + void GenerateHeaderCode(wxFFile& file) { @@ -108,47 +132,69 @@ public: for(i=0;iLoadObject(this,NULL,\"") + file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(wxWindow *parent){\n") + _T(" wxXmlResource::Get()->LoadObject(this,parent,_T(\"") + m_className - + _T("\",\"") + + _T("\"), _T(\"") + m_parentClassName - + _T("\");\n")); + + _T("\"));\n")); for(i=0;iGetName() == _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; + + if ( name == _T("icon") ) return true; // URLs in wxHtmlWindow: - if (node->GetName() == _T("url")) + if ( name == _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"))) + (name == _T("focus") || + name == _T("disabled") || + name == _T("selected"))) 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")) @@ -492,8 +528,8 @@ void XmlResApp::MakePackageZIP(const wxArrayString& flist) 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) { @@ -512,7 +548,11 @@ static wxString FileToCppArray(wxString filename, int num) 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( 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); @@ -562,9 +602,6 @@ _T("#ifdef __BORLANDC__\n") _T(" #pragma hdrstop\n") _T("#endif\n") _T("\n") -_T("#ifndef WX_PRECOMP\n") -_T(" #include \n") -_T("#endif\n") _T("") _T("#include \n") _T("#include \n") @@ -638,10 +675,14 @@ static wxString FileToPythonArray(wxString filename, int num) 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( offset == lng, wxT("Huge file not supported") ); snum.Printf(_T("%i"), num); - output = _T(" xml_res_file_") + snum + _T(" = \"\"\"\\\n"); + output = _T(" xml_res_file_") + snum + _T(" = '''\\\n"); unsigned char *buffer = new unsigned char[lng]; file.Read(buffer, lng); @@ -654,7 +695,7 @@ static wxString FileToPythonArray(wxString filename, int num) tmp = (wxChar)c; linelng = 0; } - else if (c < 32 || c > 127) + else if (c < 32 || c > 127 || c == '\'') tmp.Printf(_T("\\x%02x"), c); else if (c == '\\') tmp = _T("\\\\"); @@ -671,7 +712,7 @@ static wxString FileToPythonArray(wxString filename, int num) delete[] buffer; - output += _T("\"\"\"\n\n"); + output += _T("'''\n\n"); return output; } @@ -689,8 +730,8 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist) _T("#\n") _T("# This file was automatically generated by wxrc, do not edit by hand.\n") _T("#\n\n") - _T("from wxPython.wx import *\n") - _T("from wxPython.xrc import *\n\n") + _T("import wx\n") + _T("import wx.xrc\n\n") ); @@ -700,12 +741,35 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist) 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") + ); + + for (i = 0; i < flist.Count(); i++) { wxString s; - s.Printf(_T(" wxXmlResource_Get().LoadFromString(xml_res_file_%i)\n"), i); + s.Printf(_T(" wx.MemoryFSHandler.AddFile('XRC_resource/") + flist[i] + + _T("', xml_res_file_%i)\n"), i); file.Write(s); } + for (i = 0; i < parFiles.Count(); i++) + { + file.Write(_T(" wx.xrc.XmlResource.Get().Load('memory:XRC_resource/") + + GetInternalFileName(parFiles[i], flist) + _T("')\n")); + } + + file.Write(_T("\n")); } @@ -819,7 +883,11 @@ wxArrayString XmlResApp::FindStrings(wxXmlNode *node) )) // ...and known to contain translatable string { - arr.Add(ConvertText(n->GetContent())); + if (!flagGettext || + node->GetPropVal(_T("translate"), _T("1")) != _T("0")) + { + arr.Add(ConvertText(n->GetContent())); + } } // subnodes: