X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2d5abbf527ae760cf65467bf94b914ba9974657..c4168888e3dbc36c6160e42687b94b74de8103c9:/include/wx/notifmsg.h

diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h
index 08f0672c2f..2c76226c63 100644
--- a/include/wx/notifmsg.h
+++ b/include/wx/notifmsg.h
@@ -37,7 +37,7 @@ public:
     // create a notification object with the given title and message (the
     // latter may be empty in which case only the title will be shown)
     wxNotificationMessageBase(const wxString& title,
-                              const wxString& message = wxString(),
+                              const wxString& message = wxEmptyString,
                               wxWindow *parent = NULL,
                               int flags = wxICON_INFORMATION)
         : m_title(title),
@@ -124,17 +124,18 @@ private:
 
     int m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessageBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);
 };
 
-#if defined(__WXGTK__) && wxUSE_LIBHILDON
-    #include "wx/gtk/hildon/notifmsg.h"
 /*
-    TODO: provide support for
-        - libnotify (Gnome)
-        - Growl (http://growl.info/, OS X)
+    TODO: Implement under OS X using notification centre (10.8+) or
+          Growl (http://growl.info/) for the previous versions.
  */
-#elif defined(__WXMSW__) && wxUSE_TASKBARICON
+#if defined(__WXGTK__) && wxUSE_LIBNOTIFY
+    #include "wx/gtk/notifmsg.h"
+#elif defined(__WXGTK__) && (wxUSE_LIBHILDON || wxUSE_LIBHILDON2)
+    #include "wx/gtk/hildon/notifmsg.h"
+#elif defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS
     #include "wx/msw/notifmsg.h"
 #else
     #include "wx/generic/notifmsg.h"
@@ -144,7 +145,7 @@ private:
     public:
         wxNotificationMessage() { }
         wxNotificationMessage(const wxString& title,
-                              const wxString& message = wxString(),
+                              const wxString& message = wxEmptyString,
                               wxWindow *parent = NULL,
                               int flags = wxICON_INFORMATION)
             : wxGenericNotificationMessage(title, message, parent, flags)