Renamed internal GetClientWindow to GetClientAreaWindow so

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index a3a685ce3fe417c7dafd10c771e52bf909f53f01..01e4ffc269faac74af4e09197ccfc913c0952ce1 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -18,11 +18,10 @@
 #endif
 
 #include "wx/defs.h"
 #endif
 
 #include "wx/defs.h"

+#include "wx/string.h"

 
 #if wxUSE_CMDLINE_PARSER
 
 
 #if wxUSE_CMDLINE_PARSER
 

-#include "wx/string.h"
-

 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------
 class WXDLLEXPORT wxDateTime;
 
 // ----------------------------------------------------------------------------


@@ -131,6 +130,8 @@ public:
     void EnableLongOptions(bool enable = TRUE);
     void DisableLongOptions() { EnableLongOptions(FALSE); }
 
     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);
 
     // 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
     // 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();
 
     // give the usage message describing all program options
     void Usage();


@@ -191,16 +195,33 @@ public:
     // gets the value of Nth parameter (as string only for now)
     wxString GetParam(size_t n = 0u) const;
 
     // 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:
 
 private:

+    // get usage string
+    wxString GetUsageString();
+

     // common part of all ctors
     void Init();
 
     struct wxCmdLineParserData *m_data;
 };
 
     // common part of all ctors
     void Init();
 
     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_
 
 #endif // _WX_CMDLINE_H_

+