projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
adding new files for xti merge
[wxWidgets.git]
/
include
/
wx
/
msw
/
regconf.h
diff --git
a/include/wx/msw/regconf.h
b/include/wx/msw/regconf.h
index 59fc5c67d2ad625b363b6cdd3ba3c2a7e19dc2ad..02bc6c6f3f99ec9580234f3f78e90c753f74c510 100644
(file)
--- a/
include/wx/msw/regconf.h
+++ b/
include/wx/msw/regconf.h
@@
-9,13
+9,14
@@
// 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/buffer.h"
#include "wx/object.h"
#include "wx/confbase.h"
#include "wx/buffer.h"
@@
-105,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_