X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2ba4130573b01a7427f8fdd8349093f830ddfbd9..3964e424bf6b70e43b7cf53ef41d279e4da5c037:/include/wx/fileconf.h?ds=inline diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h index 2e997b65d6..f383998e96 100644 --- a/include/wx/fileconf.h +++ b/include/wx/fileconf.h @@ -7,13 +7,13 @@ // RCS-ID: $Id$ // Copyright: (c) 1997 Karsten Ballüder & Vadim Zeitlin // Ballueder@usa.net -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifndef _FILECONF_H #define _FILECONF_H -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface "fileconf.h" #endif @@ -95,6 +95,7 @@ class WXDLLEXPORT wxFileConfigGroup; class WXDLLEXPORT wxFileConfigEntry; class WXDLLEXPORT wxFileConfigLineList; +class WXDLLEXPORT wxInputStream; class WXDLLEXPORT wxFileConfig : public wxConfigBase { @@ -119,11 +120,13 @@ public: const wxString& vendorName = wxT(""), const wxString& localFilename = wxT(""), const wxString& globalFilename = wxT(""), - long style = wxCONFIG_USE_LOCAL_FILE); + long style = wxCONFIG_USE_LOCAL_FILE, + wxMBConv& conv = wxConvUTF8); #if wxUSE_STREAMS // ctor that takes an input stream. - wxFileConfig(wxInputStream &inStream); + wxFileConfig(wxInputStream &inStream, + wxMBConv& conv = wxConvUTF8); #endif // wxUSE_STREAMS // dtor will save unsaved data @@ -157,7 +160,7 @@ public: virtual bool RenameEntry(const wxString& oldName, const wxString& newName); virtual bool RenameGroup(const wxString& oldName, const wxString& newName); - virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso); + virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = TRUE); virtual bool DeleteGroup(const wxString& szKey); virtual bool DeleteAll(); @@ -206,9 +209,13 @@ private: wxFileConfigGroup *m_pRootGroup, // the top (unnamed) group *m_pCurrentGroup; // the current group + wxMBConv &m_conv; + #ifdef __UNIX__ int m_umask; // the umask to use for file creation #endif // __UNIX__ + + DECLARE_NO_COPY_CLASS(wxFileConfig) }; #endif