Unicode compilation fixes.

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

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index c4712f714795de2e3aca278850ddf4c9582ce69b..c2cf0404b1072c49b1a32f8fffccac333963b367 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        fileconf.h
+// Name:        wx/fileconf.h

 // Purpose:     wxFileConfig derivation of wxConfigBase
 // Author:      Vadim Zeitlin
 // Modified by:
 // Purpose:     wxFileConfig derivation of wxConfigBase
 // Author:      Vadim Zeitlin
 // Modified by:


@@ -18,17 +18,11 @@
 #endif
 
 #include "wx/defs.h"
 #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
 
 // ----------------------------------------------------------------------------
 // wxFileConfig


@@ -98,36 +92,11 @@
   (it's on by default, the current status can be retrieved with
    IsExpandingEnvVars function).
 */
   (it's on by default, the current status can be retrieved with
    IsExpandingEnvVars function).
 */

-class wxFileConfig;
-class ConfigGroup;
-class ConfigEntry;
-
-// we store all lines of the local config file as a linked list in memory
-class LineList
-{
-public:
-  void      SetNext(LineList *pNext)  { m_pNext = pNext; }
-  void      SetPrev(LineList *pPrev)  { m_pPrev = pPrev; }
-
-  // ctor
-  LineList(const wxString& str, LineList *pNext = (LineList *) NULL) : m_strLine(str)
-    { SetNext(pNext); SetPrev((LineList *) NULL); }
-
-  //
-  LineList *Next() const              { return m_pNext;  }
-  LineList *Prev() const              { return m_pPrev;  }
+class WXDLLEXPORT wxFileConfigGroup;
+class WXDLLEXPORT wxFileConfigEntry;
+class WXDLLEXPORT wxFileConfigLineList;

 
 

-  //
-  void SetText(const wxString& str) { m_strLine = str;  }
-  const wxString& Text() const      { return m_strLine; }
-
-private:
-  wxString  m_strLine;      // line contents
-  LineList *m_pNext,        // next node
-           *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


@@ -140,34 +109,29 @@ public:
   //
   // where file is the basename of szFile, ext is it's extension
   // or .conf (Unix) or .ini (Win) if it has none
   //
   // where file is the basename of szFile, ext is it's extension
   // or .conf (Unix) or .ini (Win) if it has none

-  static wxString GetGlobalFileName(const char *szFile);
-  static wxString GetLocalFileName(const char *szFile);
+  static wxString GetGlobalFileName(const wxChar *szFile);
+  static wxString GetLocalFileName(const wxChar *szFile);

 
   // ctor & dtor
 
   // ctor & dtor

-
-#if 0
-    // the names of local and global (if not disabled) config files are
-    // constructed using Get{Local|Global}FileName functions described above
-    // (szAppName is just the (short) name of your application)
-  wxFileConfig(const char *szAppName, bool bLocalOnly = FALSE);
-    // this ctor allows you to specify custom names for both files (if strGlobal
-    // isn't a full path, it's considered to be relative to the standard
-    // directory, i.e. /etc under Unix and %windir% under Windows, if strLocal
-    // is not an absolute path, it's considered to be relative to the user's
-    // directory). If either of strings is empty, the corresponding file is not
-    // used.
-  wxFileConfig(const wxString& strLocal, const wxString& strGlobal);
-#endif
-
-   // 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 = "",
-               const wxString& localFilename = "", const wxString& globalFilename = "",
+    // 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 = 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; }


@@ -213,6 +177,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);
 


@@ -225,10 +191,10 @@ public:
 
 public:
   // functions to work with this list
 
 public:
   // functions to work with this list

-  LineList *LineListAppend(const wxString& str);
-  LineList *LineListInsert(const wxString& str,
-                           LineList *pLine);    // NULL => Prepend()
-  void      LineListRemove(LineList *pLine);
+  wxFileConfigLineList *LineListAppend(const wxString& str);
+  wxFileConfigLineList *LineListInsert(const wxString& str,
+                           wxFileConfigLineList *pLine);    // NULL => Prepend()
+  void      LineListRemove(wxFileConfigLineList *pLine);

   bool      LineListIsEmpty();
 
 private:
   bool      LineListIsEmpty();
 
 private:


@@ -251,116 +217,24 @@ private:
 
   // member variables
   // ----------------
 
   // member variables
   // ----------------

-  LineList   *m_linesHead,        // head of the linked list
-             *m_linesTail;        // tail
+  wxFileConfigLineList *m_linesHead,        // head of the linked list
+                       *m_linesTail;        // tail

 
   wxString    m_strLocalFile,     // local  file name passed to ctor
               m_strGlobalFile;    // global
   wxString    m_strPath;          // current path (not '/' terminated)
 
 
   wxString    m_strLocalFile,     // local  file name passed to ctor
               m_strGlobalFile;    // global
   wxString    m_strPath;          // current path (not '/' terminated)
 

