warnings (and some errors) fixes for wxUniv DLL build

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index ec4c35bee4b8c0b8b910ec3c6b41f326680ce679..16b7ba3a883eaac34a1baa7dc2f0f2433f0d0578 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -21,6 +21,8 @@
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

+class WXDLLIMPEXP_BASE wxArrayString;
+

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


@@ -74,7 +76,7 @@ enum
 // (long) type (TODO doubles and other types such as wxDate coming soon).
 // ----------------------------------------------------------------------------
 
 // (long) type (TODO doubles and other types such as wxDate coming soon).
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxConfigBase
+class WXDLLIMPEXP_BASE wxConfigBase

 {
 public:
   // constants
 {
 public:
   // constants


@@ -293,7 +295,7 @@ private:
 // you work in the entry directory and the path is automatically restored
 // when the function returns
 // Taken out of wxConfig since not all compilers can cope with nested classes.
 // you work in the entry directory and the path is automatically restored
 // when the function returns
 // Taken out of wxConfig since not all compilers can cope with nested classes.

-class WXDLLEXPORT_BASE wxConfigPathChanger
+class WXDLLIMPEXP_BASE wxConfigPathChanger

 {
 public:
   // ctor/dtor do path changing/restorin
 {
 public:
   // ctor/dtor do path changing/restorin


@@ -339,12 +341,12 @@ private:
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
 */
 
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
 */
 

-WXDLLEXPORT_BASE wxString wxExpandEnvVars(const wxString &sz);
+WXDLLIMPEXP_BASE wxString wxExpandEnvVars(const wxString &sz);

 
 /*
   Split path into parts removing '..' in progress
  */
 
 /*
   Split path into parts removing '..' in progress
  */

-WXDLLEXPORT_BASE void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
+WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxChar *sz);

 
 
 #endif
 
 
 #endif