X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..1169a91932273bc84c23ed9dbd0a2da064d59d66:/include/wx/confbase.h diff --git a/include/wx/confbase.h b/include/wx/confbase.h index d17b0409e4..6ce5b907a4 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -14,13 +14,15 @@ #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" +class WXDLLIMPEXP_BASE wxArrayString; + // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -321,14 +323,11 @@ private: #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE #ifdef __WIN32__ #define wxConfig wxRegConfig - #define sm_classwxConfig sm_classwxRegConfig #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 - #define sm_classwxConfig sm_classwxFileConfig #endif #endif // wxUSE_CONFIG