fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...

[wxWidgets.git] / src / msw / notifmsg.cpp

diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index 348af4a93f3dc3b7129825cc3a2362c511bc06d0..748445e3ae8f1f810d46df60f3f81cc94fcd6bc2 100644 (file)
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -23,7 +23,10 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_NOTIFICATION_MESSAGE && wxUSE_TASKBARICON
+// we can only use the native implementation if we have a working
+// wxTaskBarIcon::ShowBalloon() method
+#if wxUSE_NOTIFICATION_MESSAGE && \
+        wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS
 
 #include "wx/notifmsg.h"
 
@@ -314,7 +317,7 @@ wxManualNotifMsgImpl::~wxManualNotifMsgImpl()
 bool
 wxManualNotifMsgImpl::DoShow(const wxString& title,
                              const wxString& message,
-                             int timeout,
+                             int WXUNUSED_UNLESS_DEBUG(timeout),
                              int flags)
 {
     wxASSERT_MSG( timeout == wxNotificationMessage::Timeout_Never,