add wxGenericStaticText (#9656)

[wxWidgets.git] / src / common / cmdline.cpp

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index efb4a3e9664c50ead898e5fdd547c3093c6c659d..ce169ac95bf14a8230dab9d703c0fd52559b2c6a 100644 (file)
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/cmdline.cpp
+// Name:        src/common/cmdline.cpp

 // Purpose:     wxCmdLineParser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Purpose:     wxCmdLineParser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     05.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "cmdline.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,22 +24,24 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#include "wx/cmdline.h"
-
-#if wxUSE_CMDLINE_PARSER
-

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #include "wx/dynarray.h"

     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/string.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/app.h"

-    #include "wx/dynarray.h"
-    #include "wx/filefn.h"

 #endif //WX_PRECOMP
 
 #endif //WX_PRECOMP
 

+#include "wx/cmdline.h"
+
+#if wxUSE_CMDLINE_PARSER
+

 #include <ctype.h>
 
 #include "wx/datetime.h"
 #include <ctype.h>
 
 #include "wx/datetime.h"

+#include "wx/msgout.h"
+#include "wx/filename.h"
+#include "wx/apptrait.h"

 
 // ----------------------------------------------------------------------------
 // private functions
 
 // ----------------------------------------------------------------------------
 // private functions


@@ -51,8 +49,18 @@
 
 static wxString GetTypeName(wxCmdLineParamType type);
 
 
 static wxString GetTypeName(wxCmdLineParamType type);
 

+static wxString GetOptionName(wxString::const_iterator p,
+                              wxString::const_iterator end,
+                              const wxChar *allowedChars);
+
+static wxString GetShortOptionName(wxString::const_iterator p,
+                                   wxString::const_iterator end);
+
+static wxString GetLongOptionName(wxString::const_iterator p,
+                                  wxString::const_iterator end);
+

 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------

-// private classes
+// private structs

 // ----------------------------------------------------------------------------
 
 // an internal representation of an option
 // ----------------------------------------------------------------------------
 
 // an internal representation of an option


@@ -65,8 +73,30 @@ struct wxCmdLineOption
                     wxCmdLineParamType typ,
                     int fl)
     {
                     wxCmdLineParamType typ,
                     int fl)
     {

-        wxASSERT_MSG( !shrt.empty() || !lng.empty(),
-                      _T("option should have at least one name") );
+        // wxCMD_LINE_USAGE_TEXT uses only description, shortName and longName is empty
+    #ifdef __WXDEBUG__
+        if ( k != wxCMD_LINE_USAGE_TEXT )
+        {
+            wxASSERT_MSG
+            (
+                !shrt.empty() || !lng.empty(),
+                 wxT("option should have at least one name")
+            );
+
+            wxASSERT_MSG
+            (
+                GetShortOptionName(shrt.begin(), shrt.end()).Len() == shrt.Len(),
+                wxT("Short option contains invalid characters")
+            );
+
+            wxASSERT_MSG
+            (
+                GetLongOptionName(lng.begin(), lng.end()).Len() == lng.Len(),
+                wxT("Long option contains invalid characters")
+            );
+        }
+    #endif // __WXDEBUG__
+

 
         kind = k;
 
 
         kind = k;
 


@@ -77,7 +107,7 @@ struct wxCmdLineOption
         type = typ;
         flags = fl;
 
         type = typ;
         flags = fl;
 

-        m_hasVal = FALSE;
+        m_hasVal = false;

     }
 
     // can't use union easily here, so just store all possible data fields, we
     }
 
     // can't use union easily here, so just store all possible data fields, we


@@ -90,35 +120,48 @@ struct wxCmdLineOption
         wxASSERT_MSG( type == typ, _T("type mismatch in wxCmdLineOption") );
     }
 
         wxASSERT_MSG( type == typ, _T("type mismatch in wxCmdLineOption") );
     }
 

+    double GetDoubleVal() const
+        { Check(wxCMD_LINE_VAL_DOUBLE); return m_doubleVal; }

     long GetLongVal() const
         { Check(wxCMD_LINE_VAL_NUMBER); return m_longVal; }
     const wxString& GetStrVal() const
         { Check(wxCMD_LINE_VAL_STRING); return m_strVal;  }
     long GetLongVal() const
         { Check(wxCMD_LINE_VAL_NUMBER); return m_longVal; }
     const wxString& GetStrVal() const
         { Check(wxCMD_LINE_VAL_STRING); return m_strVal;  }

+#if wxUSE_DATETIME

     const wxDateTime& GetDateVal() const
         { Check(wxCMD_LINE_VAL_DATE);   return m_dateVal; }
     const wxDateTime& GetDateVal() const
         { Check(wxCMD_LINE_VAL_DATE);   return m_dateVal; }

+#endif // wxUSE_DATETIME

 
 

+    void SetDoubleVal(double val)
+        { Check(wxCMD_LINE_VAL_DOUBLE); m_doubleVal = val; m_hasVal = true; }

     void SetLongVal(long val)
     void SetLongVal(long val)

-        { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = TRUE; }
+        { Check(wxCMD_LINE_VAL_NUMBER); m_longVal = val; m_hasVal = true; }

     void SetStrVal(const wxString& val)
     void SetStrVal(const wxString& val)

-        { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = TRUE; }
-    void SetDateVal(const wxDateTime val)
-        { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = TRUE; }
+        { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
+#if wxUSE_DATETIME
+    void SetDateVal(const wxDateTime& val)
+        { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
+#endif // wxUSE_DATETIME

 
 

-    void SetHasValue(bool hasValue = TRUE) { m_hasVal = hasValue; }
+    void SetHasValue(bool hasValue = true) { m_hasVal = hasValue; }

     bool HasValue() const { return m_hasVal; }
 
 public:
     wxCmdLineEntryType kind;
     bool HasValue() const { return m_hasVal; }
 
 public:
     wxCmdLineEntryType kind;

-    wxString shortName, longName, description;
+    wxString shortName,
+             longName,
+             description;

     wxCmdLineParamType type;
     int flags;
 
 private:
     bool m_hasVal;
 
     wxCmdLineParamType type;
     int flags;
 
 private:
     bool m_hasVal;
 

+    double m_doubleVal;

     long m_longVal;
     wxString m_strVal;
     long m_longVal;
     wxString m_strVal;

+#if wxUSE_DATETIME

     wxDateTime m_dateVal;
     wxDateTime m_dateVal;

+#endif // wxUSE_DATETIME

 };
 
 struct wxCmdLineParam
 };
 
 struct wxCmdLineParam


