X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065f010fe343a5a0f20c4658b053882a213a3be3..eff112a64082e20a581fb489980b76e1d7bb0d5e:/src/gtk/taskbar.cpp

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 1badc0a089..4bb7f2dcf2 100644
--- 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,25 +9,24 @@
 // 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/gtk/taskbarpriv.h"
-#include "wx/log.h"
-#include "wx/frame.h"
-#include "wx/menu.h"
-
-#include <gdk/gdkx.h>
+#if wxUSE_TASKBARICON
 
-#ifdef __WXGTK20__
 #include <gtk/gtkversion.h>
 #if GTK_CHECK_VERSION(2, 1, 0)
 
-#include "gtk/gtk.h"
+#include "wx/gtk/taskbarpriv.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/log.h"
+    #include "wx/frame.h"
+    #include "wx/menu.h"
+#endif
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
 
 #include "eggtrayicon.h"
 
@@ -37,17 +36,17 @@ 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*/);
-            
+
     m_invokingWindow = NULL;
 }
 
@@ -58,31 +57,40 @@ 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;
 }
 
+bool wxTaskBarIconAreaBase::IsDecorCacheable() const
+{
+    // Apparently, WM frame extents extend to full width of screen when window
+    // is in the tray. Don't cache, it's not useful for other windows.
+    return false;
+}
+
 //-----------------------------------------------------------------------------
 // Pop-up menu stuff
 //-----------------------------------------------------------------------------
 
-extern "C" void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting  );
+extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting  );
 
-extern void SetInvokingWindow( wxMenu *menu, wxWindow* win );
+extern WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win );
 
-extern "C" void wxPopupMenuPositionCallback( GtkMenu *menu,
-                                             gint *x, gint *y,
-                                             gboolean * WXUNUSED(whatever),
-                                             gpointer user_data );
+extern "C" WXDLLIMPEXP_CORE
+    void wxPopupMenuPositionCallback( GtkMenu *menu,
+                                      gint *x, gint *y,
+                                      gboolean * WXUNUSED(whatever),
+                                      gpointer user_data );
 
 #if wxUSE_MENUS_NATIVE
 bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
@@ -101,10 +109,9 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
 
     bool is_waiting = true;
 
-    gulong handler = gtk_signal_connect( GTK_OBJECT(menu->m_menu),
-                                         "hide",
-                                         GTK_SIGNAL_FUNC(gtk_pop_hide_callback),
-                                         (gpointer)&is_waiting );
+    gulong handler = g_signal_connect (menu->m_menu, "hide",
+                                       G_CALLBACK (gtk_pop_hide_callback),
+                                       &is_waiting);
 
     wxPoint pos;
     gpointer userdata;
@@ -137,11 +144,11 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
         gtk_main_iteration();
     }
 
-    gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler);
+    g_signal_handler_disconnect (menu->m_menu, handler);
 
     return true;
 }
-#endif // wxUSE_MENUS_NATIVE
 
-#endif // __WXGTK20__
+#endif // wxUSE_MENUS_NATIVE
 #endif // GTK_CHECK_VERSION(2, 1, 0)
+#endif // wxUSE_TASKBARICON