latest CW additions

[wxWidgets.git] / src / msw / taskbar.cpp

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 809c2b7af8b877a2e452a1408dd86616643af3d8..b34e42e02e83f0dd0960c86ce81f329e48826cf0 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -28,16 +28,18 @@
 #include "wx/utils.h"
 #endif
 
 #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>
 
 
 #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
 #ifdef __GNUWIN32__
 #include <wx/msw/gnuwin32/extra.h>
 #endif

+#endif

 
 #ifdef __SALFORDC__
 #include <shellapi.h>
 
 #ifdef __SALFORDC__
 #include <shellapi.h>