Compile fix (VC++ 6 doesn't like wxString::Format with only 1 arg: gives several...

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 3cb0213720d34257b4475c9125098630b1d058e8..59fc5c67d2ad625b363b6cdd3ba3c2a7e19dc2ad 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -1,8 +1,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/regconf.h  
+// Name:        msw/regconf.h

 // Purpose:     Registry based implementation of wxConfigBase
 // Author:      Vadim Zeitlin
 // Purpose:     Registry based implementation of wxConfigBase
 // Author:      Vadim Zeitlin

-// Modified by: 
+// Modified by:

 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>


@@ -12,29 +12,31 @@
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 
 #ifndef   _REGCONF_H
 #define   _REGCONF_H
 

-#ifdef __GNUG__
-#pragma interface "regconf.h"
-#endif
-

 #ifndef   _REGISTRY_H
 #ifndef   _REGISTRY_H

-  #include <wx/msw/registry.h>
+  #include "wx/msw/registry.h"

 #endif
 
 #endif
 

+#include "wx/object.h"
+#include "wx/confbase.h"
+#include "wx/buffer.h"
+

 // ----------------------------------------------------------------------------
 // wxRegConfig
 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 // wxRegConfig
 // ----------------------------------------------------------------------------
 

-class wxRegConfig : public wxConfigBase
+class WXDLLIMPEXP_BASE wxRegConfig : public wxConfigBase

 {
 public:
   // ctor & dtor
     // will store data in HKLM\appName and HKCU\appName
 {
 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 = "",
-              long style = 0);
+  wxRegConfig(const wxString& appName = wxEmptyString,
+              const wxString& vendorName = wxEmptyString,
+              const wxString& localFilename = wxEmptyString,
+              const wxString& globalFilename = wxEmptyString,
+              long style = wxCONFIG_USE_GLOBAL_FILE);

 
     // dtor will save unsaved data
 
     // dtor will save unsaved data

-  virtual ~wxRegConfig();
+  virtual ~wxRegConfig(){}

 
   // implement inherited pure virtual functions
   // ------------------------------------------
 
   // implement inherited pure virtual functions
   // ------------------------------------------


@@ -53,43 +55,48 @@ public:
     // tests for existence
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;
     // tests for existence
   virtual bool HasGroup(const wxString& strName) const;
   virtual bool HasEntry(const wxString& strName) const;

+  virtual EntryType GetEntryType(const wxString& name) const;

 
     // get number of entries/subgroups in the current group, with or without
     // it's subgroups
 
     // get number of entries/subgroups in the current group, with or without
     // it's subgroups

-  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;
-  bool Read(const wxString& key, long *plResult) const;
-
-  // The following are necessary to satisfy the compiler
-  wxString Read(const wxString& key, const wxString& defVal) const
-    { return wxConfigBase::Read(key, defVal); }
-  bool Read(const wxString& key, long *pl, long defVal) const
-    { return wxConfigBase::Read(key, pl, 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); }
-  long Read(const wxString& key, long defVal) const
-    { return wxConfigBase::Read(key, defVal); }
-  bool Read(const wxString& key, double* val) const
-    { return wxConfigBase::Read(key, val); }
-  bool Read(const wxString& key, double* val, double defVal) const
-    { return wxConfigBase::Read(key, val, defVal); }
-
-  bool Write(const wxString& key, const wxString& szValue);
-  bool Write(const wxString& key, long lValue);
-
-  virtual bool Flush(bool /* bCurrentOnly = FALSE */ ) { return TRUE; }
+  virtual size_t GetNumberOfEntries(bool bRecursive = false) const;
+  virtual size_t GetNumberOfGroups(bool bRecursive = false) const;
+
+  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
 
   // 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();
 
   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 DoReadBinary(const wxString& key, wxMemoryBuffer* buf) const;
+
+  virtual bool DoWriteString(const wxString& key, const wxString& szValue);
+  virtual bool DoWriteLong(const wxString& key, long lValue);
+  virtual bool DoWriteBinary(const wxString& key, const wxMemoryBuffer& buf);
+

 private:
   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
 private:
   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,


@@ -97,6 +104,9 @@ private:
 
   // current path (not '/' terminated)
   wxString  m_strPath;
 
   // current path (not '/' terminated)
   wxString  m_strPath;

+
+  DECLARE_NO_COPY_CLASS(wxRegConfig)
+  DECLARE_ABSTRACT_CLASS(wxRegConfig)

 };
 
 #endif  //_REGCONF_H
 };
 
 #endif  //_REGCONF_H