/////////////////////////////////////////////////////////////////////////
-// File: taskbar.cpp
+// File: src/msw/taskbar.cpp
// Purpose: Implements wxTaskBarIcon class for manipulating icons on
// the Windows task bar.
// Author: Julian Smart
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "taskbar.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#ifdef __BORLANDC__
-#pragma hdrstop
+ #pragma hdrstop
#endif
#ifndef WX_PRECOMP
-#include "wx/defs.h"
-#include "wx/window.h"
-#include "wx/frame.h"
-#include "wx/utils.h"
-#include "wx/menu.h"
+ #include "wx/window.h"
+ #include "wx/frame.h"
+ #include "wx/utils.h"
+ #include "wx/menu.h"
#endif
-#if defined(__WIN95__)
-
#include "wx/msw/private.h"
#include "wx/msw/winundef.h"
// Operations
bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
{
- // NB: we have to create the window lazily because of backward compatiblity,
- // old aplications may create wxTaskBarIcon instance before wxApp
+ // NB: we have to create the window lazily because of backward compatibility,
+ // old applications may create a wxTaskBarIcon instance before wxApp
// is initialized (as samples/taskbar used to do)
if (!m_win)
{
m_icon = icon;
m_strTooltip = tooltip;
- NotifyIconData notifyData((HWND)m_win->GetHWND());
+ NotifyIconData notifyData(GetHwndOf(m_win));
if (icon.Ok())
{
m_iconAdded = false;
- NotifyIconData notifyData((HWND)m_win->GetHWND());
+ NotifyIconData notifyData(GetHwndOf(m_win));
return Shell_NotifyIcon(NIM_DELETE, ¬ifyData) != 0;
}
menu->UpdateUI();
- // Work around a WIN32 bug
- ::SetForegroundWindow((HWND)m_win->GetHWND());
+ // the SetForegroundWindow() and PostMessage() calls are needed to work
+ // around Win32 bug with the popup menus shown for the notifications as
+ // documented at http://support.microsoft.com/kb/q135788/
+ ::SetForegroundWindow(GetHwndOf(m_win));
bool rval = m_win->PopupMenu(menu, 0, 0);
- // Work around a WIN32 bug
- ::PostMessage((HWND)m_win->GetHWND(), WM_NULL, 0, 0L);
+ ::PostMessage(GetHwndOf(m_win), WM_NULL, 0, 0L);
m_win->PopEventHandler(false);
return 0;
}
-
-#endif // __WIN95__