-  ConfigGroup *m_pRootGroup,      // the top (unnamed) group
-              *m_pCurrentGroup;   // the current group
+  wxFileConfigGroup *m_pRootGroup,      // the top (unnamed) group
+                    *m_pCurrentGroup;   // the current group

 
 

-public:
-  WX_DEFINE_SORTED_ARRAY(ConfigEntry *, ArrayEntries);
-  WX_DEFINE_SORTED_ARRAY(ConfigGroup *, ArrayGroups);
+#ifdef __UNIX__
+  int m_umask;                    // the umask to use for file creation
+#endif // __UNIX__

 };
 
 };
 

-class ConfigEntry
-{
-private:
-  ConfigGroup  *m_pParent;      // group that contains us
-  wxString      m_strName,      // entry name
-                m_strValue;     //       value
-  bool          m_bDirty,       // changed since last read?
-                m_bImmutable;   // can be overriden locally?
-  int           m_nLine;        // used if m_pLine == NULL only
-  LineList     *m_pLine;        // pointer to our line in the linked list
-                                // or NULL if it was found in global file
-
-public:
-  ConfigEntry(ConfigGroup *pParent, const wxString& strName, int nLine);
-
-  // simple accessors
-  const wxString& Name()        const { return m_strName;    }
-  const wxString& Value()       const { return m_strValue;   }
-  ConfigGroup    *Group()       const { return m_pParent;    }
-  bool            IsDirty()     const { return m_bDirty;     }
-  bool            IsImmutable() const { return m_bImmutable; }
-  bool            IsLocal()     const { return m_pLine != 0; }
-  int             Line()        const { return m_nLine;      }
-  LineList       *GetLine()     const { return m_pLine;      }
-
-  // modify entry attributes
-  void SetValue(const wxString& strValue, bool bUser = TRUE);
-  void SetDirty();
-  void SetLine(LineList *pLine);
-};
-
-class ConfigGroup
-{
-private:
-  wxFileConfig *m_pConfig;        // config object we belong to
-  ConfigGroup  *m_pParent;        // parent group (NULL for root group)
-  wxFileConfig::ArrayEntries  m_aEntries;       // entries in this group
-  wxFileConfig::ArrayGroups   m_aSubgroups;     // subgroups
-  wxString      m_strName;        // group's name
-  bool          m_bDirty;         // if FALSE => all subgroups are not dirty
-  LineList     *m_pLine;          // pointer to our line in the linked list
-  ConfigEntry  *m_pLastEntry;     // last entry/subgroup of this group in the
-  ConfigGroup  *m_pLastGroup;     // local file (we insert new ones after it)
-
-  // DeleteSubgroupByName helper
-  bool DeleteSubgroup(ConfigGroup *pGroup);
-
-public:
-  // ctor
-  ConfigGroup(ConfigGroup *pParent, const wxString& strName, wxFileConfig *);
-
-  // dtor deletes all entries and subgroups also
-  ~ConfigGroup();
-
-  // simple accessors
-  const wxString& Name()    const { return m_strName; }
-  ConfigGroup    *Parent()  const { return m_pParent; }
-  wxFileConfig   *Config()  const { return m_pConfig; }
-  bool            IsDirty() const { return m_bDirty;  }
-
-  const wxFileConfig::ArrayEntries& Entries() const { return m_aEntries;   }
-  const wxFileConfig::ArrayGroups&  Groups()  const { return m_aSubgroups; }
-  bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
-
-  // find entry/subgroup (NULL if not found)
-  ConfigGroup *FindSubgroup(const char *szName) const;
-  ConfigEntry *FindEntry   (const char *szName) const;
-
-  // delete entry/subgroup, return FALSE if doesn't exist
-  bool DeleteSubgroupByName(const char *szName);
-  bool DeleteEntry(const char *szName);
-
-  // create new entry/subgroup returning pointer to newly created element
-  ConfigGroup *AddSubgroup(const wxString& strName);
-  ConfigEntry *AddEntry   (const wxString& strName, int nLine = wxNOT_FOUND);
-
-  // will also recursively set parent's dirty flag
-  void SetDirty();
-  void SetLine(LineList *pLine);
-
-  // rename: no checks are done to ensure that the name is unique!
-  void Rename(const wxString& newName);
-
-  //
-  wxString GetFullName() const;
-
-  // get the last line belonging to an entry/subgroup of this group
-  LineList *GetGroupLine();     // line which contains [group]
-  LineList *GetLastEntryLine(); // after which our subgroups start
-  LineList *GetLastGroupLine(); // after which the next group starts
-
-  // called by entries/subgroups when they're created/deleted
-  void SetLastEntry(ConfigEntry *pEntry) { m_pLastEntry = pEntry; }
-  void SetLastGroup(ConfigGroup *pGroup) { m_pLastGroup = pGroup; }
-};
+#endif
+  // wxUSE_CONFIG

 
 

-#endif  //_FILECONF_H
+#endif  
+  //_FILECONF_H