Remove obsolete includes

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 0bf2fab2221d05e3e5c661dc3379c2a74b5df18d..9e99e80543110c5a96d83fde9d4f39cd21b458cf 100644 (file)
--- 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 3f32737d7c7613b8659082b6a57e860622db0947..584c715c70c8b02a6b21accc85c33bb9cbc1b51c 100644 (file)
--- 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 bc8ce1d9afe85aedd16afc66df219a34727888e5..3faa98079015d8da87753c3052263575cd05987f 100644 (file)
--- 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 <commctrl.h>
-#endif
+#include <commctrl.h>
 
 // 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 62c850d6b1b92ac8a31c9577d9dcf1194fdee43a..88c57dfdebcc9b17ac66b9122e9d0e1759c24093 100644 (file)
--- 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 <windows.h>
-#endif
+#include <windows.h>
 
 #if defined(_WIN32_WCE)
     #include "wx/msw/wince/wince.rc"

diff --git a/src/msw/checklst.cpp b/src/msw/checklst.cpp
index e13cc98cf284de9c01d072e50d39f0aba9001762..8327c328af838180554257b13350c24412a96cd6 100644 (file)
--- 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 26a13fc678e989e9e765d1bda136dc2fcdda16cb..0ec8ee1e1a6cc81c68d4201a124103f8711f930c 100644 (file)
--- a/src/msw/dde.cpp
+++ b/src/msw/dde.cpp
@@ -45,10 +45,6 @@
 #include <string.h>
 #include <ddeml.h>
 
-#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 a76592f9b06a65be056fe0f6292bbb6cc2a2fb28..1a57decc31716919a0a84471a63faaa121c1a3a9 100644 (file)
--- a/src/msw/dib.cpp
+++ b/src/msw/dib.cpp
@@ -48,10 +48,6 @@
     #include <memory.h>
 #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 b445fefaf35c9ed64c6180aef1101c06eaed9474..d09e443a91e228b5c81a4a0fa91a13abd284ab6d 100644 (file)
--- 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 17adfc86ab4ecd8155b6834391f934e0b0a6f4c9..5f27c25a6e484890c7c1a63e4121c7daef822220 100644 (file)
--- 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 e5b6a4c85a888ae84841271f2343ea4646957f5e..669d99dadec3c0d321bd1aa2f0d9e89ee3b57c82 100644 (file)
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -42,13 +42,7 @@
 
 #include  <windowsx.h>
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#endif
+#include <commctrl.h>
 
 #include "wx/msw/winundef.h"
 

diff --git a/src/msw/sound.cpp b/src/msw/sound.cpp
index c6e86ed28909867a768f1bf02dcf7b07a8bc65d6..35abc8ef7859772bad670ef2ba66ca0d4d3482ba 100644 (file)
--- a/src/msw/sound.cpp
+++ b/src/msw/sound.cpp
@@ -32,11 +32,7 @@
 
 #include <windowsx.h>
 
-#if defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__)
-    #include "wx/msw/gnuwin32/extra.h"
-#else
-    #include <mmsystem.h>
-#endif
+#include <mmsystem.h>
 
 wxSound::wxSound()
   : m_waveData(NULL), m_waveLength(0), m_isResource(false)

diff --git a/src/msw/tabctrl.cpp b/src/msw/tabctrl.cpp
index ed230ba329af0f479f2a9d7d0be82b8013ff5c18..94f92bf2282ea81f034dccf069122049f193a099 100644 (file)
--- 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 <commctrl.h>
-#else
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
+#include <commctrl.h>
 
 #include "wx/tabctrl.h"
 #include "wx/app.h"

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 612c198adf2ed9375d1cec8f0e2625f7667cad33..a777e23621f73a57b954db5df6f034733d7a1364 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -37,10 +37,6 @@
 #include <string.h>
 #include "wx/taskbar.h"
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
 #ifdef __WXWINCE__
     #include <winreg.h>
     #include <shellapi.h>

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index d3f219b8454152ef18d6a3c9a1395f926f26b593..6fc526fac784654f5eee7e7921e9e83a67162873 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -107,13 +107,7 @@
     #include <windowsx.h>
 #endif
 
-#if (!defined(__GNUWIN32_OLD__) && !defined(__WXMICROWIN__) /* && !defined(__WXWINCE__) */ ) || defined(__CYGWIN10__)
-    #ifdef __WIN95__
-        #include <commctrl.h>
-    #endif
-#elif !defined(__WXMICROWIN__) && !defined(__WXWINCE__) // broken compiler
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
+#include <commctrl.h>
 
 #include "wx/msw/missing.h"