Unicode compilation fix.

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index dccfc4068758b21f061ddd84b65697fab534b45d..bc8c8936549f483dfcd315597f275377275f7992 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -13,16 +13,15 @@
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

     #pragma interface "cmdline.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "cmdline.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();


@@ -198,6 +202,9 @@ public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 
 private:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 
 private:

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

     // common part of all ctors
     void Init();
 
     // common part of all ctors
     void Init();