don't use border styles for windows in wxUniversal

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index a3a685ce3fe417c7dafd10c771e52bf909f53f01..b34d1142255cafa2ed3e15da6fa286d5cc41960a 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -18,11 +18,10 @@
 #endif
 
 #include "wx/defs.h"
+#include "wx/string.h"
 
 #if wxUSE_CMDLINE_PARSER
 
-#include "wx/string.h"
-
 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------
@@ -162,7 +161,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,8 +193,11 @@ 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:
     // common part of all ctors
@@ -201,6 +206,17 @@ private:
     struct wxCmdLineParserData *m_data;
 };
 
-#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_
+