declare wxEntry() as taking char **Argv, not char *argv[]

[wxWidgets.git] / include / wx / cmdline.h

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 0b7576b8cfd5f38ef3f138569fcbc5566590440d..bc8c8936549f483dfcd315597f275377275f7992 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -13,12 +13,15 @@
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "cmdline.h"
 #endif
 
     #pragma interface "cmdline.h"
 #endif
 

+#include "wx/defs.h"

 #include "wx/string.h"
 
 #include "wx/string.h"
 

+#if wxUSE_CMDLINE_PARSER
+

 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------


@@ -32,7 +35,8 @@ enum
     wxCMD_LINE_OPTION_MANDATORY = 0x01, // this option must be given
     wxCMD_LINE_PARAM_OPTIONAL   = 0x02, // the parameter may be omitted
     wxCMD_LINE_PARAM_MULTIPLE   = 0x04, // the parameter may be repeated
     wxCMD_LINE_OPTION_MANDATORY = 0x01, // this option must be given
     wxCMD_LINE_PARAM_OPTIONAL   = 0x02, // the parameter may be omitted
     wxCMD_LINE_PARAM_MULTIPLE   = 0x04, // the parameter may be repeated

-    wxCMD_LINE_OPTION_HELP      = 0x08  // this option is a help request
+    wxCMD_LINE_OPTION_HELP      = 0x08, // this option is a help request
+    wxCMD_LINE_NEEDS_SEPARATOR  = 0x10  // must have sep before the value

 };
 
 // an option value or parameter may be a string (the most common case), a
 };
 
 // an option value or parameter may be a string (the most common case), a


@@ -95,20 +99,20 @@ public:
 
     // default ctor or ctor giving the cmd line in either Unix or Win form
     wxCmdLineParser() { Init(); }
 
     // 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 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
         { 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
     void SetCmdLine(const wxString& cmdline);
 
     // not virtual, don't use this class polymorphically


@@ -126,6 +130,11 @@ public:
     void EnableLongOptions(bool enable = TRUE);
     void DisableLongOptions() { EnableLongOptions(FALSE); }
 
     void EnableLongOptions(bool enable = TRUE);
     void DisableLongOptions() { EnableLongOptions(FALSE); }
 

+    bool AreLongOptionsEnabled();
+
+    // extra text may be shown by Usage() method if set by this function
+    void SetLogo(const wxString& logo);
+

     // construct the cmd line description
     // ----------------------------------
 
     // construct the cmd line description
     // ----------------------------------
 


@@ -154,7 +163,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
     // 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();
 
     // give the usage message describing all program options
     void Usage();


@@ -181,13 +193,35 @@ public:
     size_t GetParamCount() const;
 
     // gets the value of Nth parameter (as string only for now)
     size_t GetParamCount() const;
 
     // gets the value of Nth parameter (as string only for now)

-    wxString GetParam(size_t n) const;
+    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:
 
 private:

+    // get usage string
+    wxString GetUsageString();
+

     // common part of all ctors
     void Init();
 
     struct wxCmdLineParserData *m_data;
 };
 
     // common part of all ctors
     void Init();
 
     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_
 #endif // _WX_CMDLINE_H_

+