From 299a13f262d10129569800f9fa2d30992c8a654b Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 25 Jan 2010 08:32:51 +0000 Subject: [PATCH] CtrlLib: Another TrayIcon fix git-svn-id: svn://ultimatepp.org/upp/trunk@1946 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/CtrlLib/TrayIconX11.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/uppsrc/CtrlLib/TrayIconX11.cpp b/uppsrc/CtrlLib/TrayIconX11.cpp index 7ad079485..04b89e500 100644 --- a/uppsrc/CtrlLib/TrayIconX11.cpp +++ b/uppsrc/CtrlLib/TrayIconX11.cpp @@ -2,6 +2,8 @@ #define LLOG(x) // LOG(x) +#ifdef PLATFORM_X11 + #if !defined(flagNOGTK) #include #include @@ -9,8 +11,6 @@ NAMESPACE_UPP -#ifdef PLATFORM_X11 - Atom TraySelection() { return XAtom(Format("_NET_SYSTEM_TRAY_S%d", Xscreenno)); @@ -225,7 +225,6 @@ void TrayIcon::BalloonTimeout() { } +END_UPP_NAMESPACE #endif - -END_UPP_NAMESPACE