AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compilation due to wxCmdLineEntryDesc changes once again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48752 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-09-17 14:37:12 +00:00
parent a9a56347b8
commit db51a209d7
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
utils/wxrc/wxrc.cpp
View File

@ -241,19 +241,18 @@ int XmlResApp::OnRun()
{ {
static const wxCmdLineEntryDesc cmdLineDesc[] = static const wxCmdLineEntryDesc cmdLineDesc[] =
{ {
{ wxCMD_LINE_SWITCH, _T("h"), _T("help"), _T("show help message"), { wxCMD_LINE_SWITCH, "h", "help", "show help message", wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" },
{ wxCMD_LINE_SWITCH, _T("v"), _T("verbose"), _T("be verbose"), (wxCmdLineParamType)0, 0 }, { wxCMD_LINE_SWITCH, "e", "extra-cpp-code", "output C++ header file with XRC derived classes" },
{ wxCMD_LINE_SWITCH, _T("e"), _T("extra-cpp-code"), _T("output C++ header file with XRC derived classes"), (wxCmdLineParamType)0, 0 }, { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" },
{ wxCMD_LINE_SWITCH, _T("c"), _T("cpp-code"), _T("output C++ source rather than .rsc file"), (wxCmdLineParamType)0, 0 }, { wxCMD_LINE_SWITCH, "p", "python-code", "output wxPython source rather than .rsc file" },
{ wxCMD_LINE_SWITCH, _T("p"), _T("python-code"), _T("output wxPython source rather than .rsc file"), (wxCmdLineParamType)0, 0 }, { wxCMD_LINE_SWITCH, "g", "gettext", "output list of translatable strings (to stdout or file if -o used)" },
{ 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, "n", "function", "C++/Python function name (with -c or -p) [InitXmlResource]" },
{ wxCMD_LINE_OPTION, _T("n"), _T("function"), _T("C++/Python function name (with -c or -p) [InitXmlResource]"), (wxCmdLineParamType)0, 0 }, { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" },
{ wxCMD_LINE_OPTION, _T("o"), _T("output"), _T("output file [resource.xrs/cpp]"), (wxCmdLineParamType)0, 0 },
#if 0 // not yet implemented #if 0 // not yet implemented
{ wxCMD_LINE_OPTION, _T("l"), _T("list-of-handlers"), _T("output list of necessary handlers to this file"), (wxCmdLineParamType)0, 0 }, { wxCMD_LINE_OPTION, "l", "list-of-handlers", "output list of necessary handlers to this file" },
#endif #endif
{ wxCMD_LINE_PARAM, NULL, NULL, _T("input file(s)"), { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)",
wxCMD_LINE_VAL_STRING, wxCMD_LINE_VAL_STRING,
wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY }, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
@ -284,14 +283,14 @@ int XmlResApp::OnRun()
void XmlResApp::ParseParams(const wxCmdLineParser& cmdline) void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
{ {
flagGettext = cmdline.Found(_T("g")); flagGettext = cmdline.Found("g");
flagVerbose = cmdline.Found(_T("v")); flagVerbose = cmdline.Found("v");
flagCPP = cmdline.Found(_T("c")); flagCPP = cmdline.Found("c");
flagPython = cmdline.Found(_T("p")); flagPython = cmdline.Found("p");
flagH = flagCPP && cmdline.Found(_T("e")); flagH = flagCPP && cmdline.Found("e");
if (!cmdline.Found(_T("o"), &parOutput)) if (!cmdline.Found("o", &parOutput))
{ {
if (flagGettext) if (flagGettext)
parOutput = wxEmptyString; parOutput = wxEmptyString;
@ -314,7 +313,7 @@ void XmlResApp::ParseParams(const wxCmdLineParser& cmdline)
} }
if (!parOutputPath) parOutputPath = _T("."); if (!parOutputPath) parOutputPath = _T(".");
if (!cmdline.Found(_T("n"), &parFuncname)) if (!cmdline.Found("n", &parFuncname))
parFuncname = _T("InitXmlResource"); parFuncname = _T("InitXmlResource");
for (size_t i = 0; i < cmdline.GetParamCount(); i++) for (size_t i = 0; i < cmdline.GetParamCount(); i++)