AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

document that the workaround used to make popup menus behave correctly is the one officially sanctioned by Microsoft and provide the URL to the Knowledge Base article; also minor cleanup: use GetHwndOf() instead of HWND casts

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38915 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-04-26 00:05:09 +00:00
parent 94c4754368
commit 63b3dc58be
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/msw/taskbar.cpp
View File

@ -147,7 +147,7 @@ bool wxTaskBarIcon::SetIcon(const wxIcon& icon, const wxString& tooltip)
m_icon = icon;
m_strTooltip = tooltip;
NotifyIconData notifyData((HWND)m_win->GetHWND());
NotifyIconData notifyData(GetHwndOf(m_win));
if (icon.Ok())
{
@ -178,7 +178,7 @@ bool wxTaskBarIcon::RemoveIcon()
m_iconAdded = false;
NotifyIconData notifyData((HWND)m_win->GetHWND());
NotifyIconData notifyData(GetHwndOf(m_win));
return Shell_NotifyIcon(NIM_DELETE, &notifyData) != 0;
}
@ -203,13 +203,14 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu)
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);