Remove obsolete includes

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

distrib/msw/generic.rsp

@@ -1473,6 +1473,7 @@ demos/dbbrowse/*.bkl
 tests/*.bkl
 tests/makefile*.*
 tests/*.cpp
+tests/*.h
 tests/*.fc
 
 tests/archive/*.cpp

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.
 

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"

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"

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
 // ----------------------------------------------------------------------------

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
 // ----------------------------------------------------------------------------

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"
 

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

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 )
 

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"
 

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)

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"

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>

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"