Do not put semicolons after the definition of an inline function.

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 5f74de0751d907b7c7e454866ce9c367e19489e8..504eb56cc2e06aa001a9db341f08d063f51df887 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -1,37 +1,43 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        msw/regconf.h  
+// Name:        wx/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>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Created:     27.04.98
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

-#ifndef   _REGCONF_H
-#define   _REGCONF_H
+#ifndef _WX_MSW_REGCONF_H_
+#define _WX_MSW_REGCONF_H_

 
 

-#ifdef __GNUG__
-#pragma interface "regconf.h"
-#endif
+#include "wx/defs.h"

 
 

-#ifndef   _REGISTRY_H
-  #include <wx/msw/registry.h>
-#endif
+#if wxUSE_CONFIG && wxUSE_REGKEY
+
+#include "wx/msw/registry.h"
+#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
 {
 public:
   // ctor & dtor

-    // will store data in HKLM\strRegHive and HKCU\strRegHive
-  wxRegConfig(const wxString& strRegHive);
+    // will store data in HKLM\appName and HKCU\appName
+  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
   // ------------------------------------------


@@ -50,25 +56,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 uint GetNumberOfEntries(bool bRecursive = FALSE) const;
-  virtual uint GetNumberOfGroups(bool bRecursive = FALSE) const;
+  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; }

 
 

-  // read/write
-  virtual bool Read(wxString *pStr, const char *szKey,
-                    const char *szDefault = 0) const;
-  virtual bool Read(long *result, const char *szKey, long lDefault = 0) const;
-  virtual bool Write(const char *szKey, const char *szValue);
-  virtual bool Write(const char *szKey, long Value);
-  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
 
   // delete

-  virtual bool DeleteEntry(const char *szKey, bool bGroupIfEmptyAlso);
-  virtual bool DeleteGroup(const char *szKey);
+  virtual bool DeleteEntry(const wxString& key, bool bGroupIfEmptyAlso = true);
+  virtual bool DeleteGroup(const wxString& key);

   virtual bool DeleteAll();
 
   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,


@@ -76,6 +105,11 @@ private:
 
   // current path (not '/' terminated)
   wxString  m_strPath;
 
   // current path (not '/' terminated)
   wxString  m_strPath;

+
+  wxDECLARE_NO_COPY_CLASS(wxRegConfig);
+  DECLARE_ABSTRACT_CLASS(wxRegConfig)

 };
 
 };
 

-#endif  //_REGCONF_H
+#endif // wxUSE_CONFIG && wxUSE_REGKEY
+
+#endif // _WX_MSW_REGCONF_H_