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 4414c8e7a913755f290606ddc33f7b1678d167af..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"
 
+class WXDLLIMPEXP_BASE wxArrayString;
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -73,7 +75,8 @@ enum
 // Keys are pairs "key_name = value" where value may be of string or integer
 // (long) type (TODO doubles and other types such as wxDate coming soon).
 // ----------------------------------------------------------------------------
-class WXDLLEXPORT wxConfigBase
+
+class WXDLLIMPEXP_BASE wxConfigBase
 {
 public:
   // constants
@@ -292,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.
-class wxConfigPathChanger
+class WXDLLIMPEXP_BASE wxConfigPathChanger
 {
 public:
   // ctor/dtor do path changing/restorin
@@ -308,7 +311,7 @@ private:
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
 
-    DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
+  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)
 };
 
 
@@ -338,12 +341,12 @@ private:
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
 */
 
-WXDLLEXPORT wxString wxExpandEnvVars(const wxString &sz);
+WXDLLIMPEXP_BASE wxString wxExpandEnvVars(const wxString &sz);
 
 /*
   Split path into parts removing '..' in progress
  */
-WXDLLEXPORT void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
+WXDLLIMPEXP_BASE void wxSplitPath(wxArrayString& aParts, const wxChar *sz);
 
 
 #endif