When handling accelerators in wxWebView make sure that we do not block right-alt...

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

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

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

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


@@ -9,19 +9,17 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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/object.h"
 #include "wx/confbase.h"

+#include "wx/buffer.h"

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


@@ -39,7 +37,7 @@ public:
               long style = wxCONFIG_USE_GLOBAL_FILE);
 
     // dtor will save unsaved data
               long style = wxCONFIG_USE_GLOBAL_FILE);
 
     // dtor will save unsaved data

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

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


@@ -62,17 +60,17 @@ public:
 
     // 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;
+  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; }
+  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
 
   // 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 = TRUE);
+  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();
 


@@ -94,21 +92,24 @@ protected:
   // implement read/write methods
   virtual bool DoReadString(const wxString& key, wxString *pStr) const;
   virtual bool DoReadLong(const wxString& key, long *plResult) const;
   // 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 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:
 
 private:

-  // no copy ctor/assignment operator
-  wxRegConfig(const wxRegConfig&);
-  wxRegConfig& operator=(const wxRegConfig&);
-

   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
             m_keyGlobalRoot, m_keyGlobal;
 
   // current path (not '/' terminated)
   wxString  m_strPath;
   // these keys are opened during all lifetime of wxRegConfig object
   wxRegKey  m_keyLocalRoot,  m_keyLocal,
             m_keyGlobalRoot, m_keyGlobal;
 
   // 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_