From 99cd20beb9d35d043192392b68b7e1580889427a Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 2 Jul 2002 22:06:00 +0000 Subject: [PATCH] fixed cmd line args parsing in wxrc (contributed patch) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16012 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/utils/wxrc/wxrc.cpp | 12 ++++++++---- utils/wxrc/wxrc.cpp | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/contrib/utils/wxrc/wxrc.cpp b/contrib/utils/wxrc/wxrc.cpp index be111857cd..34a25c872e 100644 --- a/contrib/utils/wxrc/wxrc.cpp +++ b/contrib/utils/wxrc/wxrc.cpp @@ -83,22 +83,26 @@ int XmlResApp::OnRun() { static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, "h", "help", "show help message" }, + { wxCMD_LINE_SWITCH, "h", "help", "show help message", + wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" }, { wxCMD_LINE_SWITCH, "g", "gettext", "output list of translatable strings (to stdout or file if -o used)" }, { wxCMD_LINE_OPTION, "n", "function", "C++ function name (with -c) [InitXmlResource]" }, { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" }, +#if 0 // not yet implemented { wxCMD_LINE_OPTION, "l", "list-of-handlers", "output list of neccessary handlers to this file" }, - +#endif { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)", - wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, + wxCMD_LINE_VAL_STRING, + wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY }, { wxCMD_LINE_NONE } }; -#if wxUSE_GUI +#if wxUSE_GUI && !defined(__WXMSW__) // VS: I need reasonable output to console from wxCmdLineParser + // - temporary, will hopefully be fixed in future in wxWin wxLog::SetTimestamp(NULL); delete wxLog::SetActiveTarget(new wxLogStderr); #endif diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp index be111857cd..34a25c872e 100644 --- a/utils/wxrc/wxrc.cpp +++ b/utils/wxrc/wxrc.cpp @@ -83,22 +83,26 @@ int XmlResApp::OnRun() { static const wxCmdLineEntryDesc cmdLineDesc[] = { - { wxCMD_LINE_SWITCH, "h", "help", "show help message" }, + { wxCMD_LINE_SWITCH, "h", "help", "show help message", + wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP }, { wxCMD_LINE_SWITCH, "v", "verbose", "be verbose" }, { wxCMD_LINE_SWITCH, "c", "cpp-code", "output C++ source rather than .rsc file" }, { wxCMD_LINE_SWITCH, "g", "gettext", "output list of translatable strings (to stdout or file if -o used)" }, { wxCMD_LINE_OPTION, "n", "function", "C++ function name (with -c) [InitXmlResource]" }, { wxCMD_LINE_OPTION, "o", "output", "output file [resource.xrs/cpp]" }, +#if 0 // not yet implemented { wxCMD_LINE_OPTION, "l", "list-of-handlers", "output list of neccessary handlers to this file" }, - +#endif { wxCMD_LINE_PARAM, NULL, NULL, "input file(s)", - wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE }, + wxCMD_LINE_VAL_STRING, + wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY }, { wxCMD_LINE_NONE } }; -#if wxUSE_GUI +#if wxUSE_GUI && !defined(__WXMSW__) // VS: I need reasonable output to console from wxCmdLineParser + // - temporary, will hopefully be fixed in future in wxWin wxLog::SetTimestamp(NULL); delete wxLog::SetActiveTarget(new wxLogStderr); #endif -- 2.47.2