check that the version of __sync_sub_and_fetch that returns a value is supported...

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

diff --git a/src/msw/notifmsg.cpp b/src/msw/notifmsg.cpp
index 136a1bc9c79221c72b5b47cc1e0f501da2f24e2a..348af4a93f3dc3b7129825cc3a2362c511bc06d0 100644 (file)
--- a/src/msw/notifmsg.cpp
+++ b/src/msw/notifmsg.cpp
@@ -25,11 +25,14 @@
 
 #if wxUSE_NOTIFICATION_MESSAGE && wxUSE_TASKBARICON
 
 
 #if wxUSE_NOTIFICATION_MESSAGE && wxUSE_TASKBARICON
 

+#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"


@@ -203,7 +206,7 @@ wxNotificationIconEvtHandler::wxNotificationIconEvtHandler(wxTaskBarIcon *icon)
     m_icon->Connect
             (
               wxEVT_TASKBAR_BALLOON_CLICK,
     m_icon->Connect
             (
               wxEVT_TASKBAR_BALLOON_CLICK,

-              wxTaskBarIconEventHandler(wxNotificationIconEvtHandler::OnTimeout),
+              wxTaskBarIconEventHandler(wxNotificationIconEvtHandler::OnClick),

               NULL,
               this
             );
               NULL,
               this
             );


@@ -377,6 +380,9 @@ wxAutoNotifMsgImpl::DoShow(const wxString& title,
 // wxNotificationMessage
 // ----------------------------------------------------------------------------
 
 // wxNotificationMessage
 // ----------------------------------------------------------------------------
 

+/* static */
+bool wxNotificationMessage::ms_alwaysUseGeneric = false;
+

 /* static */
 wxTaskBarIcon *wxNotificationMessage::UseTaskBarIcon(wxTaskBarIcon *icon)
 {
 /* static */
 wxTaskBarIcon *wxNotificationMessage::UseTaskBarIcon(wxTaskBarIcon *icon)
 {


@@ -387,7 +393,7 @@ bool wxNotificationMessage::Show(int timeout)
 {
     if ( !m_impl )
     {
 {
     if ( !m_impl )
     {

-        if ( wxTheApp->GetShell32Version() >= 500 )
+        if ( !ms_alwaysUseGeneric && wxTheApp->GetShell32Version() >= 500 )

         {
             if ( timeout == Timeout_Never )
                 m_impl = new wxManualNotifMsgImpl(GetParent());
         {
             if ( timeout == Timeout_Never )
                 m_impl = new wxManualNotifMsgImpl(GetParent());