X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bddd7a8d8953cf4c09e56c13e1bfcc594ba0267e..939fba6c17da245488a77a3f58e983180fc5de91:/include/wx/fileconf.h diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index d366ceb4f3..573fbc430f 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 @@ -116,10 +116,10 @@ public: // ctor & dtor // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE or // wxCONFIG_USE_GLOBAL_FILE to say which files should be used. - wxFileConfig(const wxString& appName = wxT(""), - const wxString& vendorName = wxT(""), - const wxString& localFilename = wxT(""), - const wxString& globalFilename = wxT(""), + wxFileConfig(const wxString& appName = wxEmptyString, + const wxString& vendorName = wxEmptyString, + const wxString& localFilename = wxEmptyString, + const wxString& globalFilename = wxEmptyString, long style = wxCONFIG_USE_LOCAL_FILE, wxMBConv& conv = wxConvUTF8);