made the code a bit more readable by not using _T() around to-be-generated code snippets
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46533 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -599,49 +599,49 @@ void XmlResApp::MakePackageCPP(const wxArrayString& flist)
|
||||
if (flagVerbose)
|
||||
wxPrintf(_T("creating C++ source file ") + parOutput + _T("...\n"));
|
||||
|
||||
file.Write(_T("")
|
||||
_T("//\n")
|
||||
_T("// This file was automatically generated by wxrc, do not edit by hand.\n")
|
||||
_T("//\n\n")
|
||||
_T("#include <wx/wxprec.h>\n")
|
||||
_T("\n")
|
||||
_T("#ifdef __BORLANDC__\n")
|
||||
_T(" #pragma hdrstop\n")
|
||||
_T("#endif\n")
|
||||
_T("\n")
|
||||
_T("")
|
||||
_T("#include <wx/filesys.h>\n")
|
||||
_T("#include <wx/fs_mem.h>\n")
|
||||
_T("#include <wx/xrc/xmlres.h>\n")
|
||||
_T("#include <wx/xrc/xh_all.h>\n")
|
||||
_T("\n")
|
||||
_T("#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805\n")
|
||||
_T(" #define XRC_ADD_FILE(name, data, size, mime) \\\n")
|
||||
_T(" wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)\n")
|
||||
_T("#else\n")
|
||||
_T(" #define XRC_ADD_FILE(name, data, size, mime) \\\n")
|
||||
_T(" wxMemoryFSHandler::AddFile(name, data, size)\n")
|
||||
_T("#endif\n")
|
||||
_T("\n"));
|
||||
file.Write(""
|
||||
"//\n"
|
||||
"// This file was automatically generated by wxrc, do not edit by hand.\n"
|
||||
"//\n\n"
|
||||
"#include <wx/wxprec.h>\n"
|
||||
"\n"
|
||||
"#ifdef __BORLANDC__\n"
|
||||
" #pragma hdrstop\n"
|
||||
"#endif\n"
|
||||
"\n"
|
||||
""
|
||||
"#include <wx/filesys.h>\n"
|
||||
"#include <wx/fs_mem.h>\n"
|
||||
"#include <wx/xrc/xmlres.h>\n"
|
||||
"#include <wx/xrc/xh_all.h>\n"
|
||||
"\n"
|
||||
"#if wxCHECK_VERSION(2,8,5) && wxABI_VERSION >= 20805\n"
|
||||
" #define XRC_ADD_FILE(name, data, size, mime) \\\n"
|
||||
" wxMemoryFSHandler::AddFileWithMimeType(name, data, size, mime)\n"
|
||||
"#else\n"
|
||||
" #define XRC_ADD_FILE(name, data, size, mime) \\\n"
|
||||
" wxMemoryFSHandler::AddFile(name, data, size)\n"
|
||||
"#endif\n"
|
||||
"\n");
|
||||
|
||||
for (i = 0; i < flist.GetCount(); i++)
|
||||
file.Write(
|
||||
FileToCppArray(parOutputPath + wxFILE_SEP_PATH + flist[i], i));
|
||||
|
||||
file.Write(_T("")
|
||||
_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(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n")
|
||||
_T(" wxFileSystem fsys;\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")
|
||||
_T("\n"));
|
||||
file.Write(""
|
||||
"void ") + parFuncname + wxT("()\n"
|
||||
"{\n"
|
||||
"\n"
|
||||
" // Check for memory FS. If not present, load the handler:\n"
|
||||
" {\n"
|
||||
" wxMemoryFSHandler::AddFile(wxT(\"XRC_resource/dummy_file\"), wxT(\"dummy one\"));\n"
|
||||
" wxFileSystem fsys;\n"
|
||||
" wxFSFile *f = fsys.OpenFile(wxT(\"memory:XRC_resource/dummy_file\"));\n"
|
||||
" wxMemoryFSHandler::RemoveFile(wxT(\"XRC_resource/dummy_file\"));\n"
|
||||
" if (f) delete f;\n"
|
||||
" else wxFileSystem::AddHandler(new wxMemoryFSHandler);\n"
|
||||
" }\n"
|
||||
"\n");
|
||||
|
||||
for (i = 0; i < flist.GetCount(); i++)
|
||||
{
|
||||
@@ -658,19 +658,19 @@ _T("\n"));
|
||||
ft->GetMimeType(&mime);
|
||||
}
|
||||
|
||||
s.Printf(_T(" XRC_ADD_FILE(wxT(\"XRC_resource/") + flist[i] +
|
||||
_T("\"), 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",
|
||||
i, i, mime.c_str());
|
||||
file.Write(s);
|
||||
}
|
||||
|
||||
for (i = 0; i < parFiles.GetCount(); i++)
|
||||
{
|
||||
file.Write(_T(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/") +
|
||||
GetInternalFileName(parFiles[i], flist) + _T("\"));\n"));
|
||||
file.Write(" wxXmlResource::Get()->Load(wxT(\"memory:XRC_resource/" +
|
||||
GetInternalFileName(parFiles[i], flist) + "\"));\n");
|
||||
}
|
||||
|
||||
file.Write(_T("}\n"));
|
||||
file.Write("}\n");
|
||||
|
||||
|
||||
}
|
||||
@@ -682,19 +682,19 @@ void XmlResApp::GenCPPHeader()
|
||||
|
||||
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")
|
||||
"//\n"
|
||||
"// This file was automatically generated by wxrc, do not edit by hand.\n"
|
||||
"//\n\n"
|
||||
"#ifndef __") + fileSpec + _T("_h__\n"
|
||||
"#define __") + fileSpec + _T("_h__\n"
|
||||
);
|
||||
for(size_t i=0;i<aXRCWndClassData.GetCount();++i){
|
||||
aXRCWndClassData.Item(i).GenerateHeaderCode(file);
|
||||
}
|
||||
file.Write(
|
||||
_T("\nvoid \n")
|
||||
"\nvoid \n"
|
||||
+ parFuncname
|
||||
+ _T("();\n#endif\n"));
|
||||
+ "();\n#endif\n");
|
||||
}
|
||||
|
||||
static wxString FileToPythonArray(wxString filename, int num)
|
||||
@@ -755,49 +755,49 @@ void XmlResApp::MakePackagePython(const wxArrayString& flist)
|
||||
wxPrintf(_T("creating Python source file ") + parOutput + _T("...\n"));
|
||||
|
||||
file.Write(
|
||||
_T("#\n")
|
||||
_T("# This file was automatically generated by wxrc, do not edit by hand.\n")
|
||||
_T("#\n\n")
|
||||
_T("import wx\n")
|
||||
_T("import wx.xrc\n\n")
|
||||
"#\n"
|
||||
"# This file was automatically generated by wxrc, do not edit by hand.\n"
|
||||
"#\n\n"
|
||||
"import wx\n"
|
||||
"import wx.xrc\n\n"
|
||||
);
|
||||
|
||||
|
||||
file.Write(_T("def ") + parFuncname + _T("():\n"));
|
||||
file.Write("def ") + parFuncname + _T("():\n");
|
||||
|
||||
for (i = 0; i < flist.GetCount(); i++)
|
||||
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")
|
||||
" # check if the memory filesystem handler has been loaded yet, and load it if not\n"
|
||||
" wx.MemoryFSHandler.AddFile('XRC_resource/dummy_file', 'dummy value')\n"
|
||||
" fsys = wx.FileSystem()\n"
|
||||
" f = fsys.OpenFile('memory:XRC_resource/dummy_file')\n"
|
||||
" wx.MemoryFSHandler.RemoveFile('XRC_resource/dummy_file')\n"
|
||||
" if f is not None:\n"
|
||||
" f.Destroy()\n"
|
||||
" else:\n"
|
||||
" wx.FileSystem.AddHandler(wx.MemoryFSHandler())\n"
|
||||
"\n"
|
||||
" # load all the strings as memory files and load into XmlRes\n"
|
||||
);
|
||||
|
||||
|
||||
for (i = 0; i < flist.GetCount(); i++)
|
||||
{
|
||||
wxString s;
|
||||
s.Printf(_T(" wx.MemoryFSHandler.AddFile('XRC_resource/") + flist[i] +
|
||||
_T("', xml_res_file_%i)\n"), i);
|
||||
s.Printf(" wx.MemoryFSHandler.AddFile('XRC_resource/" + flist[i] +
|
||||
"', xml_res_file_%i)\n", i);
|
||||
file.Write(s);
|
||||
}
|
||||
for (i = 0; i < parFiles.GetCount(); i++)
|
||||
{
|
||||
file.Write(_T(" wx.xrc.XmlResource.Get().Load('memory:XRC_resource/") +
|
||||
GetInternalFileName(parFiles[i], flist) + _T("')\n"));
|
||||
file.Write(" wx.xrc.XmlResource.Get().Load('memory:XRC_resource/" +
|
||||
GetInternalFileName(parFiles[i], flist) + "')\n");
|
||||
}
|
||||
|
||||
file.Write(_T("\n"));
|
||||
file.Write("\n");
|
||||
}
|
||||
|
||||
|
||||
@@ -813,7 +813,7 @@ void XmlResApp::OutputGettext()
|
||||
fout.Open(parOutput, wxT("wt"));
|
||||
|
||||
for (size_t i = 0; i < str.GetCount(); i++)
|
||||
fout.Write(_T("_(\"") + str[i] + _T("\");\n"));
|
||||
fout.Write("_(\"") + str[i] + "\");\n";
|
||||
|
||||
if (!parOutput) fout.Detach();
|
||||
}
|
||||
|
Reference in New Issue
Block a user