don't draw borders for bitmap buttons with wxBORDER_NONE style

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

diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h
index 08f0672c2fa3202306a4e023abcff521d1693d97..fa647209556c7f5e200ea9692aae1c2ff9e884c0 100644 (file)
--- 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,
     // 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),
                               wxWindow *parent = NULL,
                               int flags = wxICON_INFORMATION)
         : m_title(title),


@@ -124,7 +124,7 @@ private:
 
     int m_flags;
 
 
     int m_flags;
 

-    DECLARE_NO_COPY_CLASS(wxNotificationMessageBase)
+    wxDECLARE_NO_COPY_CLASS(wxNotificationMessageBase);

 };
 
 #if defined(__WXGTK__) && wxUSE_LIBHILDON
 };
 
 #if defined(__WXGTK__) && wxUSE_LIBHILDON


@@ -134,7 +134,7 @@ private:
         - libnotify (Gnome)
         - Growl (http://growl.info/, OS X)
  */
         - 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"
     #include "wx/msw/notifmsg.h"
 #else
     #include "wx/generic/notifmsg.h"


@@ -144,7 +144,7 @@ private:
     public:
         wxNotificationMessage() { }
         wxNotificationMessage(const wxString& title,
     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)
                               wxWindow *parent = NULL,
                               int flags = wxICON_INFORMATION)
             : wxGenericNotificationMessage(title, message, parent, flags)