Some OS/2 updates

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 6ac61e93619d69ce0abc6cd7aba5c37b2fc86867..a3a685ce3fe417c7dafd10c771e52bf909f53f01 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -17,6 +17,10 @@
     #pragma interface "cmdline.h"
 #endif
 
     #pragma interface "cmdline.h"
 #endif
 

+#include "wx/defs.h"
+
+#if wxUSE_CMDLINE_PARSER
+

 #include "wx/string.h"
 
 class WXDLLEXPORT wxDateTime;
 #include "wx/string.h"
 
 class WXDLLEXPORT wxDateTime;


@@ -96,20 +100,20 @@ 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); }
+    wxCmdLineParser(int argc, wxChar **argv) { Init(); SetCmdLine(argc, argv); }

     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)
+    wxCmdLineParser(const wxCmdLineEntryDesc *desc, int argc, wxChar **argv)

         { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
     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
         { Init(); SetCmdLine(argc, argv); SetDesc(desc); }
     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);
+    void SetCmdLine(int argc, wxChar **argv);

     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


@@ -197,4 +201,6 @@ private:
     struct wxCmdLineParserData *m_data;
 };
 
     struct wxCmdLineParserData *m_data;
 };
 

+#endif // wxUSE_CMDLINE_PARSER
+

 #endif // _WX_CMDLINE_H_
 #endif // _WX_CMDLINE_H_