// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
+#if wxUSE_TASKBARICON
+
+#include <gtk/gtkversion.h>
+#if GTK_CHECK_VERSION(2, 1, 0)
+
#include "wx/gtk/taskbarpriv.h"
#ifndef WX_PRECOMP
#include "wx/log.h"
+ #include "wx/frame.h"
+ #include "wx/menu.h"
#endif
-#include "wx/frame.h"
-#include "wx/menu.h"
-
+#include <gtk/gtk.h>
#include <gdk/gdkx.h>
-#ifdef __WXGTK20__
-#include <gtk/gtkversion.h>
-#if GTK_CHECK_VERSION(2, 1, 0)
-
-#include "gtk/gtk.h"
-
#include "eggtrayicon.h"
wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()
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);
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
//-----------------------------------------------------------------------------
return true;
}
-#endif // wxUSE_MENUS_NATIVE
-#endif // __WXGTK20__
+#endif // wxUSE_MENUS_NATIVE
#endif // GTK_CHECK_VERSION(2, 1, 0)
+#endif // wxUSE_TASKBARICON