fixed ifdef

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index f9fd74eb902c75938df236ea628c21c90a54269f..6c19bf584549ee1383083ebc407d048b691586af 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>


@@ -19,6 +19,7 @@
 #ifndef   _REGISTRY_H
   #include <wx/msw/registry.h>
 #endif
 #ifndef   _REGISTRY_H
   #include <wx/msw/registry.h>
 #endif

+#include <wx/object.h>

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


@@ -29,8 +30,10 @@ class WXDLLEXPORT 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 = "",
+  wxRegConfig(const wxString& appName = _T(""),
+              const wxString& vendorName = _T(""),
+              const wxString& localFilename = _T(""),
+              const wxString& globalFilename = _T(""),

               long style = 0);
 
     // dtor will save unsaved data
               long style = 0);
 
     // dtor will save unsaved data


@@ -53,6 +56,7 @@ 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


@@ -62,34 +66,64 @@ public:
   // read/write
   bool Read(const wxString& key, wxString *pStr) const;
   bool Read(const wxString& key, wxString *pStr, const wxString& szDefault) 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 *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
 
   // 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
   bool Read(const wxString& key, int *pi, int defVal) const

-    { return wxConfigBase::Read(key, pi, defVal); }
+      { return wxConfigBase::Read(key, pi, defVal); }

   bool Read(const wxString& key, int *pi) const
   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); }
+      { return wxConfigBase::Read(key, pi); }
+

   bool Read(const wxString& key, double* val, double defVal) const
   bool Read(const wxString& key, double* val, double defVal) const

-    { return wxConfigBase::Read(key, val, defVal); }
+      { 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, 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 /* 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 DeleteGroup(const wxString& key);
   virtual bool DeleteAll();
 
   // delete
   virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso);
   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;
+  }
+

 private:
   // no copy ctor/assignment operator
   wxRegConfig(const wxRegConfig&);
 private:
   // no copy ctor/assignment operator
   wxRegConfig(const wxRegConfig&);