added wxColourBase::Init() and use DEFINE_STD_WXCOLOUR_CONSTRUCTORS() in all ports...

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

diff --git a/include/wx/msw/regconf.h b/include/wx/msw/regconf.h
index e9e8dbde43ba1010b70925cafdc3f8e4514f2616..d90dec3bb090ce408192a4411dde1abd36972e31 100644 (file)
--- a/include/wx/msw/regconf.h
+++ b/include/wx/msw/regconf.h
@@ -9,16 +9,17 @@
 // 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 "buffer.h"
+#include "wx/buffer.h"
 
 // ----------------------------------------------------------------------------
 // wxRegConfig
@@ -109,4 +110,6 @@ private:
   DECLARE_ABSTRACT_CLASS(wxRegConfig)
 };
 
-#endif  //_REGCONF_H
+#endif // wxUSE_CONFIG && wxUSE_REGKEY
+
+#endif  // _WX_MSW_REGCONF_H_