X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/494a19d6d9a7143206f064ecda6f0d817040a8fd..aca78774b6aa0ab27dead3b4b88c0d8e40e5667a:/include/wx/cmdline.h?ds=sidebyside

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 7e10524d01..b34d114225 100644
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -17,8 +17,11 @@
     #pragma interface "cmdline.h"
 #endif
 
+#include "wx/defs.h"
 #include "wx/string.h"
 
+#if wxUSE_CMDLINE_PARSER
+
 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------
@@ -96,20 +99,20 @@ public:
 
     // default ctor or ctor giving the cmd line in either Unix or Win form
     wxCmdLineParser() { Init(); }
-    wxCmdLineParser(int argc, char **argv) { Init(); SetCmdLine(argc, argv); }
+    wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); }
     wxCmdLineParser(const wxString& cmdline) { Init(); SetCmdLine(cmdline); }
 
     // the same as above, but also gives the cmd line description - otherwise,
     // use AddXXX() later
     wxCmdLineParser(const wxCmdLineEntryDesc *desc)
         { Init(); SetDesc(desc); }
-    wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, char **argv)
+    wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv)
         { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
     wxCmdLineParser(const wxCmdLineEntryDesc *desc, const wxString& cmdline)
         { Init(); SetCmdLine(cmdline); SetDesc(desc); }
 
     // set cmd line to parse after using one of the ctors which don't do it
-    void SetCmdLine(int argc, char **argv);
+    void SetCmdLine(int argc, wxChar **argv);
     void SetCmdLine(const wxString& cmdline);
 
     // not virtual, don't use this class polymorphically
@@ -158,7 +161,10 @@ public:
     // parse the command line, return 0 if ok, -1 if "-h" or "--help" option
     // was encountered and the help message was given or a positive value if a
     // syntax error occured
-    int Parse();
+    //
+    // if showUsage is true, Usage() is called in case of syntax error or if
+    // help was requested
+    int Parse(bool showUsage = TRUE);
 
     // give the usage message describing all program options
     void Usage();
@@ -187,6 +193,12 @@ public:
     // gets the value of Nth parameter (as string only for now)
     wxString GetParam(size_t n = 0u) const;
 
+    // Resets switches and options
+    void Reset();
+
+    // break down the command line in arguments
+    static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
+
 private:
     // common part of all ctors
     void Init();
@@ -194,4 +206,17 @@ private:
     struct wxCmdLineParserData *m_data;
 };
 
+#else // !wxUSE_CMDLINE_PARSER
+
+// this function is always available (even if !wxUSE_CMDLINE_PARSER) because it
+// is used by wxWin itself under Windows
+class WXDLLEXPORT wxCmdLineParser
+{
+public:
+    static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
+};
+
+#endif // wxUSE_CMDLINE_PARSER/!wxUSE_CMDLINE_PARSER
+
 #endif // _WX_CMDLINE_H_
+