X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2b87f38d9092b56591728558f2cc13cac6a58af..6b5d2431fc188c03bd43ef69b5ad3197646c9289:/include/wx/cmdline.h?ds=sidebyside

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index c6a7399074..dc1d4ee9da 100644
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -7,22 +7,20 @@
 // Created:     04.01.00
 // RCS-ID:      $Id$
 // Copyright:   (c) 2000 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "cmdline.h"
-#endif
-
 #include "wx/defs.h"
+
 #include "wx/string.h"
+#include "wx/arrstr.h"
 
 #if wxUSE_CMDLINE_PARSER
 
-class WXDLLEXPORT wxDateTime;
+class WXDLLIMPEXP_BASE wxDateTime;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -91,7 +89,7 @@ struct wxCmdLineEntryDesc
 // 4. use GetXXX() to retrieve the parsed info
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser
 {
 public:
     // ctors and initializers
@@ -99,20 +97,30 @@ 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); }
+#if wxUSE_UNICODE
     wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); }
+#endif // wxUSE_UNICODE
     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)
+        { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
+#if wxUSE_UNICODE
     wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv)
         { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
+#endif // wxUSE_UNICODE
     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);
+#if wxUSE_UNICODE
     void SetCmdLine(int argc, wxChar **argv);
+#endif // wxUSE_UNICODE
     void SetCmdLine(const wxString& cmdline);
 
     // not virtual, don't use this class polymorphically
@@ -127,8 +135,8 @@ public:
     void SetSwitchChars(const wxString& switchChars);
 
     // long options are not POSIX-compliant, this option allows to disable them
-    void EnableLongOptions(bool enable = TRUE);
-    void DisableLongOptions() { EnableLongOptions(FALSE); }
+    void EnableLongOptions(bool enable = true);
+    void DisableLongOptions() { EnableLongOptions(false); }
 
     bool AreLongOptionsEnabled();
 
@@ -162,11 +170,11 @@ 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
+    // syntax error occurred
     //
     // if showUsage is true, Usage() is called in case of syntax error or if
     // help was requested
-    int Parse(bool showUsage = TRUE);
+    int Parse(bool showUsage = true);
 
     // give the usage message describing all program options
     void Usage();
@@ -174,19 +182,19 @@ public:
     // get the command line arguments
     // ------------------------------
 
-    // returns TRUE if the given switch was found
+    // returns true if the given switch was found
     bool Found(const wxString& name) const;
 
-    // returns TRUE if an option taking a string value was found and stores the
+    // returns true if an option taking a string value was found and stores the
     // value in the provided pointer
     bool Found(const wxString& name, wxString *value) const;
 
-    // returns TRUE if an option taking an integer value was found and stores
+    // returns true if an option taking an integer value was found and stores
     // the value in the provided pointer
     bool Found(const wxString& name, long *value) const;
 
 #if wxUSE_DATETIME
-    // returns TRUE if an option taking a date value was found and stores the
+    // returns true if an option taking a date value was found and stores the
     // value in the provided pointer
     bool Found(const wxString& name, wxDateTime *value) const;
 #endif // wxUSE_DATETIME
@@ -219,7 +227,7 @@ private:
 
 // this function is always available (even if !wxUSE_CMDLINE_PARSER) because it
 // is used by wxWin itself under Windows
-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser
 {
 public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);