X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3f1209867593a3287a626110c04dd3234c1dcda..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/msw/taskbar.cpp?ds=inline diff --git a/src/msw/taskbar.cpp b/src/msw/taskbar.cpp index 0736768648..83aef42cde 100644 --- a/src/msw/taskbar.cpp +++ b/src/msw/taskbar.cpp @@ -32,6 +32,11 @@ #include "wx/taskbar.h" #include "wx/dynlib.h" +#ifndef NIN_BALLOONTIMEOUT + #define NIN_BALLOONTIMEOUT 0x0404 + #define NIN_BALLOONUSERCLICK 0x0405 +#endif + // initialized on demand static UINT gs_msgTaskbar = 0; static UINT gs_msgRestartTaskbar = 0; @@ -143,11 +148,17 @@ wxTaskBarIcon::wxTaskBarIcon() wxTaskBarIcon::~wxTaskBarIcon() { - if (m_iconAdded) + if ( m_iconAdded ) RemoveIcon(); - if (m_win) - m_win->Destroy(); + if ( m_win ) + { + // we must use delete and not Destroy() here because the latter will + // only schedule the window to be deleted during the next idle event + // processing but we may not get any idle events if there are no other + // windows left in the program + delete m_win; + } } // Operations