Reneabled inlining, but kept warnings disabled....

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

diff --git a/include/wx/confbase.h b/include/wx/confbase.h
index 73c5e6a968e85fca5018dc7291dcbb1398e94f17..6ce5b907a436eb509705313d18f2cc624e72a14e 100644 (file)
--- a/include/wx/confbase.h
+++ b/include/wx/confbase.h
@@ -8,19 +8,21 @@
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>
 // RCS-ID:      $Id$
 // Copyright:   (c) 1997 Karsten Ballüder   Ballueder@usa.net
 //                       Vadim Zeitlin      <zeitlin@dptmaths.ens-cachan.fr>

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_CONFBASE_H_
 #define   _WX_CONFBASE_H_
 
 ///////////////////////////////////////////////////////////////////////////////
 
 #ifndef   _WX_CONFBASE_H_
 #define   _WX_CONFBASE_H_
 

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

 #pragma interface "confbase.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/string.h"
 
 #pragma interface "confbase.h"
 #endif
 
 #include "wx/defs.h"
 #include "wx/string.h"
 

+class WXDLLIMPEXP_BASE wxArrayString;
+

 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 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).
 // ----------------------------------------------------------------------------
 // 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
 {
 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.
 // 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
 {
 public:
   // ctor/dtor do path changing/restorin


@@ -307,6 +310,8 @@ private:
   wxString      m_strName,      // name of entry (i.e. name only)
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?
   wxString      m_strName,      // name of entry (i.e. name only)
                 m_strOldPath;   // saved path
   bool          m_bChanged;     // was the path changed?

+
+  DECLARE_NO_COPY_CLASS(wxConfigPathChanger)

 };
 
 
 };
 
 


@@ -318,14 +323,11 @@ private:
 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
   #ifdef __WIN32__
     #define wxConfig  wxRegConfig
 #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE
   #ifdef __WIN32__
     #define wxConfig  wxRegConfig

-    #define sm_classwxConfig sm_classwxRegConfig

   #else  //WIN16
     #define wxConfig  wxIniConfig
   #else  //WIN16
     #define wxConfig  wxIniConfig

-    #define sm_classwxConfig sm_classwxIniConfig

   #endif
 #else // either we're under Unix or wish to use files even under Windows
   #define wxConfig  wxFileConfig
   #endif
 #else // either we're under Unix or wish to use files even under Windows
   #define wxConfig  wxFileConfig

-  #define sm_classwxConfig sm_classwxFileConfig

 #endif
 
 #endif // wxUSE_CONFIG
 #endif
 
 #endif // wxUSE_CONFIG


@@ -336,12 +338,12 @@ private:
   '_' only. '$' must be escaped ('\$') in order to be taken literally.
 */
 
   '_' 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
  */
 
 /*
   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
 
 
 #endif