Applied patch [ 736322 ] Remove TWINE support, merge it in Wine.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@20713 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2003-05-23 19:16:45 +00:00
parent d726047819
commit b39dbf34b8
39 changed files with 83 additions and 183 deletions
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -29,7 +29,7 @@
 #include "wx/menu.h"
 #endif

-#if defined(__WIN95__) && !defined(__TWIN32__)
+#if defined(__WIN95__)

 #include <windows.h>

@@ -39,10 +39,8 @@
 #include "wx/taskbar.h"
 #include "wx/msw/private.h"

-#ifndef __TWIN32__
-    #ifdef __GNUWIN32_OLD__
-        #include "wx/msw/gnuwin32/extra.h"
-    #endif
+#ifdef __GNUWIN32_OLD__
+    #include "wx/msw/gnuwin32/extra.h"
 #endif

 #ifdef __SALFORDC__