Corrected/added support for column headers with icon and text

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

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 859a89f7cda0a75153d55d8dc02948bf158ab7f7..8035e5b3424ab6d59be2f2da24a9da3bbe2e7951 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// File:        taskbar.cpp
+// File:        src/gtk/taskbar.cpp
 // Purpose:     wxTaskBarIcon (src/unix/taskbarx11.cpp) helper for GTK2
 // Author:      Vaclav Slavik
 // Modified by:
@@ -9,22 +9,22 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "taskbarpriv.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#include "wx/log.h"
-#include "wx/frame.h"
+#if wxUSE_TASKBARICON
 
-#include <gdk/gdkx.h>
-#include <gtk/gtkversion.h>
+#include "wx/gtk/taskbarpriv.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+#endif
 
-#if defined(__WXGTK20__) && GTK_CHECK_VERSION(2, 1, 0)
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
-#include "wx/gtk/taskbarpriv.h"
 #include "eggtrayicon.h"
 
 wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()
@@ -33,16 +33,28 @@ wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()
     {
         m_widget = GTK_WIDGET(egg_tray_icon_new("systray icon"));
         gtk_window_set_resizable(GTK_WINDOW(m_widget), false);
-        
+
         wxLogTrace(_T("systray"), _T("using freedesktop.org systray spec"));
     }
-    
+
     wxTopLevelWindow::Create(
             NULL, wxID_ANY, _T("systray icon"),
             wxDefaultPosition, wxDefaultSize,
             wxDEFAULT_FRAME_STYLE | wxFRAME_NO_TASKBAR | wxSIMPLE_BORDER |
             wxFRAME_SHAPED,
             wxEmptyString /*eggtray doesn't like setting wmclass*/);
+
+    // WM frame extents are not useful for wxTaskBarIcon
+    m_deferShow = false;
+    gulong handler_id = g_signal_handler_find(
+        m_widget,
+        GSignalMatchType(G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_DATA),
+        g_signal_lookup("property_notify_event", GTK_TYPE_WIDGET),
+        0, NULL, NULL, this);
+    if (handler_id != 0)
+        g_signal_handler_disconnect(m_widget, handler_id);
+
+    m_invokingWindow = NULL;
 }
 
 bool wxTaskBarIconAreaBase::IsProtocolSupported()
@@ -52,17 +64,28 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
     {
         Display *display = GDK_DISPLAY();
         Screen *screen = DefaultScreenOfDisplay(display);
-    
-        wxString name;
-        name.Printf(_T("_NET_SYSTEM_TRAY_S%d"), XScreenNumberOfScreen(screen));
-        Atom atom = XInternAtom(display, name.ToAscii(), False);
-        
+
+        char name[32];
+        g_snprintf(name, sizeof(name), "_NET_SYSTEM_TRAY_S%d",
+            XScreenNumberOfScreen(screen));
+        Atom atom = XInternAtom(display, name, False);
+
         Window manager = XGetSelectionOwner(display, atom);
-        
+
         s_supported = (manager != None);
     }
-    
+
     return (bool)s_supported;
 }
 
-#endif // __WXGTK20__
+//-----------------------------------------------------------------------------
+// Pop-up menu stuff
+//-----------------------------------------------------------------------------
+
+#if wxUSE_MENUS_NATIVE
+void wxTaskBarIconAreaBase::DoPopupMenuUpdateUI(wxMenu* menu)
+{
+    menu->UpdateUI(m_invokingWindow);
+}
+#endif // wxUSE_MENUS_NATIVE
+#endif // wxUSE_TASKBARICON