wxPython updates (SWIG really works, cannot believe it)

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

diff --git a/include/wx/fileconf.h b/include/wx/fileconf.h
index 5bdb0f35cf57c2dbf1cb32e75a5fd5ce69eb6e90..532f0c4a63b7192ccf3cf2198fc10aa2b6f45dbc 100644 (file)
--- a/include/wx/fileconf.h
+++ b/include/wx/fileconf.h
@@ -26,9 +26,9 @@
 // ----------------------------------------------------------------------------
 
 // it won't compile without it anyhow
-#ifndef USE_CONFIG
-  #error "Please define USE_CONFIG or remove fileconf.cpp from your makefile"
-#endif // USE_CONFIG
+#ifndef wxUSE_CONFIG
+  #error "Please define wxUSE_CONFIG or remove fileconf.cpp from your makefile"
+#endif // wxUSE_CONFIG
 
 // ----------------------------------------------------------------------------
 // wxFileConfig
@@ -133,9 +133,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.
-  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();
@@ -155,18 +155,6 @@ public:
   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;
@@ -178,6 +166,10 @@ public:
   { 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
@@ -201,6 +193,9 @@ 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); }
@@ -208,8 +203,6 @@ public:
     //
     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;  }
@@ -324,9 +317,9 @@ public:
     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; }
+    bool  IsEmpty() const { return Entries().IsEmpty() && Groups().IsEmpty(); }
 
     // find entry/subgroup (NULL if not found)
     ConfigGroup *FindSubgroup(const char *szName) const;