TWIN32 compatibility added; wxMotif uses wxGTK's wxPostScriptDC;

wxByte replaces byte (can conflict with windows.h) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@1428 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
1999-01-19 18:23:02 +00:00
parent 0d2a2b601b
commit 57c208c575
68 changed files with 575 additions and 244 deletions
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -28,16 +28,18 @@
 #include "wx/utils.h"
 #endif

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

 #include <windows.h>
 #include <string.h>
 #include <wx/msw/taskbar.h>
 #include <wx/msw/private.h>

+#ifndef __TWIN32__
 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif
+#endif

 #ifdef __SALFORDC__
 #include <shellapi.h>