X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bd3b8eca1d6ef2749797f34216493fce0edd8d6..8ca1a013e4e699724040ff1f514dab3b4a11d3c9:/src/gtk/taskbar.cpp diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp index cc61da167e..bfd2341e2d 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,17 +9,18 @@ // 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" +#if wxUSE_TASKBARICON + #include "wx/gtk/taskbarpriv.h" -#include "wx/log.h" -#include "wx/frame.h" -#include "wx/menu.h" + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/frame.h" + #include "wx/menu.h" +#endif #include @@ -37,17 +38,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,16 +59,16 @@ 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); - + Window manager = XGetSelectionOwner(display, atom); - + s_supported = (manager != None); } - + return (bool)s_supported; } @@ -75,15 +76,17 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported() // 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 ) { wxCHECK_MSG( m_widget != NULL, false, wxT("invalid window") ); @@ -100,10 +103,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; @@ -136,10 +138,13 @@ 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 // GTK_CHECK_VERSION(2, 1, 0) + +#endif // wxUSE_TASKBARICON