X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40a883289146ba2b4acbf7558dd55a2e5924cf38..401e3b6e5f50f15571b86297b5d1e3f55c473f6f:/include/wx/msw/regconf.h diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h index 3a1bca89a1..f9d73d9cae 100644 --- a/include/wx/msw/regconf.h +++ b/include/wx/msw/regconf.h @@ -12,14 +12,16 @@ #ifndef _REGCONF_H #define _REGCONF_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "regconf.h" #endif #ifndef _REGISTRY_H #include "wx/msw/registry.h" #endif + #include "wx/object.h" +#include "wx/confbase.h" // ---------------------------------------------------------------------------- // wxRegConfig @@ -30,11 +32,11 @@ class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase public: // ctor & dtor // will store data in HKLM\appName and HKCU\appName - wxRegConfig(const wxString& appName = _T(""), - const wxString& vendorName = _T(""), - const wxString& localFilename = _T(""), - const wxString& globalFilename = _T(""), - long style = 0); + wxRegConfig(const wxString& appName = wxEmptyString, + const wxString& vendorName = wxEmptyString, + const wxString& localFilename = wxEmptyString, + const wxString& globalFilename = wxEmptyString, + long style = wxCONFIG_USE_GLOBAL_FILE); // dtor will save unsaved data virtual ~wxRegConfig();