resolving conflicts in files I had forgot to commit (sorry)

[wxWidgets.git] / include / wx / msw / regconf.h

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 8cad906888c9d3fc52f6056b3fdce791815f4308..666547a35d07368923a30397dae51ed284f0bde5 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -12,27 +12,28 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "regconf.h"
 #endif
 
 #ifndef   _REGISTRY_H
-  #include <wx/msw/registry.h>
+  #include "wx/msw/registry.h"
 #endif
+#include "wx/object.h"
 
 // ----------------------------------------------------------------------------
 // wxRegConfig
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT wxRegConfig : public wxConfigBase
+class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase
 {
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName
-  wxRegConfig(const wxString& appName = "",
-              const wxString& vendorName = "",
-              const wxString& localFilename = "",
-              const wxString& globalFilename = "",
+  wxRegConfig(const wxString& appName = wxEmptyString,
+              const wxString& vendorName = wxEmptyString,
+              const wxString& localFilename = wxEmptyString,
+              const wxString& globalFilename = wxEmptyString,
               long style = 0);
 
     // dtor will save unsaved data
@@ -62,52 +63,39 @@ public:
   virtual size_t GetNumberOfEntries(bool bRecursive = FALSE) const;
   virtual size_t GetNumberOfGroups(bool bRecursive = FALSE) const;
 
-  // read/write
-  bool Read(const wxString& key, wxString *pStr) const;
-  bool Read(const wxString& key, wxString *pStr, const wxString& szDefault) const;
-       wxString Read(const wxString& key, const wxString& defVal) const
-                       { return wxConfigBase::Read(key, defVal); }
-  
-  bool Read(const wxString& key, long *plResult) const;
-       bool Read(const wxString& key, long *pl, long defVal) const
-                       { return wxConfigBase::Read(key, pl, defVal); }
-  long Read(const wxString& key, long defVal) const
-                       { return wxConfigBase::Read(key, defVal); }
-  
-  // The following are necessary to satisfy the compiler
-  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, double defVal) const
-                       { return wxConfigBase::Read(key, val, defVal); }
-       bool Read(const wxString& key, double* val) const
-                       { return wxConfigBase::Read(key, val); }
-  
-       bool Read(const wxString& key, bool *pb, bool defVal) const
-                       { return wxConfigBase::Read(key, pb, defVal); }
-       bool Read(const wxString& key, bool *pb) const
-                       { return wxConfigBase::Read(key, pb); }
-  
-  bool Write(const wxString& key, const wxString& szValue);
-  bool Write(const wxString& key, long lValue);
-       bool Write(const wxString& key, double dValue)
-                       { return wxConfigBase::Write(key, dValue); }
-       bool Write(const wxString& key, bool bValue)
-                       { return wxConfigBase::Write(key, bValue); }
-
-  virtual bool Flush(bool /* bCurrentOnly = FALSE */ ) { return TRUE; }
+  virtual bool Flush(bool WXUNUSED(bCurrentOnly) = FALSE) { return TRUE; }
 
   // rename
   virtual bool RenameEntry(const wxString& oldName, const wxString& newName);
   virtual bool RenameGroup(const wxString& oldName, const wxString& newName);
 
   // delete
-  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso);
+  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = TRUE);
   virtual bool DeleteGroup(const wxString& key);
   virtual bool DeleteAll();
 
+protected:
+  // opens the local key creating it if necessary and returns it
+  wxRegKey& LocalKey() const // must be const to be callable from const funcs
+  {
+      wxRegConfig* self = wxConstCast(this, wxRegConfig);
+
+      if ( !m_keyLocal.IsOpened() )
+      {
+          // create on demand
+          self->m_keyLocal.Create();
+      }
+
+      return self->m_keyLocal;
+  }
+
+  // implement read/write methods
+  virtual bool DoReadString(const wxString& key, wxString *pStr) const;
+  virtual bool DoReadLong(const wxString& key, long *plResult) const;
+
+  virtual bool DoWriteString(const wxString& key, const wxString& szValue);
+  virtual bool DoWriteLong(const wxString& key, long lValue);
+
 private:
   // no copy ctor/assignment operator
   wxRegConfig(const wxRegConfig&);