wxCocoa: Better icon support

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

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index 199471c4568481c5116bf9f2a1404efe4f6540a6..23e002515465976cd64f8c0b5ec7a50e621cf2d6 100644 (file)
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -10,7 +10,7 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "taskbar.h"
 #endif
 
@@ -29,23 +29,20 @@
 #include "wx/menu.h"
 #endif
 
-#if defined(__WIN95__) && !defined(__TWIN32__)
-
-#include <windows.h>
+#if defined(__WIN95__)
 
+#include "wx/msw/private.h"
 #include "wx/msw/winundef.h"
 
 #include <string.h>
 #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__
+#ifdef __WXWINCE__
+    #include <winreg.h>
     #include <shellapi.h>
 #endif
 
@@ -153,7 +150,8 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     if ( !tooltip.empty() )
     {
         notifyData.uFlags |= NIF_TIP;
-        lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
+//        lstrcpyn(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
+        wxStrncpy(notifyData.szTip, tooltip.c_str(), WXSIZEOF(notifyData.szTip));
     }
 
     bool ok = Shell_NotifyIcon(m_iconAdded ? NIM_MODIFY
@@ -186,7 +184,6 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
 
     s_inPopup = true;
 
-    bool        rval = false;
     wxWindow*   win;
     int         x, y;
     wxGetMousePosition(&x, &y);
@@ -204,7 +201,7 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
     // Work around a WIN32 bug
     ::SetForegroundWindow ((HWND) win->GetHWND ());
 
-    rval = win->PopupMenu(menu, 0, 0);
+    bool rval = win->PopupMenu(menu, 0, 0);
 
     // Work around a WIN32 bug
     ::PostMessage ((HWND) win->GetHWND(),WM_NULL,0,0L);
@@ -239,7 +236,7 @@ void wxTaskBarIcon::_OnRButtonDClick(wxEvent& e)  { OnRButtonDClick(e); }
 
 wxTaskBarIcon* wxTaskBarIcon::FindObjectForHWND(WXHWND hWnd)
 {
-    wxTaskBarIconList::Node *node = sm_taskBarIcons.GetFirst();
+    wxTaskBarIconList::compatibility_iterator node = sm_taskBarIcons.GetFirst();
     while (node)
     {
         wxTaskBarIcon *obj = node->GetData();