compilation fix for raw bitmaps (can't include wx/rawbmp.h from wx/bitmap.h as the...

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 5899ddf64670accbf1028762f67c4717d5bd34a6..cdfb4d2fba1965d4ec252182206458f711df1514 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -13,16 +13,18 @@
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 
 #ifndef _WX_CMDLINE_H_
 #define _WX_CMDLINE_H_
 

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

     #pragma interface "cmdline.h"
 #endif
 
 #include "wx/defs.h"
     #pragma interface "cmdline.h"
 #endif
 
 #include "wx/defs.h"

+

 #include "wx/string.h"
 #include "wx/string.h"

+#include "wx/arrstr.h"

 
 #if wxUSE_CMDLINE_PARSER
 
 
 #if wxUSE_CMDLINE_PARSER
 

-class WXDLLEXPORT wxDateTime;
+class WXDLLIMPEXP_BASE wxDateTime;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -91,7 +93,7 @@ struct wxCmdLineEntryDesc
 // 4. use GetXXX() to retrieve the parsed info
 // ----------------------------------------------------------------------------
 
 // 4. use GetXXX() to retrieve the parsed info
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser

 {
 public:
     // ctors and initializers
 {
 public:
     // ctors and initializers


@@ -99,20 +101,30 @@ public:
 
     // default ctor or ctor giving the cmd line in either Unix or Win form
     wxCmdLineParser() { Init(); }
 
     // 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); }
     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 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); }
     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
     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);
     void SetCmdLine(int argc, wxChar **argv);

+#endif // wxUSE_UNICODE

     void SetCmdLine(const wxString& cmdline);
 
     // not virtual, don't use this class polymorphically
     void SetCmdLine(const wxString& cmdline);
 
     // not virtual, don't use this class polymorphically


@@ -127,8 +139,8 @@ public:
     void SetSwitchChars(const wxString& switchChars);
 
     // long options are not POSIX-compliant, this option allows to disable them
     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();
 
 
     bool AreLongOptionsEnabled();
 


@@ -166,7 +178,7 @@ public:
     //
     // if showUsage is true, Usage() is called in case of syntax error or if
     // help was requested
     //
     // 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();
 
     // give the usage message describing all program options
     void Usage();


@@ -174,19 +186,19 @@ public:
     // get the command line arguments
     // ------------------------------
 
     // 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;
 
     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;
 
     // 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
     // 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
     // value in the provided pointer
     bool Found(const wxString& name, wxDateTime *value) const;
 #endif // wxUSE_DATETIME


@@ -219,7 +231,7 @@ private:
 
 // this function is always available (even if !wxUSE_CMDLINE_PARSER) because it
 // is used by wxWin itself under Windows
 
 // this function is always available (even if !wxUSE_CMDLINE_PARSER) because it
 // is used by wxWin itself under Windows

-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser

 {
 public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);
 {
 public:
     static wxArrayString ConvertStringToArgs(const wxChar *cmdline);