X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fe3d568d3d19d7f144e09d978e42fbad2fed875f..da0a6b013bc904f772161daa7e8aa3b653437454:/src/unix/taskbarx11.cpp diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp index 5ec54ac876..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 @@ -150,10 +151,7 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp) } wxRegion region; - if (m_bmp.GetMask()) - region.Union(m_bmp); - else - region.Union(0,0, iconsize.x, iconsize.y); + region.Union(m_bmp); // if the bitmap is smaller than the window, offset it: if (winsize != iconsize) @@ -313,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; }