X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afbf46a31740bb05af12a8ba0069345a2c9aba46..e9d7a889634ee5cbe90bcc639c6197a29169be3a:/src/gtk/notifmsg.cpp

diff --git a/src/gtk/notifmsg.cpp b/src/gtk/notifmsg.cpp
index 8b4b75c076..d50dee2140 100644
--- a/src/gtk/notifmsg.cpp
+++ b/src/gtk/notifmsg.cpp
@@ -23,7 +23,7 @@
     #pragma hdrstop
 #endif
 
-#if wxUSE_NOTIFICATION_MESSAGE
+#if wxUSE_NOTIFICATION_MESSAGE && wxUSE_LIBNOTIFY
 
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
@@ -82,6 +82,13 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxLibnotifyModule, wxModule);
 // wxNotificationMessage implementation
 // ============================================================================
 
+bool wxNotificationMessage::GTKSetIconName(const wxString& name)
+{
+    m_iconName = name;
+
+    return true;
+}
+
 bool wxNotificationMessage::Show(int timeout)
 {
     if ( !wxLibnotifyModule::Initialize() )
@@ -113,6 +120,15 @@ bool wxNotificationMessage::Show(int timeout)
             return false;
     }
 
+    // Explicitly specified icon name overrides the implicit one determined by
+    // the flags.
+    wxScopedCharBuffer buf;
+    if ( !m_iconName.empty() )
+    {
+        buf = m_iconName.utf8_str();
+        icon = buf;
+    }
+
     // Create the notification or update an existing one if we had already been
     // shown before.
     if ( !m_notification )
@@ -191,4 +207,4 @@ wxNotificationMessage::~wxNotificationMessage()
         g_object_unref(m_notification);
 }
 
-#endif // wxUSE_NOTIFICATION_MESSAGE
+#endif // wxUSE_NOTIFICATION_MESSAGE && wxUSE_LIBNOTIFY