X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b3fe1f6e766caf35aa3ff4ce0ac01d31699da71..b6e2eddeaf7e559589ce41ac41e88f9bd71c5a08:/include/wx/fileconf.h?ds=sidebyside diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index 8ac261c3b0..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 @@ -92,12 +92,12 @@ (it's on by default, the current status can be retrieved with IsExpandingEnvVars function). */ -class WXDLLEXPORT wxFileConfigGroup; -class WXDLLEXPORT wxFileConfigEntry; -class WXDLLEXPORT wxFileConfigLineList; -class WXDLLEXPORT wxInputStream; +class WXDLLIMPEXP_BASE wxFileConfigGroup; +class WXDLLIMPEXP_BASE wxFileConfigEntry; +class WXDLLIMPEXP_BASE wxFileConfigLineList; +class WXDLLIMPEXP_BASE wxInputStream; -class WXDLLEXPORT wxFileConfig : public wxConfigBase +class WXDLLIMPEXP_BASE wxFileConfig : public wxConfigBase { public: // construct the "standard" full name for global (system-wide) and @@ -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);