@@ -142,26 +185,30 @@ WX_DECLARE_OBJARRAY(wxCmdLineParam, wxArrayParams);
 
 #include "wx/arrimpl.cpp"
 
 
 #include "wx/arrimpl.cpp"
 

-WX_DEFINE_OBJARRAY(wxArrayOptions);
-WX_DEFINE_OBJARRAY(wxArrayParams);
+WX_DEFINE_OBJARRAY(wxArrayOptions)
+WX_DEFINE_OBJARRAY(wxArrayParams)

 
 // the parser internal state
 struct wxCmdLineParserData
 {
     // options
     wxString m_switchChars;     // characters which may start an option
 
 // the parser internal state
 struct wxCmdLineParserData
 {
     // options
     wxString m_switchChars;     // characters which may start an option

-    bool m_enableLongOptions;   // TRUE if long options are enabled
+    bool m_enableLongOptions;   // true if long options are enabled

     wxString m_logo;            // some extra text to show in Usage()
 
     // cmd line data
     wxArrayString m_arguments;  // == argv, argc == m_arguments.GetCount()
     wxString m_logo;            // some extra text to show in Usage()
 
     // cmd line data
     wxArrayString m_arguments;  // == argv, argc == m_arguments.GetCount()

-    wxArrayOptions m_options;   // all possible options and switchrs
+    wxArrayOptions m_options;   // all possible options and switches

     wxArrayParams m_paramDesc;  // description of all possible params
     wxArrayString m_parameters; // all params found
 
     // methods
     wxCmdLineParserData();
     wxArrayParams m_paramDesc;  // description of all possible params
     wxArrayString m_parameters; // all params found
 
     // methods
     wxCmdLineParserData();

+    void SetArguments(int argc, char **argv);
+#if wxUSE_UNICODE

     void SetArguments(int argc, wxChar **argv);
     void SetArguments(int argc, wxChar **argv);

+    void SetArguments(int argc, const wxCmdLineArgsArray& argv);
+#endif // wxUSE_UNICODE

     void SetArguments(const wxString& cmdline);
 
     int FindOption(const wxString& name);
     void SetArguments(const wxString& cmdline);
 
     int FindOption(const wxString& name);


@@ -178,7 +225,7 @@ struct wxCmdLineParserData
 
 wxCmdLineParserData::wxCmdLineParserData()
 {
 
 wxCmdLineParserData::wxCmdLineParserData()
 {

-    m_enableLongOptions = TRUE;
+    m_enableLongOptions = true;

 #ifdef __UNIX_LIKE__
     m_switchChars = _T("-");
 #else // !Unix
 #ifdef __UNIX_LIKE__
     m_switchChars = _T("-");
 #else // !Unix


@@ -186,21 +233,44 @@ wxCmdLineParserData::wxCmdLineParserData()
 #endif
 }
 
 #endif
 }
 

+void wxCmdLineParserData::SetArguments(int argc, char **argv)
+{
+    m_arguments.clear();
+
+    for ( int n = 0; n < argc; n++ )
+    {
+        m_arguments.push_back(wxString::FromAscii(argv[n]));
+    }
+}
+
+#if wxUSE_UNICODE
+

 void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
 {
 void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
 {

-    m_arguments.Empty();
+    m_arguments.clear();

 
     for ( int n = 0; n < argc; n++ )
     {
 
     for ( int n = 0; n < argc; n++ )
     {

-        m_arguments.Add(argv[n]);
+        m_arguments.push_back(argv[n]);

     }
 }
 
     }
 }
 

+void wxCmdLineParserData::SetArguments(int WXUNUSED(argc),
+                                       const wxCmdLineArgsArray& argv)
+{
+    m_arguments = argv.GetArguments();
+}
+
+#endif // wxUSE_UNICODE
+

 void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
 {
 void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
 {

-    m_arguments.Empty();
+    m_arguments.clear();

 
 

-    m_arguments.Add(wxTheApp->GetAppName());
+    if(wxTheApp && wxTheApp->argc > 0)
+        m_arguments.push_back(wxTheApp->argv[0]);
+    else
+        m_arguments.push_back(wxEmptyString);

 
     wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
 
 
     wxArrayString args = wxCmdLineParser::ConvertStringToArgs(cmdLine);
 


@@ -249,11 +319,25 @@ void wxCmdLineParser::Init()
     m_data = new wxCmdLineParserData;
 }
 
     m_data = new wxCmdLineParserData;
 }
 

+void wxCmdLineParser::SetCmdLine(int argc, char **argv)
+{
+    m_data->SetArguments(argc, argv);
+}
+
+#if wxUSE_UNICODE
+

 void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
 {
     m_data->SetArguments(argc, argv);
 }
 
 void wxCmdLineParser::SetCmdLine(int argc, wxChar **argv)
 {
     m_data->SetArguments(argc, argv);
 }
 

+void wxCmdLineParser::SetCmdLine(int argc, const wxCmdLineArgsArray& argv)
+{
+    m_data->SetArguments(argc, argv);
+}
+
+#endif // wxUSE_UNICODE
+

 void wxCmdLineParser::SetCmdLine(const wxString& cmdline)
 {
     m_data->SetArguments(cmdline);
 void wxCmdLineParser::SetCmdLine(const wxString& cmdline)
 {
     m_data->SetArguments(cmdline);


@@ -278,6 +362,11 @@ void wxCmdLineParser::EnableLongOptions(bool enable)
     m_data->m_enableLongOptions = enable;
 }
 
     m_data->m_enableLongOptions = enable;
 }
 

+bool wxCmdLineParser::AreLongOptionsEnabled() const
+{
+    return m_data->m_enableLongOptions;
+}
+

 void wxCmdLineParser::SetLogo(const wxString& logo)
 {
     m_data->m_logo = logo;
 void wxCmdLineParser::SetLogo(const wxString& logo)
 {
     m_data->m_logo = logo;


@@ -294,17 +383,24 @@ void wxCmdLineParser::SetDesc(const wxCmdLineEntryDesc *desc)
         switch ( desc->kind )
         {
             case wxCMD_LINE_SWITCH:
         switch ( desc->kind )
         {
             case wxCMD_LINE_SWITCH:

-                AddSwitch(desc->shortName, desc->longName, desc->description,
+                AddSwitch(desc->shortName, desc->longName,
+                          wxGetTranslation(desc->description),

                           desc->flags);
                 break;
 
             case wxCMD_LINE_OPTION:
                           desc->flags);
                 break;
 
             case wxCMD_LINE_OPTION:

-                AddOption(desc->shortName, desc->longName, desc->description,
+                AddOption(desc->shortName, desc->longName,
+                          wxGetTranslation(desc->description),

                           desc->type, desc->flags);
                 break;
 
             case wxCMD_LINE_PARAM:
                           desc->type, desc->flags);
                 break;
 
             case wxCMD_LINE_PARAM:

-                AddParam(desc->description, desc->type, desc->flags);
+                AddParam(wxGetTranslation(desc->description),
+                         desc->type, desc->flags);
+                break;
+
+            case wxCMD_LINE_USAGE_TEXT:
+                AddUsageText(wxGetTranslation(desc->description));

                 break;
 
             default:
                 break;
 
             default:


@@ -375,6 +471,17 @@ void wxCmdLineParser::AddParam(const wxString& desc,
     m_data->m_paramDesc.Add(param);
 }
 
     m_data->m_paramDesc.Add(param);
 }
 

+void wxCmdLineParser::AddUsageText(const wxString& text)
+{
+    wxASSERT_MSG( !text.empty(), wxT("text can't be empty") );
+
+    wxCmdLineOption *option = new wxCmdLineOption(wxCMD_LINE_USAGE_TEXT,
+                                                  wxEmptyString, wxEmptyString,
+                                                  text, wxCMD_LINE_VAL_NONE, 0);
+
+    m_data->m_options.Add(option);
+}
+

 // ----------------------------------------------------------------------------
 // access to parse command line
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // access to parse command line
 // ----------------------------------------------------------------------------


@@ -385,13 +492,13 @@ bool wxCmdLineParser::Found(const wxString& name) const
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 

-    wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown switch") );
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown switch") );

 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )
 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )

-        return FALSE;
+        return false;

 
 

-    return TRUE;
+    return true;

 }
 
 bool wxCmdLineParser::Found(const wxString& name, wxString *value) const
 }
 
 bool wxCmdLineParser::Found(const wxString& name, wxString *value) const


@@ -400,17 +507,17 @@ bool wxCmdLineParser::Found(const wxString& name, wxString *value) const
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 

-    wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown option") );
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );

 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )
 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )

