X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ee0f553126e492cd610e836adfc86a72b45b831f..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/cmdline.h?ds=sidebyside diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h index 66beea5a44..88ce4e51d3 100644 --- a/include/wx/cmdline.h +++ b/include/wx/cmdline.h @@ -13,10 +13,6 @@ #ifndef _WX_CMDLINE_H_ #define _WX_CMDLINE_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma interface "cmdline.h" -#endif - #include "wx/defs.h" #include "wx/string.h" @@ -24,7 +20,7 @@ #if wxUSE_CMDLINE_PARSER -class WXDLLIMPEXP_BASE wxDateTime; +class WXDLLIMPEXP_FWD_BASE wxDateTime; // ---------------------------------------------------------------------------- // constants @@ -68,13 +64,17 @@ enum wxCmdLineEntryType struct wxCmdLineEntryDesc { wxCmdLineEntryType kind; - const wxChar *shortName; - const wxChar *longName; - const wxChar *description; + const char *shortName; + const char *longName; + const char *description; wxCmdLineParamType type; int flags; }; +// the list of wxCmdLineEntryDesc objects should be terminated with this one +#define wxCMD_LINE_DESC_END \ + { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, 0x0 } + // ---------------------------------------------------------------------------- // wxCmdLineParser is a class for parsing command line. // @@ -101,20 +101,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 @@ -129,8 +139,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(); @@ -164,11 +174,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(); @@ -176,19 +186,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 @@ -203,7 +213,7 @@ public: void Reset(); // break down the command line in arguments - static wxArrayString ConvertStringToArgs(const wxChar *cmdline); + static wxArrayString ConvertStringToArgs(const wxString& cmdline); private: // get usage string @@ -224,7 +234,7 @@ private: class WXDLLIMPEXP_BASE wxCmdLineParser { public: - static wxArrayString ConvertStringToArgs(const wxChar *cmdline); + static wxArrayString ConvertStringToArgs(const wxString& cmdline); }; #endif // wxUSE_CMDLINE_PARSER/!wxUSE_CMDLINE_PARSER