use client size to avoid gdk_window_get_frame_extents, which returns the full width...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48538 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/unix/taskbarx11.cpp b/src/unix/taskbarx11.cpp
index b28971768a347566df8e264653e7e32ef6628fd3..ab82f80a49bb57069bc7db6be1464d7f48b1270f 100644 (file)
--- a/src/unix/taskbarx11.cpp
+++ b/src/unix/taskbarx11.cpp
@@ -132,7 +132,7 @@ wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
 
     // Set initial size to bitmap size (tray manager may and often will
     // change it):
 
     // Set initial size to bitmap size (tray manager may and often will
     // change it):

-    SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));
+    SetClientSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));

 
     SetTrayIcon(bmp);
 
 
     SetTrayIcon(bmp);
 


@@ -149,7 +149,7 @@ void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)
     m_bmp = bmp;
 
     // determine suitable bitmap size:
     m_bmp = bmp;
 
     // determine suitable bitmap size:

-    wxSize winsize(GetSize());
+    wxSize winsize(GetClientSize());

     wxSize bmpsize(m_bmp.GetWidth(), m_bmp.GetHeight());
     wxSize iconsize(wxMin(winsize.x, bmpsize.x), wxMin(winsize.y, bmpsize.y));
 
     wxSize bmpsize(m_bmp.GetWidth(), m_bmp.GetHeight());
     wxSize iconsize(wxMin(winsize.x, bmpsize.x), wxMin(winsize.y, bmpsize.y));