Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / msw / notifmsg.h

diff --git a/include/wx/msw/notifmsg.h b/include/wx/msw/notifmsg.h
index 0928ea71bc9094b096b512e0799b78403cbb1e3f..b7e0e0e8672ac23d337b6025c2ba52fb767fc6ed 100644 (file)
--- a/include/wx/msw/notifmsg.h
+++ b/include/wx/msw/notifmsg.h
@@ -3,7 +3,6 @@
 // Purpose:     implementation of wxNotificationMessage for Windows
 // Author:      Vadim Zeitlin
 // Created:     2007-12-01
 // Purpose:     implementation of wxNotificationMessage for Windows
 // Author:      Vadim Zeitlin
 // Created:     2007-12-01

-// RCS-ID:      $Id$

 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 2007 Vadim Zeitlin <vadim@wxwindows.org>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////


@@ -23,8 +22,9 @@ public:
     wxNotificationMessage() { Init(); }
     wxNotificationMessage(const wxString& title,
                           const wxString& message = wxString(),
     wxNotificationMessage() { Init(); }
     wxNotificationMessage(const wxString& title,
                           const wxString& message = wxString(),

-                          wxWindow *parent = NULL)
-        : wxNotificationMessageBase(title, message, parent)
+                          wxWindow *parent = NULL,
+                          int flags = wxICON_INFORMATION)
+        : wxNotificationMessageBase(title, message, parent, flags)

     {
         Init();
     }
     {
         Init();
     }


@@ -47,17 +47,27 @@ public:
     // returns the task bar icon which was used previously (may be NULL)
     static wxTaskBarIcon *UseTaskBarIcon(wxTaskBarIcon *icon);
 
     // returns the task bar icon which was used previously (may be NULL)
     static wxTaskBarIcon *UseTaskBarIcon(wxTaskBarIcon *icon);
 

+    // call this to always use the generic implementation, even if the system
+    // supports the balloon tooltips used by the native one
+    static void AlwaysUseGeneric(bool alwaysUseGeneric)
+    {
+        ms_alwaysUseGeneric = alwaysUseGeneric;
+    }
+

 private:
     // common part of all ctors
     void Init() { m_impl = NULL; }
 
 
 private:
     // common part of all ctors
     void Init() { m_impl = NULL; }
 
 

+    // flag indicating whether we should always use generic implementation
+    static bool ms_alwaysUseGeneric;
+

     // the real implementation of this class (selected during run-time because
     // the balloon task bar icons are not available in all Windows versions)
     class wxNotifMsgImpl *m_impl;
 
 
     // the real implementation of this class (selected during run-time because
     // the balloon task bar icons are not available in all Windows versions)
     class wxNotifMsgImpl *m_impl;
 
 

-    DECLARE_NO_COPY_CLASS(wxNotificationMessage)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessage);

 };
 
 #endif // _WX_MSW_NOTIFMSG_H_
 };
 
 #endif // _WX_MSW_NOTIFMSG_H_