X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff1ce99740964bffda6e8ee630ddf799d639cf69..52170c5b4419c63d6e0083df411aad420395ec98:/include/wx/cmdline.h?ds=sidebyside

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index cdfb4d2fba..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.
 //
@@ -174,7 +174,7 @@ 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
@@ -213,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
@@ -234,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