Replaced Ok() occurrences with IsOk() throughout trunk.

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

diff --git a/include/wx/notifmsg.h b/include/wx/notifmsg.h
index 90239b354b2e8436ca25ee2edff25475d50e0141..39a964ec238be9c039d99bce2d41e835db0d85c9 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,10 +124,10 @@ 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 || wxUSE_LIBHILDON2)

     #include "wx/gtk/hildon/notifmsg.h"
 /*
     TODO: provide support for
     #include "wx/gtk/hildon/notifmsg.h"
 /*
     TODO: provide support for


@@ -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)