-        return FALSE;
+        return false;

 
 

-    wxCHECK_MSG( value, FALSE, _T("NULL pointer in wxCmdLineOption::Found") );
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );

 
     *value = opt.GetStrVal();
 
 
     *value = opt.GetStrVal();
 

-    return TRUE;
+    return true;

 }
 
 bool wxCmdLineParser::Found(const wxString& name, long *value) const
 }
 
 bool wxCmdLineParser::Found(const wxString& name, long *value) const


@@ -419,55 +526,78 @@ bool wxCmdLineParser::Found(const wxString& name, long *value) const
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 

-    wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown option") );
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );

 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )
 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )

-        return FALSE;
+        return false;

 
 

-    wxCHECK_MSG( value, FALSE, _T("NULL pointer in wxCmdLineOption::Found") );
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );

 
     *value = opt.GetLongVal();
 
 
     *value = opt.GetLongVal();
 

-    return TRUE;
+    return true;

 }
 
 }
 

+bool wxCmdLineParser::Found(const wxString& name, double *value) const
+{
+    int i = m_data->FindOption(name);
+    if ( i == wxNOT_FOUND )
+        i = m_data->FindOptionByLongName(name);
+
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );
+
+    wxCmdLineOption& opt = m_data->m_options[(size_t)i];
+    if ( !opt.HasValue() )
+        return false;
+
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );
+
+    *value = opt.GetDoubleVal();
+
+    return true;
+}
+
+#if wxUSE_DATETIME

 bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const
 {
     int i = m_data->FindOption(name);
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 
 bool wxCmdLineParser::Found(const wxString& name, wxDateTime *value) const
 {
     int i = m_data->FindOption(name);
     if ( i == wxNOT_FOUND )
         i = m_data->FindOptionByLongName(name);
 

-    wxCHECK_MSG( i != wxNOT_FOUND, FALSE, _T("unknown option") );
+    wxCHECK_MSG( i != wxNOT_FOUND, false, _T("unknown option") );

 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )
 
     wxCmdLineOption& opt = m_data->m_options[(size_t)i];
     if ( !opt.HasValue() )

-        return FALSE;
+        return false;

 
 

-    wxCHECK_MSG( value, FALSE, _T("NULL pointer in wxCmdLineOption::Found") );
+    wxCHECK_MSG( value, false, _T("NULL pointer in wxCmdLineOption::Found") );

 
     *value = opt.GetDateVal();
 
 
     *value = opt.GetDateVal();
 

-    return TRUE;
+    return true;

 }
 }

+#endif // wxUSE_DATETIME

 
 size_t wxCmdLineParser::GetParamCount() const
 {
 
 size_t wxCmdLineParser::GetParamCount() const
 {

-    return m_data->m_parameters.GetCount();
+    return m_data->m_parameters.size();

 }
 
 wxString wxCmdLineParser::GetParam(size_t n) const
 {
 }
 
 wxString wxCmdLineParser::GetParam(size_t n) const
 {

+    wxCHECK_MSG( n < GetParamCount(), wxEmptyString, _T("invalid param index") );
+

     return m_data->m_parameters[n];
 }
 
 // Resets switches and options
 void wxCmdLineParser::Reset()
 {
     return m_data->m_parameters[n];
 }
 
 // Resets switches and options
 void wxCmdLineParser::Reset()
 {

-    for ( size_t i = 0; i < m_data->m_options.Count(); i++ )
+    for ( size_t i = 0; i < m_data->m_options.GetCount(); i++ )

     {
         wxCmdLineOption& opt = m_data->m_options[i];
     {
         wxCmdLineOption& opt = m_data->m_options[i];

-        opt.SetHasValue(FALSE);
+        opt.SetHasValue(false);

     }
 }
 
     }
 }
 


@@ -476,22 +606,23 @@ void wxCmdLineParser::Reset()
 // the real work is done here
 // ----------------------------------------------------------------------------
 
 // the real work is done here
 // ----------------------------------------------------------------------------
 

