fix compilation without wxUSE_STREAMS (closes #10900)

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

diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index cedac4899bd2fd052e4c27bc063ebba547e14141..31a4472be4b195e1151920bc5191ba785a6d6179 100644 (file)
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -23,13 +23,19 @@
     #pragma hdrstop
 #endif
 
     #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"

 
 #ifndef WX_PRECOMP
 
 #ifndef WX_PRECOMP

+    #include "wx/toplevel.h"
+    #include "wx/app.h"

     #include "wx/string.h"
 #endif // WX_PRECOMP
 
     #include "wx/string.h"
 #endif // WX_PRECOMP
 

-#include "wx/notifmsg.h"

 #include "wx/generic/notifmsg.h"
 
 #include "wx/taskbar.h"
 #include "wx/generic/notifmsg.h"
 
 #include "wx/taskbar.h"


@@ -52,7 +58,7 @@ public:
     virtual bool DoClose() = 0;
 
 private:
     virtual bool DoClose() = 0;
 
 private:

-    DECLARE_NO_COPY_CLASS(wxNotifMsgImpl)
+    wxDECLARE_NO_COPY_CLASS(wxNotifMsgImpl);

 };
 
 // implementation which is simply a bridge to wxGenericNotificationMessage
 };
 
 // implementation which is simply a bridge to wxGenericNotificationMessage


@@ -178,7 +184,7 @@ private:
 
     wxTaskBarIcon * const m_icon;
 
 
     wxTaskBarIcon * const m_icon;
 

-    DECLARE_NO_COPY_CLASS(wxNotificationIconEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationIconEvtHandler);

 };
 
 // ============================================================================
 };
 
 // ============================================================================


@@ -311,7 +317,7 @@ wxManualNotifMsgImpl::~wxManualNotifMsgImpl()
 bool
 wxManualNotifMsgImpl::DoShow(const wxString& title,
                              const wxString& message,
 bool
 wxManualNotifMsgImpl::DoShow(const wxString& title,
                              const wxString& message,

-                             int timeout,
+                             int WXUNUSED_UNLESS_DEBUG(timeout),

                              int flags)
 {
     wxASSERT_MSG( timeout == wxNotificationMessage::Timeout_Never,
                              int flags)
 {
     wxASSERT_MSG( timeout == wxNotificationMessage::Timeout_Never,