Remove wxT from prototype

[wxWidgets.git] / src / gtk / notifmsg.cpp

diff --git a/src/gtk/notifmsg.cpp b/src/gtk/notifmsg.cpp
index 8b4b75c076389d7392b095b93c6a9ed3e0cbf75a..d50dee214084814ee66517d9172e5b3f908812dd 100644 (file)
--- a/src/gtk/notifmsg.cpp
+++ b/src/gtk/notifmsg.cpp
@@ -23,7 +23,7 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

-#if wxUSE_NOTIFICATION_MESSAGE
+#if wxUSE_NOTIFICATION_MESSAGE && wxUSE_LIBNOTIFY

 
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP
 
 #ifndef WX_PRECOMP
 #endif // WX_PRECOMP


@@ -82,6 +82,13 @@ wxIMPLEMENT_DYNAMIC_CLASS(wxLibnotifyModule, wxModule);
 // wxNotificationMessage implementation
 // ============================================================================
 
 // wxNotificationMessage implementation
 // ============================================================================
 

+bool wxNotificationMessage::GTKSetIconName(const wxString& name)
+{
+    m_iconName = name;
+
+    return true;
+}
+

 bool wxNotificationMessage::Show(int timeout)
 {
     if ( !wxLibnotifyModule::Initialize() )
 bool wxNotificationMessage::Show(int timeout)
 {
     if ( !wxLibnotifyModule::Initialize() )


@@ -113,6 +120,15 @@ bool wxNotificationMessage::Show(int timeout)
             return false;
     }
 
             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 )
     // 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);
 }
 
         g_object_unref(m_notification);
 }
 

-#endif // wxUSE_NOTIFICATION_MESSAGE
+#endif // wxUSE_NOTIFICATION_MESSAGE && wxUSE_LIBNOTIFY