-int wxCmdLineParser::Parse()
+int wxCmdLineParser::Parse(bool showUsage)

 {
 {

-    bool maybeOption = TRUE;    // can the following arg be an option?
-    bool ok = TRUE;             // TRUE until an error is detected
-    bool helpRequested = FALSE; // TRUE if "-h" was given
-    bool hadRepeatableParam = FALSE; // TRUE if found param with MULTIPLE flag
+    bool maybeOption = true;    // can the following arg be an option?
+    bool ok = true;             // true until an error is detected
+    bool helpRequested = false; // true if "-h" was given
+    bool hadRepeatableParam = false; // true if found param with MULTIPLE flag

 
     size_t currentParam = 0;    // the index in m_paramDesc
 
     size_t countParam = m_data->m_paramDesc.GetCount();
 
     size_t currentParam = 0;    // the index in m_paramDesc
 
     size_t countParam = m_data->m_paramDesc.GetCount();

+    wxString errorMsg;

 
     Reset();
 
     // parse everything
     wxString arg;
 
     Reset();
 
     // parse everything
     wxString arg;

-    size_t count = m_data->m_arguments.GetCount();
+    size_t count = m_data->m_arguments.size();

     for ( size_t n = 1; ok && (n < count); n++ )    // 0 is program name
     {
         arg = m_data->m_arguments[n];
     for ( size_t n = 1; ok && (n < count); n++ )    // 0 is program name
     {
         arg = m_data->m_arguments[n];


@@ -501,49 +632,62 @@ int wxCmdLineParser::Parse()
         // not like options (this is POSIX-like)
         if ( arg == _T("--") )
         {
         // not like options (this is POSIX-like)
         if ( arg == _T("--") )
         {

-            maybeOption = FALSE;
+            maybeOption = false;

 
             continue;
         }
 
         // empty argument or just '-' is not an option but a parameter
         if ( maybeOption && arg.length() > 1 &&
 
             continue;
         }
 
         // empty argument or just '-' is not an option but a parameter
         if ( maybeOption && arg.length() > 1 &&

-                wxStrchr(m_data->m_switchChars, arg[0u]) )
+                // FIXME-UTF8: use wc_str() after removing ANSI build
+                wxStrchr(m_data->m_switchChars.c_str(), arg[0u]) )

         {
             bool isLong;
             wxString name;
             int optInd = wxNOT_FOUND;   // init to suppress warnings
 
             // an option or a switch: find whether it's a long or a short one
         {
             bool isLong;
             wxString name;
             int optInd = wxNOT_FOUND;   // init to suppress warnings
 
             // an option or a switch: find whether it's a long or a short one

-            if ( m_data->m_enableLongOptions &&
-                    arg[0u] == _T('-') && arg[1u] == _T('-') )
+            if ( arg.length() >= 3 && arg[0u] == _T('-') && arg[1u] == _T('-') )

             {
                 // a long one
             {
                 // a long one

-                isLong = TRUE;
+                isLong = true;
+
+                // Skip leading "--"
+                wxString::const_iterator p = arg.begin() + 2;
+
+                bool longOptionsEnabled = AreLongOptionsEnabled();

 
 

-                const wxChar *p = arg.c_str() + 2;
-                while ( wxIsalnum(*p) || (*p == _T('_')) || (*p == _T('-')) )
+                name = GetLongOptionName(p, arg.end());
+
+                if (longOptionsEnabled)

                 {
                 {

-                    name += *p++;
+                    optInd = m_data->FindOptionByLongName(name);
+                    if ( optInd == wxNOT_FOUND )
+                    {
+                        errorMsg << wxString::Format(_("Unknown long option '%s'"), name.c_str())
+                                 << _T('\n');
+                    }

                 }
                 }

-
-                optInd = m_data->FindOptionByLongName(name);
-                if ( optInd == wxNOT_FOUND )
+                else

                 {
                 {

-                    wxLogError(_("Unknown long option '%s'"), name.c_str());
+                    optInd = wxNOT_FOUND; // Sanity check
+
+                    // Print the argument including leading "--"
+                    name.Prepend( wxT("--") );
+                    errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+                             << _T('\n');

                 }
                 }

+

             }
             }

-            else
+            else // not a long option

             {
             {

-                isLong = FALSE;
+                isLong = false;

 
                 // a short one: as they can be cumulated, we try to find the
                 // longest substring which is a valid option
 
                 // a short one: as they can be cumulated, we try to find the
                 // longest substring which is a valid option

-                const wxChar *p = arg.c_str() + 1;
-                while ( wxIsalnum(*p) || (*p == _T('_')) )
-                {
-                    name += *p++;
-                }
+                wxString::const_iterator p = arg.begin() + 1;
+
+                name = GetShortOptionName(p, arg.end());

 
                 size_t len = name.length();
                 do
 
                 size_t len = name.length();
                 do


@@ -552,7 +696,8 @@ int wxCmdLineParser::Parse()
                     {
                         // we couldn't find a valid option name in the
                         // beginning of this string
                     {
                         // we couldn't find a valid option name in the
                         // beginning of this string

-                        wxLogError(_("Unknown option '%s'"), name.c_str());
+                        errorMsg << wxString::Format(_("Unknown option '%s'"), name.c_str())
+                                 << _T('\n');

 
                         break;
                     }
 
                         break;
                     }


@@ -584,7 +729,8 @@ int wxCmdLineParser::Parse()
                         wxString arg2 = arg[0u];
                         arg2 += arg.Mid(len + 1); // +1 for leading '-'
 
                         wxString arg2 = arg[0u];
                         arg2 += arg.Mid(len + 1); // +1 for leading '-'
 

-                        m_data->m_arguments.Insert(arg2, n + 1);
+                        m_data->m_arguments.insert
+                            (m_data->m_arguments.begin() + n + 1, arg2);

                         count++;
                     }
                     //else: it's our value, we'll deal with it below
                         count++;
                     }
                     //else: it's our value, we'll deal with it below


@@ -593,85 +739,89 @@ int wxCmdLineParser::Parse()
 
             if ( optInd == wxNOT_FOUND )
             {
 
             if ( optInd == wxNOT_FOUND )
             {

-                ok = FALSE;
+                ok = false;

 
                 continue;   // will break, in fact
             }
 
 
                 continue;   // will break, in fact
             }
 

+            // look at what follows:
+
+            // +1 for leading '-'
+            wxString::const_iterator p = arg.begin() + 1 + name.length();
+            wxString::const_iterator end = arg.end();
+
+            if ( isLong )
+                ++p;    // for another leading '-'
+

             wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
             if ( opt.kind == wxCMD_LINE_SWITCH )
             {
             wxCmdLineOption& opt = m_data->m_options[(size_t)optInd];
             if ( opt.kind == wxCMD_LINE_SWITCH )
             {

-                // nothing more to do
-                opt.SetHasValue();
-
-                if ( opt.flags & wxCMD_LINE_OPTION_HELP )
+                // we must check that there is no value following the switch
+                if ( p != arg.end() )

                 {
                 {

-                    helpRequested = TRUE;
-
-                    // it's not an error, but we still stop here
-                    ok = FALSE;
+                    errorMsg << wxString::Format(_("Unexpected characters following option '%s'."), name.c_str())
+                             << _T('\n');
+                    ok = false;

                 }
                 }

-            }
-            else
-            {
-                // get the value
-
-                // +1 for leading '-'
-                const wxChar *p = arg.c_str() + 1 + name.length();
-                if ( isLong )
+                else // no value, as expected

                 {
                 {

-                    p++;    // for another leading '-'
+                    // nothing more to do
+                    opt.SetHasValue();

 
 

-                    if ( *p++ != _T('=') )
+                    if ( opt.flags & wxCMD_LINE_OPTION_HELP )

                     {
                     {

-                        wxLogError(_("Option '%s' requires a value, '=' expected."), name.c_str());
+                        helpRequested = true;

 
 

-                        ok = FALSE;
+                        // it's not an error, but we still stop here
+                        ok = false;

                     }
                 }
                     }
                 }

-                else
+            }
+            else // it's an option. not a switch
+            {
+                switch ( p == end ? '\0' : (*p).GetValue() )

                 {
                 {

-                    switch ( *p )
-                    {
-                        case _T('='):
-                        case _T(':'):
-                            // the value follows
-                            p++;
-                            break;
-
-                        case 0:
-                            // the value is in the next argument
-                            if ( ++n == count )
-                            {
-                                // ... but there is none
-                                wxLogError(_("Option '%s' requires a value."),
-                                           name.c_str());
-
-                                ok = FALSE;
-                            }
-                            else
-                            {
-                                // ... take it from there
-                                p = m_data->m_arguments[n].c_str();
-                            }
-                            break;
+                    case '=':
+                    case ':':
+                        // the value follows
+                        ++p;
+                        break;

 
 

-                        default:
-                            // the value is right here: this may be legal or
-                            // not depending on the option style
-                            if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
-                            {
-                                wxLogError(_("Separator expected after the option '%s'."),
-                                           name.c_str());
+                    case '\0':
+                        // the value is in the next argument
+                        if ( ++n == count )
+                        {
+                            // ... but there is none
+                            errorMsg << wxString::Format(_("Option '%s' requires a value."),
+                                                         name.c_str())
+                                     << _T('\n');
+
+                            ok = false;
+                        }
+                        else
+                        {
+                            // ... take it from there
+                            p = m_data->m_arguments[n].begin();
+                            end = m_data->m_arguments[n].end();
+                        }
+                        break;

 
 

-                                ok = FALSE;
-                            }
-                    }
+                    default:
+                        // the value is right here: this may be legal or
+                        // not depending on the option style
+                        if ( opt.flags & wxCMD_LINE_NEEDS_SEPARATOR )
+                        {
+                            errorMsg << wxString::Format(_("Separator expected after the option '%s'."),
+                                                         name.c_str())
+                                    << _T('\n');
+
+                            ok = false;
+                        }

                 }
 
                 if ( ok )
                 {
                 }
 
                 if ( ok )
                 {

-                    wxString value = p;
+                    wxString value(p, end);

                     switch ( opt.type )
                     {
                         default:
                     switch ( opt.type )
                     {
                         default:


@@ -691,24 +841,45 @@ int wxCmdLineParser::Parse()
                                 }
                                 else
                                 {
                                 }
                                 else
                                 {

-                                    wxLogError(_("'%s' is not a correct numeric value for option '%s'."),
-                                               value.c_str(), name.c_str());
+                                    errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
+                                                                 value.c_str(), name.c_str())
+                                             << _T('\n');
+
+                                    ok = false;
+                                }
+                            }
+                            break;
+
+                        case wxCMD_LINE_VAL_DOUBLE:
+                            {
+                                double val;
+                                if ( value.ToDouble(&val) )
+                                {
+                                    opt.SetDoubleVal(val);
+                                }
+                                else
+                                {
+                                    errorMsg << wxString::Format(_("'%s' is not a correct numeric value for option '%s'."),
+                                                                 value.c_str(), name.c_str())
+                                             << _T('\n');

 
 

-                                    ok = FALSE;
+                                    ok = false;

                                 }
                             }
                             break;
 
                                 }
                             }
                             break;
 

+#if wxUSE_DATETIME

                         case wxCMD_LINE_VAL_DATE:
                             {
                                 wxDateTime dt;
                         case wxCMD_LINE_VAL_DATE:
                             {
                                 wxDateTime dt;

-                                const wxChar *res = dt.ParseDate(value);
+                                const char *res = dt.ParseDate(value);

                                 if ( !res || *res )
                                 {
                                 if ( !res || *res )
                                 {

-                                    wxLogError(_("Option '%s': '%s' cannot be converted to a date."),
-                                               name.c_str(), value.c_str());
+                                    errorMsg << wxString::Format(_("Option '%s': '%s' cannot be converted to a date."),
+                                                                 name.c_str(), value.c_str())
+                                             << _T('\n');

 
 

-                                    ok = FALSE;
+                                    ok = false;

                                 }
                                 else
                                 {
                                 }
                                 else
                                 {


@@ -716,20 +887,20 @@ int wxCmdLineParser::Parse()
                                 }
                             }
                             break;
                                 }
                             }
                             break;

+#endif // wxUSE_DATETIME

                     }
                 }
             }
         }
                     }
                 }
             }
         }

