warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/cmdline.h b/include/wx/cmdline.h
index 5899ddf64670accbf1028762f67c4717d5bd34a6..ccfe008b4e91992b6d7aacf7d234298494b5fc19 100644 (file)
--- a/include/wx/cmdline.h
+++ b/include/wx/cmdline.h
@@ -18,11 +18,13 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/string.h"
 
 #if wxUSE_CMDLINE_PARSER
 
-class WXDLLEXPORT wxDateTime;
+#include "wx/string.h"
+#include "wx/arrstr.h"
+
+class WXDLLIMPEXP_BASE wxDateTime;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -91,7 +93,7 @@ struct wxCmdLineEntryDesc
 // 4. use GetXXX() to retrieve the parsed info
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxCmdLineParser
+class WXDLLIMPEXP_BASE wxCmdLineParser
 {
 public:
     // ctors and initializers
@@ -219,7 +221,7 @@ private:
 
 // 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);