X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1bf3ad3e8f34361824a801008d47833ac71dcb1..ba49d2acf95d53517719c4fd9ac2ad5aaa13540b:/src/gtk1/taskbar.cpp diff --git a/src/gtk1/taskbar.cpp b/src/gtk1/taskbar.cpp index be0e53af49..aaa37b3c0d 100644 --- a/src/gtk1/taskbar.cpp +++ b/src/gtk1/taskbar.cpp @@ -9,62 +9,5 @@ // 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 - -#ifdef __WXGTK20__ -#include -#if GTK_CHECK_VERSION(2, 1, 0) - -#include "eggtrayicon.h" - -wxTaskBarIconAreaBase::wxTaskBarIconAreaBase() -{ - if (IsProtocolSupported()) - { - 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*/); -} - -bool wxTaskBarIconAreaBase::IsProtocolSupported() -{ - static int s_supported = -1; - if (s_supported == -1) - { - 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; -} - -#endif // __WXGTK20__ -#endif // GTK_CHECK_VERSION(2, 1, 0)