X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fda7962d029672a5f4c718a3c6b2559856f4cd95..d6d6a882d4d8ea0d7ef706a45fa92b96f34c94c7:/include/wx/fileconf.h diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index b00ac59e49..ea5eab4493 100644 --- a/include/wx/fileconf.h +++ b/include/wx/fileconf.h @@ -13,7 +13,7 @@ #ifndef _FILECONF_H #define _FILECONF_H -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "fileconf.h" #endif @@ -23,6 +23,7 @@ #include "wx/textfile.h" #include "wx/string.h" +#include "wx/confbase.h" // ---------------------------------------------------------------------------- // wxFileConfig @@ -120,7 +121,7 @@ public: const wxString& vendorName = wxEmptyString, const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString, - long style = wxCONFIG_USE_LOCAL_FILE, + long style = wxCONFIG_USE_LOCAL_FILE | wxCONFIG_USE_GLOBAL_FILE, wxMBConv& conv = wxConvUTF8); #if wxUSE_STREAMS