X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3d257b8db10b5f464d896ff0d4249237d8f587a1..e333075415c35d2e869ea585fa41f01a2c938897:/src/gtk/taskbar.cpp?ds=sidebyside diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp index 930099e687..8035e5b342 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: @@ -12,18 +12,18 @@ // 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" +#if wxUSE_TASKBARICON -#include +#include "wx/gtk/taskbarpriv.h" -#ifdef __WXGTK20__ -#include -#if GTK_CHECK_VERSION(2, 1, 0) +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/menu.h" +#endif -#include "gtk/gtk.h" +#include +#include #include "eggtrayicon.h" @@ -44,6 +44,16 @@ wxTaskBarIconAreaBase::wxTaskBarIconAreaBase() 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; } @@ -55,9 +65,10 @@ 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); @@ -71,74 +82,10 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported() // Pop-up menu stuff //----------------------------------------------------------------------------- -extern "C" WXDLLIMPEXP_CORE void gtk_pop_hide_callback( GtkWidget *widget, bool* is_waiting ); - -extern WXDLLIMPEXP_CORE void SetInvokingWindow( wxMenu *menu, wxWindow* win ); - -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 ) +void wxTaskBarIconAreaBase::DoPopupMenuUpdateUI(wxMenu* menu) { - wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); - - wxCHECK_MSG( menu != NULL, false, wxT("invalid popup-menu") ); - - // NOTE: if you change this code, you need to update - // the same code in window.cpp as well. This - // is ugly code duplication, I know, - - SetInvokingWindow( menu, this ); - - menu->UpdateUI( m_invokingWindow ); - - 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 ); - - wxPoint pos; - gpointer userdata; - GtkMenuPositionFunc posfunc; - if ( x == -1 && y == -1 ) - { - // use GTK's default positioning algorithm - userdata = NULL; - posfunc = NULL; - } - else - { - pos = ClientToScreen(wxPoint(x, y)); - userdata = &pos; - posfunc = wxPopupMenuPositionCallback; - } - - gtk_menu_popup( - GTK_MENU(menu->m_menu), - (GtkWidget *) NULL, // parent menu shell - (GtkWidget *) NULL, // parent menu item - posfunc, // function to position it - userdata, // client data - 0, // button used to activate it - gtk_get_current_event_time() - ); - - while (is_waiting) - { - gtk_main_iteration(); - } - - gtk_signal_disconnect(GTK_OBJECT(menu->m_menu), handler); - - return true; + menu->UpdateUI(m_invokingWindow); } #endif // wxUSE_MENUS_NATIVE - -#endif // __WXGTK20__ -#endif // GTK_CHECK_VERSION(2, 1, 0) +#endif // wxUSE_TASKBARICON