-        else
+        else // not an option, must be a parameter

         {
         {

-            // a parameter

             if ( currentParam < countParam )
             {
                 wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
 
                 // TODO check the param type
 
             if ( currentParam < countParam )
             {
                 wxCmdLineParam& param = m_data->m_paramDesc[currentParam];
 
                 // TODO check the param type
 

-                m_data->m_parameters.Add(arg);
+                m_data->m_parameters.push_back(arg);

 
                 if ( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE) )
                 {
 
                 if ( !(param.flags & wxCMD_LINE_PARAM_MULTIPLE) )
                 {


@@ -741,14 +912,15 @@ int wxCmdLineParser::Parse()
                                   _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
 
                     // remember that we did have this last repeatable parameter
                                   _T("all parameters after the one with wxCMD_LINE_PARAM_MULTIPLE style are ignored") );
 
                     // remember that we did have this last repeatable parameter

-                    hadRepeatableParam = TRUE;
+                    hadRepeatableParam = true;

                 }
             }
             else
             {
                 }
             }
             else
             {

-                wxLogError(_("Unexpected parameter '%s'"), arg.c_str());
+                errorMsg << wxString::Format(_("Unexpected parameter '%s'"), arg.c_str())
+                         << _T('\n');

 
 

-                ok = FALSE;
+                ok = false;

             }
         }
     }
             }
         }
     }


