From 2cef71bc23a9cd0ec543e451848fb9e88ace36e9 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 23 Apr 2005 18:59:33 +0000 Subject: [PATCH] Remove obsolete includes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/generic.rsp | 1 + docs/publicity/announce.txt | 2 +- include/wx/msw/wrapcctl.h | 6 +----- include/wx/msw/wx.rc | 6 +----- src/msw/checklst.cpp | 4 ---- src/msw/dde.cpp | 4 ---- src/msw/dib.cpp | 4 ---- src/msw/joystick.cpp | 4 ---- src/msw/listbox.cpp | 4 ---- src/msw/notebook.cpp | 8 +------- src/msw/sound.cpp | 6 +----- src/msw/tabctrl.cpp | 6 +----- src/msw/taskbar.cpp | 4 ---- src/msw/window.cpp | 8 +------- 14 files changed, 8 insertions(+), 59 deletions(-) diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp index 0bf2fab222..9e99e80543 100644 --- a/distrib/msw/generic.rsp +++ b/distrib/msw/generic.rsp @@ -1473,6 +1473,7 @@ demos/dbbrowse/*.bkl tests/*.bkl tests/makefile*.* tests/*.cpp +tests/*.h tests/*.fc tests/archive/*.cpp diff --git a/docs/publicity/announce.txt b/docs/publicity/announce.txt index 3f32737d7c..584c715c70 100644 --- a/docs/publicity/announce.txt +++ b/docs/publicity/announce.txt @@ -1,7 +1,7 @@ Announcing wxWidgets 2.6.0: a cross-platform GUI toolkit ---------------------------------------------------------------- -April 18th, 2004 -- the wxWidgets team is pleased to announce +April 21st, 2005 -- the wxWidgets team is pleased to announce a new official release of the mature cross-platform C++ application framework. diff --git a/include/wx/msw/wrapcctl.h b/include/wx/msw/wrapcctl.h index bc8ce1d9af..3faa980790 100644 --- a/include/wx/msw/wrapcctl.h +++ b/include/wx/msw/wrapcctl.h @@ -34,11 +34,7 @@ #define _WIN32_IE 0x0600 #endif // !defined(_WIN32_IE) -#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__) - #include "wx/msw/gnuwin32/extra.h" -#else - #include -#endif +#include // define things which might be missing from our commctrl.h #include "wx/msw/missing.h" diff --git a/include/wx/msw/wx.rc b/include/wx/msw/wx.rc index 62c850d6b1..88c57dfdeb 100644 --- a/include/wx/msw/wx.rc +++ b/include/wx/msw/wx.rc @@ -29,11 +29,7 @@ // Version: $Id$ ///////////////////////////////////////////////////////////////////////////// -#if (defined( __GNUWIN32__ ) && !defined(__TWIN32__)) || defined(__MWERKS__) - #include "wx/msw/gnuwin32/winresrc.h" -#else - #include -#endif +#include #if defined(_WIN32_WCE) #include "wx/msw/wince/wince.rc" diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp index e13cc98cf2..8327c328af 100644 --- a/src/msw/checklst.cpp +++ b/src/msw/checklst.cpp @@ -52,10 +52,6 @@ #include "wx/msw/private.h" -#if defined(__GNUWIN32_OLD__) - #include "wx/msw/gnuwin32/extra.h" -#endif - // ---------------------------------------------------------------------------- // private functions // ---------------------------------------------------------------------------- diff --git a/src/msw/dde.cpp b/src/msw/dde.cpp index 26a13fc678..0ec8ee1e1a 100644 --- a/src/msw/dde.cpp +++ b/src/msw/dde.cpp @@ -45,10 +45,6 @@ #include #include -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - // ---------------------------------------------------------------------------- // macros and constants // ---------------------------------------------------------------------------- diff --git a/src/msw/dib.cpp b/src/msw/dib.cpp index a76592f9b0..1a57decc31 100644 --- a/src/msw/dib.cpp +++ b/src/msw/dib.cpp @@ -48,10 +48,6 @@ #include #endif -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - #include "wx/image.h" #include "wx/msw/dib.h" diff --git a/src/msw/joystick.cpp b/src/msw/joystick.cpp index b445fefaf3..d09e443a91 100644 --- a/src/msw/joystick.cpp +++ b/src/msw/joystick.cpp @@ -32,10 +32,6 @@ typedef UINT MMRESULT; #endif -#ifdef __GNUWIN32_OLD__ -#include "wx/msw/gnuwin32/extra.h" -#endif - // Why doesn't BC++ have joyGetPosEx? #if !defined(__WIN32__) || defined(__BORLANDC__) #define NO_JOYGETPOSEX diff --git a/src/msw/listbox.cpp b/src/msw/listbox.cpp index 17adfc86ab..5f27c25a6e 100644 --- a/src/msw/listbox.cpp +++ b/src/msw/listbox.cpp @@ -43,10 +43,6 @@ #include "wx/ownerdrw.h" #endif -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - #if wxUSE_EXTENDED_RTTI WX_DEFINE_FLAGS( wxListBoxStyle ) diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp index e5b6a4c85a..669d99dade 100644 --- a/src/msw/notebook.cpp +++ b/src/msw/notebook.cpp @@ -42,13 +42,7 @@ #include -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - -#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#endif +#include #include "wx/msw/winundef.h" diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp index c6e86ed289..35abc8ef78 100644 --- a/src/msw/sound.cpp +++ b/src/msw/sound.cpp @@ -32,11 +32,7 @@ #include -#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__) - #include "wx/msw/gnuwin32/extra.h" -#else - #include -#endif +#include wxSound::wxSound() : m_waveData(NULL), m_waveLength(0), m_isResource(false) diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp index ed230ba329..94f92bf228 100644 --- a/src/msw/tabctrl.cpp +++ b/src/msw/tabctrl.cpp @@ -28,11 +28,7 @@ #include "wx/msw/private.h" -#if defined(__WIN95__) && !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)) - #include -#else - #include "wx/msw/gnuwin32/extra.h" -#endif +#include #include "wx/tabctrl.h" #include "wx/app.h" diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 612c198adf..a777e23621 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -37,10 +37,6 @@ #include #include "wx/taskbar.h" -#ifdef __GNUWIN32_OLD__ - #include "wx/msw/gnuwin32/extra.h" -#endif - #ifdef __WXWINCE__ #include #include diff --git a/src/msw/window.cpp b/src/msw/window.cpp index d3f219b845..6fc526fac7 100644 --- a/src/msw/window.cpp +++ b/src/msw/window.cpp @@ -107,13 +107,7 @@ #include #endif -#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) /* && !defined(__WXWINCE__) */ ) || defined(__CYGWIN10__) - #ifdef __WIN95__ - #include - #endif -#elif !defined(__WXMICROWIN__) && !defined(__WXWINCE__) // broken compiler - #include "wx/msw/gnuwin32/extra.h" -#endif +#include #include "wx/msw/missing.h" -- 2.47.2