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 52d1b43fd076d61e77ef687112d8aea1661efb81..2c2ee175631cd8b4c9e403df43598b04f2828535 100644 (file)
--- a/contrib/include/wx/ogl/basic.h
+++ b/contrib/include/wx/ogl/basic.h
@@ -16,7 +16,13 @@
 #pragma interface "basic.h"
 #endif
 
 #pragma interface "basic.h"
 #endif
 

+#ifndef wxUSE_DEPRECATED
+#define wxUSE_DEPRECATED 1
+#endif
+
+#if wxUSE_DEPRECATED

 #include <wx/deprecated/setup.h>
 #include <wx/deprecated/setup.h>

+#endif

 
 #define OGL_VERSION     2.0
 
 
 #define OGL_VERSION     2.0
 

diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h
index c1580a99c28cefa33d62a2686f5a9b727c5c0a09..9a947182e208ccb85b54dc598bd58be415071df3 100644 (file)
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -16,7 +16,7 @@
 #pragma interface "ogldiag.h"
 #endif
 
 #pragma interface "ogldiag.h"
 #endif
 

-#include <wx/deprecated/setup.h>
+#include "wx/ogl/basic.h"

 
 #if wxUSE_PROLOGIO
 #include <wx/deprecated/wxexpr.h>
 
 #if wxUSE_PROLOGIO
 #include <wx/deprecated/wxexpr.h>