PCH-less build fix

[wxWidgets.git] / src / gtk / taskbar.cpp

diff --git a/src/gtk/taskbar.cpp b/src/gtk/taskbar.cpp
index 0ef04d1e44e67c5bbf0d3280dc509d644666f306..4bb7f2dcf26fb91c13be9ca6bdb85775c013c523 100644 (file)
--- a/src/gtk/taskbar.cpp
+++ b/src/gtk/taskbar.cpp
@@ -12,23 +12,22 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // 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/gtk/taskbarpriv.h"
 
 #ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/frame.h"

+    #include "wx/menu.h"

 #endif
 
 #endif
 

-#include "wx/menu.h"
-
+#include <gtk/gtk.h>

 #include <gdk/gdkx.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()
 #include "eggtrayicon.h"
 
 wxTaskBarIconAreaBase::wxTaskBarIconAreaBase()


@@ -59,9 +58,10 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
         Display *display = GDK_DISPLAY();
         Screen *screen = DefaultScreenOfDisplay(display);
 
         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);
 
 
         Window manager = XGetSelectionOwner(display, atom);
 


@@ -71,6 +71,13 @@ bool wxTaskBarIconAreaBase::IsProtocolSupported()
     return (bool)s_supported;
 }
 
     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
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 // Pop-up menu stuff
 //-----------------------------------------------------------------------------


@@ -141,7 +148,7 @@ bool wxTaskBarIconAreaBase::DoPopupMenu( wxMenu *menu, int x, int y )
 
     return true;
 }
 
     return true;
 }

-#endif // wxUSE_MENUS_NATIVE

 
 

-#endif // __WXGTK20__
+#endif // wxUSE_MENUS_NATIVE

 #endif // GTK_CHECK_VERSION(2, 1, 0)
 #endif // GTK_CHECK_VERSION(2, 1, 0)

+#endif // wxUSE_TASKBARICON