Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more bug fixes: options with values and compound options seem to work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5262 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-01-05 17:00:05 +00:00
parent fd9f9f4c4b
commit 2822ee33cc
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/common/cmdline.cpp
View File

@@ -32,7 +32,9 @@
#include "wx/string.h" #include "wx/string.h"
#include "wx/log.h" #include "wx/log.h"
#include "wx/intl.h" #include "wx/intl.h"
#include "wx/app.h"
#include "wx/dynarray.h" #include "wx/dynarray.h"
#include "wx/filefn.h"
#endif //WX_PRECOMP #endif //WX_PRECOMP
#include "wx/datetime.h" #include "wx/datetime.h"
@@ -521,8 +523,13 @@ int wxCmdLineParser::Parse()
} }
while ( optInd == wxNOT_FOUND ); while ( optInd == wxNOT_FOUND );
len++; // compensates extra len-- above
if ( (optInd != wxNOT_FOUND) && (len != name.length()) ) if ( (optInd != wxNOT_FOUND) && (len != name.length()) )
{ {
// first of all, the option name is only part of this
// string
name = name.Left(len);
// our option is only part of this argument, there is // our option is only part of this argument, there is
// something else in it - it is either the value of this // something else in it - it is either the value of this
// option or other switches if it is a switch // option or other switches if it is a switch
@@ -532,7 +539,7 @@ int wxCmdLineParser::Parse()
// pretend that all the rest of the argument is the // pretend that all the rest of the argument is the
// next argument, in fact // next argument, in fact
wxString arg2 = arg[0u]; wxString arg2 = arg[0u];
arg2 += name.Mid(len + 1); // compensates extra -- arg2 += arg.Mid(len + 1); // +1 for leading '-'
m_data->m_arguments.Insert(arg2, n + 1); m_data->m_arguments.Insert(arg2, n + 1);
count++; count++;
@@ -650,7 +657,7 @@ int wxCmdLineParser::Parse()
const wxChar *res = dt.ParseDate(value); const wxChar *res = dt.ParseDate(value);
if ( !res || *res ) if ( !res || *res )
{ {
wxLogError(_("Options '%s': '%s' cannot " wxLogError(_("Option '%s': '%s' cannot "
"be converted to a date."), "be converted to a date."),
name.c_str(), value.c_str()); name.c_str(), value.c_str());
@@ -765,8 +772,17 @@ int wxCmdLineParser::Parse()
void wxCmdLineParser::Usage() void wxCmdLineParser::Usage()
{ {
wxString appname = wxTheApp->GetAppName();
if ( !appname )
{
wxCHECK_RET( !m_data->m_arguments.IsEmpty(), _T("no program name") );
appname = wxFileNameFromPath(m_data->m_arguments[0]);
wxStripExtension(appname);
}
wxString brief, detailed; wxString brief, detailed;
brief.Printf(_("Usage: %s"), wxTheApp->GetAppName().c_str()); brief.Printf(_("Usage: %s"), appname.c_str());
size_t n, count = m_data->m_options.GetCount(); size_t n, count = m_data->m_options.GetCount();
for ( n = 0; n < count; n++ ) for ( n = 0; n < count; n++ )