Use /bin/echo for creation of Mac OS X PkgInfo files.

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index 82ab6d14a3a9f9c8aacf39477048dbd7d09a3bff..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,15 +9,17 @@
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifndef   _REGISTRY_H
-  #include "wx/msw/registry.h"
-#endif
+#include "wx/defs.h"

 
 

+#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


@@ -90,9 +92,11 @@ 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:
   // these keys are opened during all lifetime of wxRegConfig object
 
 private:
   // these keys are opened during all lifetime of wxRegConfig object


@@ -102,8 +106,10 @@ private:
   // current path (not '/' terminated)
   wxString  m_strPath;
 
   // current path (not '/' terminated)
   wxString  m_strPath;
 

-  DECLARE_NO_COPY_CLASS(wxRegConfig)
+  wxDECLARE_NO_COPY_CLASS(wxRegConfig);

   DECLARE_ABSTRACT_CLASS(wxRegConfig)
 };
 
   DECLARE_ABSTRACT_CLASS(wxRegConfig)
 };
 

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