Misc. fixes

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index b0bd7cc9a7ffac0421071752c063d782a9e1409d..b34e42e02e83f0dd0960c86ce81f329e48826cf0 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -23,18 +23,27 @@
 
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
+#include "wx/window.h"
+#include "wx/frame.h"
+#include "wx/utils.h"
 #endif
 
-#ifdef __WIN95__
+#if defined(__WIN95__) && !defined(__TWIN32__)
 
-#include <wx/msw/taskbar.h>
-#include <string.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
+#endif
+
+#ifdef __SALFORDC__
+#include <shellapi.h>
+#endif
 
 LRESULT APIENTRY _EXPORT wxTaskBarIconWindowProc( HWND hWnd, unsigned msg,
                                     UINT wParam, LONG lParam );
@@ -158,7 +167,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) //, int x, int y);
     rval = win->PopupMenu(menu, 0, 0);
 
     win->PopEventHandler(FALSE);
-    delete win;
+    win->Destroy();
     return rval;
 }