Changed wxMSW wxGraphicsContext font rendering and extent calculation to take into...

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

diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index 348af4a93f3dc3b7129825cc3a2362c511bc06d0..a864e76371331641f192218476d7c808ebe2834b 100644 (file)
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -23,7 +23,10 @@
     #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"
 
 
 #include "wx/notifmsg.h"
 


@@ -55,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


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

-    DECLARE_NO_COPY_CLASS(wxNotificationIconEvtHandler)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationIconEvtHandler);

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


@@ -277,7 +280,7 @@ void wxBalloonNotifMsgImpl::SetUpIcon(wxWindow *win)
         if ( !icon.IsOk() )
         {
             // we really must have some icon
         if ( !icon.IsOk() )
         {
             // we really must have some icon

-            icon = wxIcon(_T("wxICON_AAA"));
+            icon = wxIcon(wxT("wxICON_AAA"));

         }
 
         m_icon->SetIcon(icon);
         }
 
         m_icon->SetIcon(icon);


@@ -314,11 +317,11 @@ 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,

-                    _T("shouldn't be used") );
+                    wxT("shouldn't be used") );

 
     // base class creates the icon for us initially but we could have destroyed
     // it in DoClose(), recreate it if this was the case
 
     // base class creates the icon for us initially but we could have destroyed
     // it in DoClose(), recreate it if this was the case


@@ -365,7 +368,7 @@ wxAutoNotifMsgImpl::DoShow(const wxString& title,
                            int flags)
 {
     wxASSERT_MSG( timeout != wxNotificationMessage::Timeout_Never,
                            int flags)
 {
     wxASSERT_MSG( timeout != wxNotificationMessage::Timeout_Never,

-                    _T("shouldn't be used") );
+                    wxT("shouldn't be used") );

 
     if ( timeout == wxNotificationMessage::Timeout_Auto )
     {
 
     if ( timeout == wxNotificationMessage::Timeout_Auto )
     {