Compilation fixes

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

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index dcf9d10e4289dbf3dfefe3c7d213e6928a435cba..e4eec24fa1d36a34464cd1c3277634e80a5bbe0f 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -17,14 +17,14 @@
 #pragma interface "fileconf.h"
 #endif
 
 #pragma interface "fileconf.h"
 #endif
 

-// ----------------------------------------------------------------------------
-// compile options
-// ----------------------------------------------------------------------------
+#include "wx/defs.h"
+
+#ifdef wxUSE_CONFIG
+
+#include "wx/confbase.h"
+#include "wx/textfile.h"
+#include "wx/string.h"

 
 

-// it won't compile without it anyhow
-#ifndef USE_WXCONFIG
-  #error "Please define USE_WXCONFIG or remove fileconf.cpp from your makefile"
-#endif // USE_WXCONFIG

 
 // ----------------------------------------------------------------------------
 // wxFileConfig
 
 // ----------------------------------------------------------------------------
 // wxFileConfig


@@ -129,9 +129,9 @@ public:
 
    // New constructor: one size fits all. Specify wxCONFIG_USE_LOCAL_FILE
    // or wxCONFIG_USE_GLOBAL_FILE to say which files should be used.
 
    // 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 = wxEmptyString,
-    const wxString& localFilename = wxEmptyString, const wxString& globalFilename = wxEmptyString,
-    long style = wxCONFIG_USE_LOCAL_FILE);
+  wxFileConfig(const wxString& appName, const wxString& vendorName = "",
+               const wxString& localFilename = "", const wxString& globalFilename = "",
+               long style = wxCONFIG_USE_LOCAL_FILE);

 
     // dtor will save unsaved data
   virtual ~wxFileConfig();
 
     // dtor will save unsaved data
   virtual ~wxFileConfig();


@@ -151,18 +151,6 @@ public:
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
 
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
 

-#if 0
-  virtual bool Read(wxString *pstr, const char *szKey,
-                    const char *szDefault = 0) const;
-  virtual const char *Read(const char *szKey,
-                           const char *szDefault = 0) const;
-  virtual bool Read(long *pl, const char *szKey, long lDefault) const;
-  virtual long Read(const char *szKey, long lDefault) const
-    { return wxConfigBase::Read(szKey, lDefault); }
-  virtual bool Write(const char *szKey, const char *szValue);
-  virtual bool Write(const char *szKey, long lValue);
-#endif
-

   virtual bool Read(const wxString& key, wxString *pStr) const;
   virtual bool Read(const wxString& key, wxString *pStr, const wxString& defValue) const;
   virtual bool Read(const wxString& key, long *pl) const;
   virtual bool Read(const wxString& key, wxString *pStr) const;
   virtual bool Read(const wxString& key, wxString *pStr, const wxString& defValue) const;
   virtual bool Read(const wxString& key, long *pl) const;


@@ -174,6 +162,10 @@ public:
   { return wxConfigBase::Read(key, pl, defVal); }
   long Read(const wxString& key, long defVal) const
   { return wxConfigBase::Read(key, defVal); }
   { return wxConfigBase::Read(key, pl, defVal); }
   long Read(const wxString& key, long defVal) const
   { return wxConfigBase::Read(key, defVal); }

+  bool Read(const wxString& key, int *pi, int defVal) const
+    { return wxConfigBase::Read(key, pi, defVal); }
+  bool Read(const wxString& key, int *pi) const
+    { return wxConfigBase::Read(key, pi); }

   bool Read(const wxString& key, double* val) const
   { return wxConfigBase::Read(key, val); }
   bool Read(const wxString& key, double* val, double defVal) const
   bool Read(const wxString& key, double* val) const
   { return wxConfigBase::Read(key, val); }
   bool Read(const wxString& key, double* val, double defVal) const


@@ -197,6 +189,9 @@ public:
   class LineList
   {
   public:
   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); }
     // ctor
     LineList(const wxString& str, LineList *pNext = (LineList *) NULL) : m_strLine(str)
       { SetNext(pNext); SetPrev((LineList *) NULL); }


@@ -204,8 +199,6 @@ public:
     //
     LineList *Next() const              { return m_pNext;  }
     LineList *Prev() const              { return m_pPrev;  }
     //
     LineList *Next() const              { return m_pNext;  }
     LineList *Prev() const              { return m_pPrev;  }

-    void      SetNext(LineList *pNext)  { m_pNext = pNext; }
-    void      SetPrev(LineList *pPrev)  { m_pPrev = pPrev; }

 
     //
     void SetText(const wxString& str) { m_strLine = str;  }
 
     //
     void SetText(const wxString& str) { m_strLine = str;  }


@@ -320,9 +313,9 @@ public:
     wxFileConfig   *Config()  const { return m_pConfig; }
     bool            IsDirty() const { return m_bDirty;  }
 
     wxFileConfig   *Config()  const { return m_pConfig; }
     bool            IsDirty() const { return m_bDirty;  }
 

-    bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }

     const ArrayEntries& Entries() const { return m_aEntries;   }
     const ArrayGroups&  Groups()  const { return m_aSubgroups; }
     const ArrayEntries& Entries() const { return m_aEntries;   }
     const 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;
 
     // find entry/subgroup (NULL if not found)
     ConfigGroup *FindSubgroup(const char *szName) const;


@@ -354,5 +347,9 @@ public:
   };
 };
 
   };
 };
 

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