From: Robin Dunn <robin@alldunn.com>
Date: Mon, 1 Sep 2003 19:32:16 +0000 (+0000)
Subject: Check wxUSE_DEPRECATED before including its headers
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/39b9cdaff4d2218623c36a812375dcfde7092f28

Check wxUSE_DEPRECATED before including its headers


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23347 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h
index 52d1b43fd0..2c2ee17563 100644
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -16,7 +16,13 @@
 #pragma interface "basic.h"
 #endif
 
+#ifndef wxUSE_DEPRECATED
+#define wxUSE_DEPRECATED 1
+#endif
+
+#if wxUSE_DEPRECATED
 #include <wx/deprecated/setup.h>
+#endif
 
 #define OGL_VERSION     2.0
 
diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h
index c1580a99c2..9a947182e2 100644
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -16,7 +16,7 @@
 #pragma interface "ogldiag.h"
 #endif
 
-#include <wx/deprecated/setup.h>
+#include "wx/ogl/basic.h"
 
 #if wxUSE_PROLOGIO
 #include <wx/deprecated/wxexpr.h>