X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63d690d7c578eb7b0b102c1703e04eb0310f9d8c..8a1554ed3c90e6d816c740639ecd946020f09bd5:/src/msw/taskbar.cpp?ds=sidebyside

diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp
index a2d2d8e087..537db33bfd 100644
--- a/src/msw/taskbar.cpp
+++ b/src/msw/taskbar.cpp
@@ -5,7 +5,6 @@
 // Author:      Julian Smart
 // Modified by: Vaclav Slavik
 // Created:     24/3/98
-// RCS-ID:      $Id$
 // Copyright:   (c)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
@@ -24,12 +23,14 @@
     #include "wx/frame.h"
     #include "wx/utils.h"
     #include "wx/menu.h"
+    #include "wx/app.h"
 #endif
 
 #include "wx/msw/wrapshl.h"
 
 #include <string.h>
 #include "wx/taskbar.h"
+#include "wx/msw/private.h"
 #include "wx/dynlib.h"
 
 #ifndef NIN_BALLOONTIMEOUT
@@ -55,9 +56,9 @@
 
 #ifndef NOTIFYICONDATA_V2_SIZE
     #ifdef UNICODE
-        #define NOTIFYICONDATA_V2_SIZE 0x03A8;
+        #define NOTIFYICONDATA_V2_SIZE 0x03A8
     #else
-        #define NOTIFYICONDATA_V2_SIZE 0x01E8;
+        #define NOTIFYICONDATA_V2_SIZE 0x01E8
     #endif
 #endif
 
@@ -175,7 +176,7 @@ struct NotifyIconData : public NOTIFYICONDATA
 // wxTaskBarIcon
 // ----------------------------------------------------------------------------
 
-wxTaskBarIcon::wxTaskBarIcon()
+wxTaskBarIcon::wxTaskBarIcon(wxTaskBarIconType WXUNUSED(iconType))
 {
     m_win = NULL;
     m_iconAdded = false;
@@ -213,7 +214,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
 
     NotifyIconData notifyData(GetHwndOf(m_win));
 
-    if (icon.Ok())
+    if (icon.IsOk())
     {
         notifyData.uFlags |= NIF_ICON;
         notifyData.hIcon = GetHiconOf(icon);
@@ -224,7 +225,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
     notifyData.uFlags |= NIF_TIP;
     if ( !tooltip.empty() )
     {
-        wxStrlcpy(notifyData.szTip, tooltip.wx_str(), WXSIZEOF(notifyData.szTip));
+        wxStrlcpy(notifyData.szTip, tooltip.t_str(), WXSIZEOF(notifyData.szTip));
     }
 
     bool ok = wxShellNotifyIcon(m_iconAdded ? NIM_MODIFY
@@ -269,8 +270,8 @@ wxTaskBarIcon::ShowBalloon(const wxString& title,
     notifyData = NotifyIconData(hwnd);
     notifyData.uFlags |= NIF_INFO;
     notifyData.uTimeout = msec;
-    wxStrlcpy(notifyData.szInfo, text.wx_str(), WXSIZEOF(notifyData.szInfo));
-    wxStrlcpy(notifyData.szInfoTitle, title.wx_str(),
+    wxStrlcpy(notifyData.szInfo, text.t_str(), WXSIZEOF(notifyData.szInfo));
+    wxStrlcpy(notifyData.szInfoTitle, title.t_str(),
                 WXSIZEOF(notifyData.szInfoTitle));
 
     if ( flags & wxICON_INFORMATION )