Check wxUSE_DEPRECATED before including its headers

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

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
 

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>