@@ -769,15 +941,24 @@ int wxCmdLineParser::Parse()
                 }
                 else
                 {
                 }
                 else
                 {

-                    optName.Printf(_("%s (or %s)"),
-                                   opt.shortName.c_str(),
-                                   opt.longName.c_str());
+                    if ( AreLongOptionsEnabled() )
+                    {
+                        optName.Printf( _("%s (or %s)"),
+                                        opt.shortName.c_str(),
+                                        opt.longName.c_str() );
+                    }
+                    else
+                    {
+                        optName.Printf( wxT("%s"),
+                                        opt.shortName.c_str() );
+                    }

                 }
 
                 }
 

-                wxLogError(_("The value for the option '%s' must be specified."),
-                           optName.c_str());
+                errorMsg << wxString::Format(_("The value for the option '%s' must be specified."),
+                                             optName.c_str())
+                         << _T('\n');

 
 

-                ok = FALSE;
+                ok = false;

             }
         }
 
             }
         }
 


@@ -795,17 +976,32 @@ int wxCmdLineParser::Parse()
 
             if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
             {
 
             if ( !(param.flags & wxCMD_LINE_PARAM_OPTIONAL) )
             {

-                wxLogError(_("The required parameter '%s' was not specified."),
-                           param.description.c_str());
+                errorMsg << wxString::Format(_("The required parameter '%s' was not specified."),
+                                             param.description.c_str())
+                         << _T('\n');

 
 

-                ok = FALSE;
+                ok = false;

             }
         }
     }
 
             }
         }
     }
 

-    if ( !ok )
+    // if there was an error during parsing the command line, show this error
+    // and also the usage message if it had been requested
+    if ( !ok && (!errorMsg.empty() || (helpRequested && showUsage)) )

     {
     {

-        Usage();
+        wxMessageOutput* msgOut = wxMessageOutput::Get();
+        if ( msgOut )
+        {
+            wxString usage;
+            if ( showUsage )
+                usage = GetUsageString();
+
+            msgOut->Printf( wxT("%s%s"), usage.c_str(), errorMsg.c_str() );
+        }
+        else
+        {
+            wxFAIL_MSG( _T("no wxMessageOutput object?") );
+        }

     }
 
     return ok ? 0 : helpRequested ? -1 : 1;
     }
 
     return ok ? 0 : helpRequested ? -1 : 1;


@@ -815,64 +1011,113 @@ int wxCmdLineParser::Parse()
 // give the usage message
 // ----------------------------------------------------------------------------
 
 // give the usage message
 // ----------------------------------------------------------------------------
 

