#include "wx/ffile.h"
#include "wx/filename.h"
#include "wx/wfstream.h"
+#include "wx/utils.h"
class XRCWidgetData
wxString m_class;
wxString m_name;
};
+
#include "wx/arrimpl.cpp"
WX_DECLARE_OBJARRAY(XRCWidgetData,ArrayOfXRCWidgetData);
WX_DEFINE_OBJARRAY(ArrayOfXRCWidgetData);
public:
XRCWndClassData(const wxString& className,const wxString& parentClassName, const wxXmlNode* node) :
- m_className(className) , m_parentClassName(parentClassName) {
-
+ m_className(className) , m_parentClassName(parentClassName)
+ {
BrowseXmlNode(node->GetChildren());
-
}
- const ArrayOfXRCWidgetData& GetWidgetData(){
+ const ArrayOfXRCWidgetData& GetWidgetData()
+ {
return m_wdata;
}
- void GenerateHeaderCode(wxFFile& file){
+
+ bool IsRealClass(const wxString& name)
+ {
+ if (name == _T("tool") ||
+ name == _T("unknown") ||
+ name == _T("notebookpage") ||
+ name == _T("separator") ||
+ name == _T("sizeritem") ||
+ name == _T("wxMenuItem"))
+ {
+ return false;
+ }
+ return true;
+ }
+
+ 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){
+ for(i=0;i<m_wdata.Count();++i)
+ {
const XRCWidgetData& w = m_wdata.Item(i);
+ if( !IsRealClass(w.GetClass()) ) continue;
+ if( w.GetName().Length() == 0 ) continue;
file.Write(
_T(" ") + w.GetClass() + _T("* ") + w.GetName()
+ _T(";\n"));
}
file.Write(_T("\nprivate:\n void InitWidgetsFromXRC(){\n")
- _T(" wxXmlResource::Get()->LoadObject(this,NULL,\"")
+ _T(" wxXmlResource::Get()->LoadObject(this,NULL,_T(\"")
+ m_className
- + _T("\",\"")
+ + _T("\"), _T(\"")
+ m_parentClassName
- + _T("\");\n"));
- for(i=0;i<m_wdata.Count();++i){
+ + _T("\"));\n"));
+ for(i=0;i<m_wdata.Count();++i)
+ {
const XRCWidgetData& w = m_wdata.Item(i);
+ if( !IsRealClass(w.GetClass()) ) continue;
+ if( w.GetName().Length() == 0 ) continue;
file.Write( _T(" ")
+ w.GetName()
+ _T(" = XRCCTRL(*this,\"")
+ _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"));
- };
+ 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);
{
{ 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_OPTION, _T("n"), _T("function"), _T("C++/Python function name (with -c or -p) [InitXmlResource]") },
- { wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file [resource.xrs/cpp]") },
+ { 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 },
#if 0 // not yet implemented
- { wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers", _T("output list of neccessary handlers to this file" },
+ { wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers"), _T("output list of neccessary handlers to this file"), (wxCmdLineParamType)0, 0 },
#endif
{ wxCMD_LINE_PARAM, NULL, NULL, _T("input file(s)"),
wxCMD_LINE_VAL_STRING,
wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
- { wxCMD_LINE_NONE }
+ { wxCMD_LINE_NONE, NULL, NULL, NULL, (wxCmdLineParamType)0, 0 }
};
wxCmdLineParser parser(cmdLineDesc, argc, argv);
{
case -1:
return 0;
- #if 0
- // break is unreachable because of return earlier
- break;
- #endif
case 0:
retCode = 0;
else
CompileRes();
return retCode;
- #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:
- return 1;
- break;
- #endif
}
return 1;
}
{
#ifdef __WINDOWS__
wxString fn=wxFindFirstFile(cmdline.GetParam(i), wxFILE);
- while (!fn.IsEmpty())
+ while (!fn.empty())
{
parFiles.Add(fn);
fn=wxFindNextFile();
if (node->GetName() == _T("bitmap"))
return true;
+ if (node->GetName() == _T("icon"))
+ return true;
+
// URLs in wxHtmlWindow:
if (node->GetName() == _T("url"))
return true;
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)
{
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") );
+ wxASSERT_MSG( offset == wxFileOffset(size_t(offset)) , wxT("Huge file not supported") );
+ size_t lng = (size_t)offset;
snum.Printf(_T("%i"), num);
output.Printf(_T("static size_t xml_res_size_") + snum + _T(" = %i;\n"), lng);
_T(" #pragma hdrstop\n")
_T("#endif\n")
_T("\n")
-_T("#ifndef WX_PRECOMP\n")
-_T(" #include <wx/wx.h>\n")
-_T("#endif\n")
_T("")
_T("#include <wx/filesys.h>\n")
_T("#include <wx/fs_mem.h>\n")
void XmlResApp::GenCPPHeader()
{
- wxString fileSpec = (parOutput.BeforeLast('.')).AfterLast('/');
+ wxString fileSpec = ((parOutput.BeforeLast('.')).AfterLast('/')).AfterLast('\\');
wxString heaFileName = fileSpec + _T(".h");
wxFFile file(heaFileName, wxT("wt"));
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") );
+ wxASSERT_MSG( offset == wxFileOffset(size_t(offset)) , wxT("Huge file not supported") );
+ size_t lng = (size_t)offset;
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);
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("\\\\");
delete[] buffer;
- output += _T("\"\"\"\n\n");
+ output += _T("'''\n\n");
return output;
}
_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")
);
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"));
}
))
// ...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:
projects / wxWidgets.git / blobdiff