From 6b62c9ad448635f62b985f89aa7b6959f143099c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Thu, 6 Oct 2005 18:17:23 +0000 Subject: [PATCH] #include markup fixes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35812 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- contrib/include/wx/ogl/basic.h | 2 +- contrib/include/wx/ogl/mfutils.h | 2 +- contrib/include/wx/ogl/ogldiag.h | 2 +- contrib/src/ogl/basic.cpp | 4 ++-- contrib/src/ogl/basic2.cpp | 4 ++-- contrib/src/ogl/bmpshape.cpp | 4 ++-- contrib/src/ogl/canvas.cpp | 4 ++-- contrib/src/ogl/composit.cpp | 4 ++-- contrib/src/ogl/constrnt.cpp | 4 ++-- contrib/src/ogl/divided.cpp | 4 ++-- contrib/src/ogl/drawn.cpp | 4 ++-- contrib/src/ogl/lines.cpp | 4 ++-- contrib/src/ogl/mfutils.cpp | 6 +++--- contrib/src/ogl/ogldiag.cpp | 4 ++-- contrib/src/ogl/oglmisc.cpp | 6 +++--- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/contrib/include/wx/ogl/basic.h b/contrib/include/wx/ogl/basic.h index eed1f44bb7..0cd1c5fd50 100644 --- a/contrib/include/wx/ogl/basic.h +++ b/contrib/include/wx/ogl/basic.h @@ -17,7 +17,7 @@ #endif #if wxUSE_DEPRECATED - #include + #include "wx/deprecated/setup.h" #endif #ifndef wxUSE_PROLOGIO diff --git a/contrib/include/wx/ogl/mfutils.h b/contrib/include/wx/ogl/mfutils.h index dfd445cbdb..1f61c129d8 100644 --- a/contrib/include/wx/ogl/mfutils.h +++ b/contrib/include/wx/ogl/mfutils.h @@ -14,7 +14,7 @@ #define _MFUTILS_H_ -#include +#include "wx/metafile.h" #ifndef GetRValue #define GetRValue(rgb) ((unsigned char)(rgb)) diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h index c7ee212fcc..ee0b249a4e 100644 --- a/contrib/include/wx/ogl/ogldiag.h +++ b/contrib/include/wx/ogl/ogldiag.h @@ -15,7 +15,7 @@ #include "wx/ogl/basic.h" #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif diff --git a/contrib/src/ogl/basic.cpp b/contrib/src/ogl/basic.cpp index b489a61e47..1e3f4986ab 100644 --- a/contrib/src/ogl/basic.cpp +++ b/contrib/src/ogl/basic.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #ifdef new diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp index 8d66e88a7a..cecd9d3dbf 100644 --- a/contrib/src/ogl/basic2.cpp +++ b/contrib/src/ogl/basic2.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #ifdef new diff --git a/contrib/src/ogl/bmpshape.cpp b/contrib/src/ogl/bmpshape.cpp index 6dba247f75..4723ca6a0e 100644 --- a/contrib/src/ogl/bmpshape.cpp +++ b/contrib/src/ogl/bmpshape.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #include "wx/ogl/ogl.h" diff --git a/contrib/src/ogl/canvas.cpp b/contrib/src/ogl/canvas.cpp index 5b1df69b63..3d9ec3d366 100644 --- a/contrib/src/ogl/canvas.cpp +++ b/contrib/src/ogl/canvas.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #ifdef new diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp index 875762d42c..088b90199a 100644 --- a/contrib/src/ogl/composit.cpp +++ b/contrib/src/ogl/composit.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #include "wx/ogl/ogl.h" diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp index 077f1c7d05..0e1a104447 100644 --- a/contrib/src/ogl/constrnt.cpp +++ b/contrib/src/ogl/constrnt.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #include "wx/ogl/ogl.h" diff --git a/contrib/src/ogl/divided.cpp b/contrib/src/ogl/divided.cpp index 25b3576099..a84d56973e 100644 --- a/contrib/src/ogl/divided.cpp +++ b/contrib/src/ogl/divided.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #include "wx/ogl/ogl.h" diff --git a/contrib/src/ogl/drawn.cpp b/contrib/src/ogl/drawn.cpp index 64cf89e95f..db117810e6 100644 --- a/contrib/src/ogl/drawn.cpp +++ b/contrib/src/ogl/drawn.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #include "wx/ogl/ogl.h" diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp index b8c81fb8ed..a07ecf35ac 100644 --- a/contrib/src/ogl/lines.cpp +++ b/contrib/src/ogl/lines.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #ifdef new diff --git a/contrib/src/ogl/mfutils.cpp b/contrib/src/ogl/mfutils.cpp index 6570eee42e..9a103bedde 100644 --- a/contrib/src/ogl/mfutils.cpp +++ b/contrib/src/ogl/mfutils.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif -#include -#include +#include "wx/metafile.h" +#include "wx/utils.h" #include "wx/ogl/ogl.h" diff --git a/contrib/src/ogl/ogldiag.cpp b/contrib/src/ogl/ogldiag.cpp index d54d5f0d16..d580ee81ac 100644 --- a/contrib/src/ogl/ogldiag.cpp +++ b/contrib/src/ogl/ogldiag.cpp @@ -17,11 +17,11 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif #ifdef new diff --git a/contrib/src/ogl/oglmisc.cpp b/contrib/src/ogl/oglmisc.cpp index 9904941314..74ee28613f 100644 --- a/contrib/src/ogl/oglmisc.cpp +++ b/contrib/src/ogl/oglmisc.cpp @@ -17,14 +17,14 @@ #endif #ifndef WX_PRECOMP -#include +#include "wx/wx.h" #endif #if wxUSE_PROLOGIO -#include +#include "wx/deprecated/wxexpr.h" #endif -#include +#include "wx/types.h" #ifdef new #undef new