From 5936756efab021bfca8cb53bd37ff84096ce0f04 Mon Sep 17 00:00:00 2001
From: cxl <cxl@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 24 Jan 2010 21:34:52 +0000
Subject: [PATCH] CtrlLib: TrayIcon fix, Core: Pick BREAK fixed to work in
 debug

git-svn-id: svn://ultimatepp.org/upp/trunk@1938 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/Core/Vcont.h            | 2 +-
 uppsrc/CtrlLib/TrayIconX11.cpp | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/uppsrc/Core/Vcont.h b/uppsrc/Core/Vcont.h
index 23b17ac44..f55a0a076 100644
--- a/uppsrc/Core/Vcont.h
+++ b/uppsrc/Core/Vcont.h
@@ -19,7 +19,7 @@ class Vector : public MoveableAndDeepCopyOption< Vector<T> > {
 	static T      *RawAlloc(int& n);
 
 #ifdef _DEBUG
-	static Vector& SetPicked(pick_ Vector& v) { BreakWhenPicked(&v); Vector& p = (Vector&)(v); p.items = -1; p.vector = NULL; return p; }
+	static Vector& SetPicked(pick_ Vector& v) { BreakWhenPicked((void *)&v); Vector& p = (Vector&)(v); p.items = -1; p.vector = NULL; return p; }
 #else
 	static Vector& SetPicked(pick_ Vector& v) { Vector& p = (Vector&)(v); p.items = -1; p.vector = NULL; return p; }
 #endif
diff --git a/uppsrc/CtrlLib/TrayIconX11.cpp b/uppsrc/CtrlLib/TrayIconX11.cpp
index 5f0ff7f07..4788c6130 100644
--- a/uppsrc/CtrlLib/TrayIconX11.cpp
+++ b/uppsrc/CtrlLib/TrayIconX11.cpp
@@ -7,7 +7,9 @@ NAMESPACE_UPP
 #ifdef PLATFORM_X11
 
 #if !defined(flagNOGTK)
-	#include <glib.h>
+	#include <limits.h>
+	#include <gtk/gtk.h>
+	#include <gdk/gdkx.h>
 	#include <libnotify/notify.h>
 #endif