wxMenu Review, added Carbon Events and full OSX Support

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index ca9dbc04ea627b559517dc555b5aba2efe05dcc8..a6808091ea51e2364b48442b5a0f76b15022f774 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -13,16 +13,15 @@
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
     #pragma interface "cmdline.h"
 #endif
 
 #include "wx/defs.h"
+#include "wx/string.h"
 
 #if wxUSE_CMDLINE_PARSER
 
-#include "wx/string.h"
-
 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------
@@ -100,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
@@ -131,6 +130,8 @@ public:
     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);
 
@@ -162,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
-    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();
@@ -191,16 +195,35 @@ 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();
+    // Resets switches and options
+    void Reset();
+
+    // break down the command line in arguments
+    static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 
 private:
+    // get usage string
+    wxString GetUsageString();
+
     // common part of all ctors
     void Init();
 
     struct wxCmdLineParserData *m_data;
+
+    DECLARE_NO_COPY_CLASS(wxCmdLineParser)
 };
 
-#endif // wxUSE_CMDLINE_PARSER
+#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_
+