crash in wxAppBase::SetActive fixed

[wxWidgets.git] / include / wx / fileconf.h

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index f6c4718919e90e72e38315e78574cab3cb9c4f01..b7cc9c2cdcf47b67fab4c7354a391c6f3c302343 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -121,7 +121,7 @@ private:
            *m_pPrev;        // previous one
 };
 
            *m_pPrev;        // previous one
 };
 

-class wxFileConfig : public wxConfigBase
+class WXDLLEXPORT wxFileConfig : public wxConfigBase

 {
 public:
   // construct the "standard" full name for global (system-wide) and
 {
 public:
   // construct the "standard" full name for global (system-wide) and


@@ -141,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,
     // 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();
 
                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; }
   // implement inherited pure virtual functions
   virtual void SetPath(const wxString& strPath);
   virtual const wxString& GetPath() const { return m_strPath; }


@@ -194,6 +202,8 @@ public:
     { return wxConfigBase::Write(key, value); }
   bool Write(const wxString& key, bool value)
     { return wxConfigBase::Write(key, value); }
     { 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);
 
 
   virtual bool Flush(bool bCurrentOnly = FALSE);
 


@@ -242,6 +252,10 @@ private:
   ConfigGroup *m_pRootGroup,      // the top (unnamed) group
               *m_pCurrentGroup;   // the current group
 
   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);
 public:
   WX_DEFINE_SORTED_ARRAY(ConfigEntry *, ArrayEntries);
   WX_DEFINE_SORTED_ARRAY(ConfigGroup *, ArrayGroups);