-void wxCmdLineParser::Usage()
+void wxCmdLineParser::Usage() const

 {
 {

-    wxString appname = wxTheApp->GetAppName();
-    if ( !appname )
+    wxMessageOutput* msgOut = wxMessageOutput::Get();
+    if ( msgOut )
+    {
+        msgOut->Printf( wxT("%s"), GetUsageString().c_str() );
+    }
+    else

     {
     {

-        wxCHECK_RET( !m_data->m_arguments.IsEmpty(), _T("no program name") );
+        wxFAIL_MSG( _T("no wxMessageOutput object?") );
+    }
+}

 
 

-        appname = wxFileNameFromPath(m_data->m_arguments[0]);
-        wxStripExtension(appname);
+wxString wxCmdLineParser::GetUsageString() const
+{
+    wxString appname;
+    if ( m_data->m_arguments.empty() )
+    {
+        if ( wxTheApp )
+            appname = wxTheApp->GetAppName();
+    }
+    else // use argv[0]
+    {
+        appname = wxFileName(m_data->m_arguments[0]).GetName();

     }
 
     // we construct the brief cmd line desc on the fly, but not the detailed
     // help message below because we want to align the options descriptions
     // and for this we must first know the longest one of them
     }
 
     // we construct the brief cmd line desc on the fly, but not the detailed
     // help message below because we want to align the options descriptions
     // and for this we must first know the longest one of them

-    wxString brief;
+    wxString usage;

     wxArrayString namesOptions, descOptions;
     wxArrayString namesOptions, descOptions;

-    brief.Printf(_("Usage: %s"), appname.c_str());
+
+    if ( !m_data->m_logo.empty() )
+    {
+        usage << m_data->m_logo << _T('\n');
+    }
+
+    usage << wxString::Format(_("Usage: %s"), appname.c_str());

 
     // the switch char is usually '-' but this can be changed with
     // SetSwitchChars() and then the first one of possible chars is used
     wxChar chSwitch = !m_data->m_switchChars ? _T('-')
                                              : m_data->m_switchChars[0u];
 
 
     // the switch char is usually '-' but this can be changed with
     // SetSwitchChars() and then the first one of possible chars is used
     wxChar chSwitch = !m_data->m_switchChars ? _T('-')
                                              : m_data->m_switchChars[0u];
 

+    bool areLongOptionsEnabled = AreLongOptionsEnabled();

     size_t n, count = m_data->m_options.GetCount();
     for ( n = 0; n < count; n++ )
     {
         wxCmdLineOption& opt = m_data->m_options[n];
     size_t n, count = m_data->m_options.GetCount();
     for ( n = 0; n < count; n++ )
     {
         wxCmdLineOption& opt = m_data->m_options[n];

+        wxString option;

 
 

-        brief << _T(' ');
-        if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
+        if ( opt.kind != wxCMD_LINE_USAGE_TEXT )

         {
         {

-            brief << _T('[');
-        }
+            usage << _T(' ');
+            if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
+            {
+                usage << _T('[');
+            }

 
 

-        brief << chSwitch << opt.shortName;
+            if ( !opt.shortName.empty() )
+            {
+                usage << chSwitch << opt.shortName;
+            }
+            else if ( areLongOptionsEnabled && !opt.longName.empty() )
+            {
+                usage << _T("--") << opt.longName;
+            }
+            else
+            {
+                if (!opt.longName.empty())
+                {
+                    wxFAIL_MSG( wxT("option with only a long name while long ")
+                                wxT("options are disabled") );
+                }
+                else
+                {
+                    wxFAIL_MSG( _T("option without neither short nor long name") );
+                }
+            }

 
 

-        wxString option;
-        option << _T("  ") << chSwitch << opt.shortName;
-        if ( !!opt.longName )
-        {
-            option << _T("  --") << opt.longName;
-        }
+            if ( !opt.shortName.empty() )
+            {
+                option << _T("  ") << chSwitch << opt.shortName;
+            }

 
 

-        if ( opt.kind != wxCMD_LINE_SWITCH )
-        {
-            wxString val;
-            val << _T('<') << GetTypeName(opt.type) << _T('>');
-            brief << _T(' ') << val;
-            option << (!opt.longName ? _T(':') : _T('=')) << val;
-        }
+            if ( areLongOptionsEnabled && !opt.longName.empty() )
+            {
+                option << (option.empty() ? _T("  ") : _T(", "))
+                       << _T("--") << opt.longName;
+            }

 
 

-        if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
-        {
-            brief << _T(']');
+            if ( opt.kind != wxCMD_LINE_SWITCH )
+            {
+                wxString val;
+                val << _T('<') << GetTypeName(opt.type) << _T('>');
+                usage << _T(' ') << val;
+                option << (!opt.longName ? _T(':') : _T('=')) << val;
+            }
+
+            if ( !(opt.flags & wxCMD_LINE_OPTION_MANDATORY) )
+            {
+                usage << _T(']');
+            }

         }
 
         }
 

-        namesOptions.Add(option);
-        descOptions.Add(opt.description);
+        namesOptions.push_back(option);
+        descOptions.push_back(opt.description);

     }
 
     count = m_data->m_paramDesc.GetCount();
     }
 
     count = m_data->m_paramDesc.GetCount();


@@ -880,53 +1125,66 @@ void wxCmdLineParser::Usage()
     {
         wxCmdLineParam& param = m_data->m_paramDesc[n];
 
     {
         wxCmdLineParam& param = m_data->m_paramDesc[n];
 

-        brief << _T(' ');
+        usage << _T(' ');

         if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
         {
         if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
         {

-            brief << _T('[');
+            usage << _T('[');

         }
 
         }
 

-        brief << param.description;
+        usage << param.description;

 
         if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
         {
 
         if ( param.flags & wxCMD_LINE_PARAM_MULTIPLE )
         {

-            brief << _T("...");
+            usage << _T("...");

         }
 
         if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
         {
         }
 
         if ( param.flags & wxCMD_LINE_PARAM_OPTIONAL )
         {

-            brief << _T(']');
+            usage << _T(']');

         }
     }
 
         }
     }
 

-    if ( !!m_data->m_logo )
-    {
-        wxLogMessage(m_data->m_logo);
-    }
+    usage << _T('\n');
+
+    // set to number of our own options, not counting the standard ones
+    count = namesOptions.size();

 
 

-    wxLogMessage(brief);
+    // get option names & descriptions for standard options, if any:
+    wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
+    wxString stdDesc;
+    if ( traits )
+        stdDesc = traits->GetStandardCmdLineOptions(namesOptions, descOptions);

 
     // now construct the detailed help message
     size_t len, lenMax = 0;
 
     // now construct the detailed help message
     size_t len, lenMax = 0;

-    count = namesOptions.GetCount();
-    for ( n = 0; n < count; n++ )
+    for ( n = 0; n < namesOptions.size(); n++ )

     {
         len = namesOptions[n].length();
         if ( len > lenMax )
             lenMax = len;
     }
 
     {
         len = namesOptions[n].length();
         if ( len > lenMax )
             lenMax = len;
     }
 

-    wxString detailed;
-    for ( n = 0; n < count; n++ )
+    for ( n = 0; n < namesOptions.size(); n++ )

     {
     {

+        if ( n == count )
+            usage << _T('\n') << stdDesc;
+

         len = namesOptions[n].length();
         len = namesOptions[n].length();

-        detailed << namesOptions[n]
-                 << wxString(_T(' '), lenMax - len) << _T('\t')
-                 << descOptions[n]
-                 << _T('\n');
+        // desc contains text if name is empty
+        if (len == 0)
+        {
+            usage << descOptions[n] << _T('\n');
+        }
+        else
+        {
+            usage << namesOptions[n]
+                  << wxString(_T(' '), lenMax - len) << _T('\t')
+                  << descOptions[n]
+                  << _T('\n');
+        }

     }
 
     }
 

-    wxLogMessage(detailed);
+    return usage;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -942,114 +1200,185 @@ static wxString GetTypeName(wxCmdLineParamType type)
             wxFAIL_MSG( _T("unknown option type") );
             // still fall through
 
             wxFAIL_MSG( _T("unknown option type") );
             // still fall through
 

-        case wxCMD_LINE_VAL_STRING: s = _("str"); break;
-        case wxCMD_LINE_VAL_NUMBER: s = _("num"); break;
-        case wxCMD_LINE_VAL_DATE:   s = _("date"); break;
+        case wxCMD_LINE_VAL_STRING:
+            s = _("str");
+            break;
+
+        case wxCMD_LINE_VAL_NUMBER:
+            s = _("num");
+            break;
+
+        case wxCMD_LINE_VAL_DOUBLE:
+            s = _("double");
+            break;
+
+        case wxCMD_LINE_VAL_DATE:
+            s = _("date");
+            break;

     }
 
     return s;
 }
 
     }
 
     return s;
 }
 

