X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2d5abbf527ae760cf65467bf94b914ba9974657..43ff861df48f0837dac98005dd397c5f127ca136:/include/wx/notifmsg.h?ds=sidebyside

diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h
index 08f0672c2f..39a964ec23 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,17 @@ private:
 
     int m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxNotificationMessageBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);
 };
 
-#if defined(__WXGTK__) && wxUSE_LIBHILDON
+#if defined(__WXGTK__) && (wxUSE_LIBHILDON || wxUSE_LIBHILDON2)
     #include "wx/gtk/hildon/notifmsg.h"
 /*
     TODO: provide support for
         - libnotify (Gnome)
         - Growl (http://growl.info/, OS X)
  */
-#elif defined(__WXMSW__) && wxUSE_TASKBARICON
+#elif defined(__WXMSW__) && wxUSE_TASKBARICON && wxUSE_TASKBARICON_BALLOONS
     #include "wx/msw/notifmsg.h"
 #else
     #include "wx/generic/notifmsg.h"
@@ -144,7 +144,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)