github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-22 06:12:32 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib: TrayIcon fix, Core: Pick BREAK fixed to work in debug

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@1938 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2010-01-24 21:34:52 +00:00
parent 967994cde6
commit 5936756efa
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Core/Vcont.h
View file

@ -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

4
uppsrc/CtrlLib/TrayIconX11.cpp
View file

@ -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