+/*
+Returns a string which is equal to the string pointed to by p, but up to the
+point where p contains an character that's not allowed.
+Allowable characters are letters and numbers, and characters pointed to by
+the parameter allowedChars.
+
+For example, if p points to "abcde-@-_", and allowedChars is "-_",
+this function returns "abcde-".
+*/
+static wxString GetOptionName(wxString::const_iterator p,
+                              wxString::const_iterator end,
+                              const wxChar *allowedChars)
+{
+    wxString argName;
+
+    while ( p != end && (wxIsalnum(*p) || wxStrchr(allowedChars, *p)) )
+    {
+        argName += *p++;
+    }
+
+    return argName;
+}
+
+// Besides alphanumeric characters, short and long options can
+// have other characters.
+
+// A short option additionally can have these
+#define wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("_?")
+
+// A long option can have the same characters as a short option and a '-'.
+#define wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION \
+    wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION wxT("-")
+
+static wxString GetShortOptionName(wxString::const_iterator p,
+                                  wxString::const_iterator end)
+{
+    return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_SHORT_OPTION);
+}
+
+static wxString GetLongOptionName(wxString::const_iterator p,
+                                  wxString::const_iterator end)
+{
+    return GetOptionName(p, end, wxCMD_LINE_CHARS_ALLOWED_BY_LONG_OPTION);
+}
+

 #endif // wxUSE_CMDLINE_PARSER
 
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 
 #endif // wxUSE_CMDLINE_PARSER
 
 // ----------------------------------------------------------------------------
 // global functions
 // ----------------------------------------------------------------------------
 

+/*
+   This function is mainly used under Windows (as under Unix we always get the
+   command line arguments as argc/argv anyhow) and so it tries to follow
+   Windows conventions for the command line handling, not Unix ones. For
+   instance, backslash is not special except when it precedes double quote when
+   it does quote it.
+ */
+

 /* static */
 /* static */

-wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
+wxArrayString
+wxCmdLineParser::ConvertStringToArgs(const wxString& cmdline,
+                                     wxCmdLineSplitType type)

 {
     wxArrayString args;
 
     wxString arg;
     arg.reserve(1024);
 
 {
     wxArrayString args;
 
     wxString arg;
     arg.reserve(1024);
 

-    bool isInsideQuotes = FALSE;
+    const wxString::const_iterator end = cmdline.end();
+    wxString::const_iterator p = cmdline.begin();
+

     for ( ;; )
     {
         // skip white space
     for ( ;; )
     {
         // skip white space

-        while ( *p == _T(' ') || *p == _T('\t') )
-            p++;
+        while ( p != end && (*p == ' ' || *p == '\t') )
+            ++p;

 
         // anything left?
 
         // anything left?

-        if ( *p == _T('\0') )
+        if ( p == end )

             break;
 
         // parse this parameter
             break;
 
         // parse this parameter

-        arg.clear();
-        for ( ;; p++ )
+        bool lastBS = false,
+             isInsideQuotes = false;
+        wxChar chDelim = '\0';
+        for ( arg.clear(); p != end; ++p )

         {
         {

-            // do we have a (lone) backslash?
-            bool isQuotedByBS = FALSE;
-            while ( *p == _T('\\') )
-            {
-                p++;
+            const wxChar ch = *p;

 
 

-                // if we have 2 backslashes in a row, output one
-                if ( isQuotedByBS )
+            if ( type == wxCMD_LINE_SPLIT_DOS )
+            {
+                if ( ch == '"' )

                 {
                 {

-                    arg += _T('\\');
-                    isQuotedByBS = FALSE;
+                    if ( !lastBS )
+                    {
+                        isInsideQuotes = !isInsideQuotes;
+
+                        // don't put quote in arg
+                        continue;
+                    }
+                    //else: quote has no special meaning but the backslash
+                    //      still remains -- makes no sense but this is what
+                    //      Windows does

                 }
                 }

-                else // the next char is quoted
+                // note that backslash does *not* quote the space, only quotes do
+                else if ( !isInsideQuotes && (ch == ' ' || ch == '\t') )

                 {
                 {

-                    isQuotedByBS = TRUE;
+                    ++p;    // skip this space anyhow
+                    break;

                 }
                 }

-            }

 
 

-            bool skipChar = FALSE,
-                 endParam = FALSE;
-            switch ( *p )
+                lastBS = !lastBS && ch == '\\';
+            }
+            else // type == wxCMD_LINE_SPLIT_UNIX

             {
             {

-                case _T('"'):
-                    if ( !isQuotedByBS )
+                if ( !lastBS )
+                {
+                    if ( isInsideQuotes )

                     {
                     {

-                        // don't put the quote itself in the arg
-                        skipChar = TRUE;
+                        if ( ch == chDelim )
+                        {
+                            isInsideQuotes = false;

 
 

-                        isInsideQuotes = !isInsideQuotes;
+                            continue;   // don't use the quote itself
+                        }

                     }
                     }

-                    //else: insert a literal quote
-
-                    break;
-
-                case _T(' '):
-                case _T('\t'):
-                    if ( isInsideQuotes || isQuotedByBS )
+                    else // not in quotes and not escaped

                     {
                     {

-                        // preserve it, skip endParam below
-                        break;
-                    }
-                    //else: fall through
+                        if ( ch == '\'' || ch == '"' )
+                        {
+                            isInsideQuotes = true;
+                            chDelim = ch;

 
 

-                case _T('\0'):
-                    endParam = TRUE;
-                    break;
+                            continue;   // don't use the quote itself
+                        }

 
 

-                default:
-                    if ( isQuotedByBS )
-                    {
-                        // ignore backslash before an ordinary character - this
-                        // is needed to properly handle the file names under
-                        // Windows appearing in the command line
-                        arg += _T('\\');
+                        if ( ch == ' ' || ch == '\t' )
+                        {
+                            ++p;    // skip this space anyhow
+                            break;
+                        }

                     }
                     }

-            }
-
-            // end of argument?
-            if ( endParam )
-                break;

 
 

-            // otherwise copy this char to arg
-            if ( !skipChar )
-            {
-                arg += *p;
+                    lastBS = ch == '\\';
+                    if ( lastBS )
+                        continue;
+                }
+                else // escaped by backslash, just use as is
+                {
+                    lastBS = false;
+                }

             }
             }

+
+            arg += ch;

         }
 
         }
 

-        args.Add(arg);
+        args.push_back(arg);

     }
 
     return args;
 }
     }
 
     return args;
 }

-