fixing warning and compile error against 10.4

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

diff --git a/include/wx/generic/notifmsg.h b/include/wx/generic/notifmsg.h
index e4beca030ea756fea6e1a7a4709250ea0b92072f..9f81e2b51f8a14e804a75101b1fee821622ef11d 100644 (file)
--- a/include/wx/generic/notifmsg.h
+++ b/include/wx/generic/notifmsg.h
@@ -1,6 +1,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/notifmsg.h
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/generic/notifmsg.h

-// Purpose:     generic implementation of wxNotificationMessage
+// Purpose:     generic implementation of wxGenericNotificationMessage

 // Author:      Vadim Zeitlin
 // Created:     2007-11-24
 // RCS-ID:      $Id$
 // Author:      Vadim Zeitlin
 // Created:     2007-11-24
 // RCS-ID:      $Id$


@@ -14,22 +14,23 @@
 class wxNotificationMessageDialog;
 
 // ----------------------------------------------------------------------------
 class wxNotificationMessageDialog;
 
 // ----------------------------------------------------------------------------

-// wxNotificationMessage
+// wxGenericNotificationMessage

 // ----------------------------------------------------------------------------
 
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_ADV wxNotificationMessage : public wxNotificationMessageBase
+class WXDLLIMPEXP_ADV wxGenericNotificationMessage : public wxNotificationMessageBase

 {
 public:
 {
 public:

-    wxNotificationMessage() { Init(); }
-    wxNotificationMessage(const wxString& title,
-                          const wxString& message = wxString(),
-                          wxWindow *parent = NULL)
-        : wxNotificationMessageBase(title, message, parent)
+    wxGenericNotificationMessage() { Init(); }
+    wxGenericNotificationMessage(const wxString& title,
+                                 const wxString& message = wxString(),
+                                 wxWindow *parent = NULL,
+                                 int flags = wxICON_INFORMATION)
+        : wxNotificationMessageBase(title, message, parent, flags)

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

-    virtual ~wxNotificationMessage();
+    virtual ~wxGenericNotificationMessage();

 
 
     virtual bool Show(int timeout = Timeout_Auto);
 
 
     virtual bool Show(int timeout = Timeout_Auto);


@@ -53,7 +54,7 @@ private:
     wxNotificationMessageDialog *m_dialog;
 
 
     wxNotificationMessageDialog *m_dialog;
 
 

-    DECLARE_NO_COPY_CLASS(wxNotificationMessage)
+    wxDECLARE_NO_COPY_CLASS(wxGenericNotificationMessage);

 };
 
 #endif // _WX_GENERIC_NOTIFMSG_H_
 };
 
 #endif // _WX_GENERIC_NOTIFMSG_H_