Added part of patch

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

diff --git a/src/common/cmdline.cpp b/src/common/cmdline.cpp
index aa1f4b5edb3964ff83f2eebb964eeb7639f6990b..dd154cbaeed91e366278377b91836cc87025b811 100644 (file)
--- a/src/common/cmdline.cpp
+++ b/src/common/cmdline.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

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

 // Purpose:     wxCmdLineParser implementation
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxCmdLineParser implementation
 // Author:      Vadim Zeitlin
 // Modified by:


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

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #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,23 +24,23 @@
     #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 "wx/msgout.h"
 #include <ctype.h>
 
 #include "wx/datetime.h"
 #include "wx/msgout.h"

+#include "wx/filename.h"

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


@@ -86,7 +82,7 @@ struct wxCmdLineOption
                 GetLongOptionName(lng).Len() == lng.Len(),
                 wxT("Long option contains invalid characters")
             );
                 GetLongOptionName(lng).Len() == lng.Len(),
                 wxT("Long option contains invalid characters")
             );

-            
+

 
         kind = k;
 
 
         kind = k;
 


@@ -124,7 +120,7 @@ struct wxCmdLineOption
     void SetStrVal(const wxString& val)
         { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
 #if wxUSE_DATETIME
     void SetStrVal(const wxString& val)
         { Check(wxCMD_LINE_VAL_STRING); m_strVal = val; m_hasVal = true; }
 #if wxUSE_DATETIME

-    void SetDateVal(const wxDateTime val)
+    void SetDateVal(const wxDateTime& val)

         { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
 #endif // wxUSE_DATETIME
 
         { Check(wxCMD_LINE_VAL_DATE); m_dateVal = val; m_hasVal = true; }
 #endif // wxUSE_DATETIME
 


@@ -170,8 +166,8 @@ 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
 
 // the parser internal state
 struct wxCmdLineParserData


@@ -189,7 +185,10 @@ struct wxCmdLineParserData
 
     // methods
     wxCmdLineParserData();
 
     // methods
     wxCmdLineParserData();

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

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

+#endif // wxUSE_UNICODE

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


@@ -214,6 +213,18 @@ 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)
 {
     m_arguments.clear();
 void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
 {
     m_arguments.clear();


@@ -224,11 +235,16 @@ void wxCmdLineParserData::SetArguments(int argc, wxChar **argv)
     }
 }
 
     }
 }
 

+#endif // wxUSE_UNICODE
+

 void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
 {
     m_arguments.clear();
 
 void wxCmdLineParserData::SetArguments(const wxString& cmdLine)
 {
     m_arguments.clear();
 

-    m_arguments.push_back(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);
 


@@ -277,11 +293,20 @@ 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);
 }
 

+#endif // wxUSE_UNICODE
+

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


@@ -903,14 +928,15 @@ void wxCmdLineParser::Usage()
 
 wxString wxCmdLineParser::GetUsageString()
 {
 
 wxString wxCmdLineParser::GetUsageString()
 {

-    wxString appname = wxTheApp->GetAppName();
-    if ( !appname )
+    wxString appname;
+    if ( m_data->m_arguments.empty() )

     {
     {

-        wxCHECK_MSG( m_data->m_arguments.size() != 0, wxEmptyString,
-                     _T("no program name") );
-
-        appname = wxFileNameFromPath(m_data->m_arguments[0]);
-        wxStripExtension(appname);
+        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
     }
 
     // we construct the brief cmd line desc on the fly, but not the detailed


@@ -1197,4 +1223,3 @@ wxArrayString wxCmdLineParser::ConvertStringToArgs(const wxChar *p)
 
     return args;
 }
 
     return args;
 }

-