X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9d2f3c71d83c52fc4db6c8041de533562816b1d6..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/fileconf.h

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index d5e34274d4..b7cc9c2cdc 100644
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -18,17 +18,11 @@
 #endif
 
 #include "wx/defs.h"
-#include "wx/textfile.h"
-#include "wx/string.h"
 
-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#if wxUSE_CONFIG
 
-// it won't compile without it anyhow
-#ifndef wxUSE_CONFIG
-  #error "Please define wxUSE_CONFIG or remove fileconf.cpp from your makefile"
-#endif // wxUSE_CONFIG
+#include "wx/textfile.h"
+#include "wx/string.h"
 
 // ----------------------------------------------------------------------------
 // wxFileConfig
@@ -127,7 +121,7 @@ private:
            *m_pPrev;        // previous one
 };
 
-class wxFileConfig : public wxConfigBase
+class WXDLLEXPORT wxFileConfig : public wxConfigBase
 {
 public:
   // construct the "standard" full name for global (system-wide) and
@@ -147,14 +141,22 @@ public:
     // 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,
-               const wxString& vendorName = _T(""),
-               const wxString& localFilename = _T(""),
-               const wxString& globalFilename = _T(""),
+               const wxString& vendorName = wxT(""),
+               const wxString& localFilename = wxT(""),
+               const wxString& globalFilename = wxT(""),
                long style = wxCONFIG_USE_LOCAL_FILE);
 
     // dtor will save unsaved data
   virtual ~wxFileConfig();
 
+  // under Unix, set the umask to be used for the file creation, do nothing
+  // under other systems
+#ifdef __UNIX__
+  void SetUmask(int mode) { m_umask = mode; }
+#else // !__UNIX__
+  void SetUmask(int WXUNUSED(mode)) { }
+#endif // __UNIX__/!__UNIX__
+
   // implement inherited pure virtual functions
   virtual void SetPath(const wxString& strPath);
   virtual const wxString& GetPath() const { return m_strPath; }
@@ -200,6 +202,8 @@ public:
     { return wxConfigBase::Write(key, value); }
   bool Write(const wxString& key, bool value)
     { return wxConfigBase::Write(key, value); }
+  bool Write(const wxString& key, const wxChar* value)
+    { return wxConfigBase::Write(key, value); }
 
   virtual bool Flush(bool bCurrentOnly = FALSE);
 
@@ -248,6 +252,10 @@ private:
   ConfigGroup *m_pRootGroup,      // the top (unnamed) group
               *m_pCurrentGroup;   // the current group
 
+#ifdef __UNIX__
+  int m_umask;                    // the umask to use for file creation
+#endif // __UNIX__
+
 public:
   WX_DEFINE_SORTED_ARRAY(ConfigEntry *, ArrayEntries);
   WX_DEFINE_SORTED_ARRAY(ConfigGroup *, ArrayGroups);
@@ -349,5 +357,9 @@ public:
   void SetLastGroup(ConfigGroup *pGroup) { m_pLastGroup = pGroup; }
 };
 
-#endif  //_FILECONF_H
+#endif
+  // wxUSE_CONFIG
+
+#endif  
+  //_FILECONF_H