Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

call SetLegacyWMProperties last, it calls gtk_widget_realize, which will lead to assertion failures if initialization has not been done yet

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48534 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2007-09-03 20:45:21 +00:00
parent 37fde1063b
commit 7d8e5b8f04
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/unix/taskbarx11.cpp
View File

@@ -126,13 +126,6 @@ END_EVENT_TABLE()
wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp) wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
: wxTaskBarIconAreaBase(), m_icon(icon), m_pos(0,0) : wxTaskBarIconAreaBase(), m_icon(icon), m_pos(0,0)
{ {
if (!IsProtocolSupported())
{
wxLogTrace(_T("systray"),
_T("using legacy KDE1,2 and GNOME 1.2 methods"));
SetLegacyWMProperties();
}
#if defined(__WXGTK20__) && defined(TASKBAR_ICON_AREA_BASE_INCLUDED) #if defined(__WXGTK20__) && defined(TASKBAR_ICON_AREA_BASE_INCLUDED)
m_invokingWindow = icon; m_invokingWindow = icon;
#endif #endif
@@ -142,6 +135,13 @@ wxTaskBarIconArea::wxTaskBarIconArea(wxTaskBarIcon *icon, const wxBitmap &bmp)
SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight())); SetSize(wxSize(bmp.GetWidth(), bmp.GetHeight()));
SetTrayIcon(bmp); SetTrayIcon(bmp);
if (!IsProtocolSupported())
{
wxLogTrace(_T("systray"),
_T("using legacy KDE1,2 and GNOME 1.2 methods"));
SetLegacyWMProperties();
}
} }
void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp) void wxTaskBarIconArea::SetTrayIcon(const wxBitmap& bmp)