X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/33d4eef0b9f61adad1f42ace436225ff508c6ea3..daf3246330c8ae7b4536cd1f6deef733a405cecd:/src/unix/taskbarx11.cpp?ds=sidebyside diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 5b4704bc53..cf64c408a6 100644 --- a/src/unix/taskbarx11.cpp +++ b/src/unix/taskbarx11.cpp @@ -32,6 +32,7 @@ #include "wx/sizer.h" #include "wx/dcclient.h" #include "wx/log.h" +#include "wx/image.h" #ifdef __VMS #pragma message disable nosimpint @@ -149,7 +150,8 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp) m_bmp = wxBitmap(img); } - wxRegion region(m_bmp); + wxRegion region; + region.Union(m_bmp); // if the bitmap is smaller than the window, offset it: if (winsize != iconsize) @@ -309,7 +311,6 @@ bool wxTaskBarIcon::PopupMenu(wxMenu *menu) { if (!m_iconWnd) return false; - wxSize size(m_iconWnd->GetClientSize()); - m_iconWnd->PopupMenu(menu, size.x/2, size.y/2); + m_iconWnd->PopupMenu(menu); return true; }