diff --git a/include/lgi/common/DropFiles.h b/include/lgi/common/DropFiles.h
--- a/include/lgi/common/DropFiles.h
+++ b/include/lgi/common/DropFiles.h
@@ -1,242 +1,243 @@
 #ifndef __DROP_FILES__
 #define __DROP_FILES__
 
 #include "lgi/common/Variant.h"
 #include "lgi/common/Array.h"
 #include "lgi/common/XmlTree.h"
 
 #if WINNATIVE
 #include <Shlobj.h>
 #elif defined MAC
 #include "lgi/common/Net.h"
+#include "lgi/common/Uri.h"
 LgiFunc bool LMacFileToPath(LString &a);
 #endif
 
 class LDropFiles : public LArray<const char*>
 {
 	LString Fmt;
 
 public:
 	LDropFiles(LDragData &dd)
 	{
 		if (dd.IsFileDrop())
 		{
 			Fmt = dd.Format;
 			for (unsigned i=0; i<dd.Data.Length(); i++)
 				Init(dd.Data[i]);
 		}
 	}
 
     LDropFiles(LVariant &v)
 	{
 		Init(v);
 	}
 
     ~LDropFiles()
 	{
 		DeleteArrays();
 	}
 
 	void Init(LVariant &v)
 	{
 		#if WINNATIVE
 	
 			DROPFILES *Df = v.IsBinary() && v.Value.Binary.Length >= sizeof(DROPFILES) ? (DROPFILES*)v.Value.Binary.Data : 0;
 			if (Df)
 			{
 				void *FilesPtr = ((char*)Df) + Df->pFiles;
 				if (Df->fWide)
 				{
 					char16 *f = (char16*)FilesPtr;
 					while (*f)
 					{
 						char *Utf8 = WideToUtf8(f);
 						if (Utf8) Add(Utf8);
 						f += StrlenW(f) + 1;
 					}
 				}
 				else
 				{
 					char *f = (char*)FilesPtr;
 					while (*f)
 					{
 						Add((char*)LNewConvertCp("utf-8", f, LAnsiToLgiCp()));
 						f += strlen(f) + 1;
 					}
 				}
 			}
 	
 		#elif defined __GTK_H__
 	
 			if (v.IsBinary())
 			{
 				LString s((char*)v.Value.Binary.Data, v.Value.Binary.Length);
 				auto Uri = s.SplitDelimit("\r\n");
 				for (int i=0; i<Uri.Length(); i++)
 				{
 					char *File = Uri[i];
 
 					// Remove leading 'File:'
 					if (strnicmp(File, "file:", 5) == 0) File += 5;
 					#if defined(WIN32)
 					while (*File == '/')
 						File++;
 					#elif defined(LINUX)
 					for (int i=0; i<2 && *File == '/'; i++)
 						File++;
 					#endif
 
 					// Decode URI
 					char *in = File, *out = File;
 					while (*in)
 					{
 						if (*in == '%')
 						{
 							char h[3] = { in[1], in[2], 0 };
 							*out++ = htoi(h);
 							in += 3;
 						}
 						else
 						{
 							*out++ = *in++;
 						}
 					}
 					*out++ = 0;
 
 					// Check file exists..
 					LFile::Path p(File);
 					if (p.Exists())
 					{
 						#ifdef WINDOWS
 						char *c;
 						while (c = strchr(File, '/'))
 							*c = '\\';
 						#endif
 
 						Add(NewStr(File));
 					}
 				}
 			}
 			else printf("LDropFiles: Type not binary.\n");
 
 		#elif defined MAC
 
 			LArray<LVariant*> a;
 			if (v.Type == GV_LIST)
 			{
 				for (auto f: *v.Value.Lst)
 				{
 					a.Add(f);
 				}
 			}
 			else
 			{
 				a.Add(&v);
 			}
 	
 			for (int i=0; i<a.Length(); i++)
 			{
 				LVariant *v = a[i];
 				LString s;
 				if (v->Type == GV_STRING)
 					s = v->Str();
 				else if (v->Type == GV_BINARY)
 					s.Set((char*)v->Value.Binary.Data, v->Value.Binary.Length);
 
 				if (!s)
 					return;
 
 				if (Fmt.Equals("NSFilenamesPboardType"))
 				{
 					LXmlTree t;
 					LXmlTag r;
 					LMemStream ms(v->Value.Binary.Data, v->Value.Binary.Length, false);
 					if (t.Read(&r, &ms))
 					{
 						auto Arr = r.GetChildTag("array");
 						if (!Arr) return;
 						for (auto c: Arr->Children)
 						{
 							if (c->IsTag("string"))
 							{
 								auto fn = c->GetContent();
 								Add(NewStr(fn));
 							}
 						}
 					}
 				}
 				else
 				{
 					LUri u(s);
 					if
 					(
 						(
 							u.sProtocol
 							&&
 							stricmp(u.sProtocol, "file") == 0
 						)
 						&&
 						(
 							!u.sHost
 							||
 							(
 								ValidStr(u.sHost)
 								&&
 								stricmp(u.sHost, "localhost") == 0
 							)
 						)
 					)
 					{
 						LString a = u.DecodeStr(u.sPath);
 						
 						if (a.Get() && !strncasecmp(a, "/.file/", 7))
 							LMacFileToPath(a);
 					
 						if (a)
 							Add(NewStr(a));
 					}
 					else if (!u.sProtocol &&
 							LFileExists(s))
 					{
 						Add(NewStr(s));
 					}
 				}
 			}
 
 		#endif
 	}
 };
 
 class LDropStreams : public LArray<LStreamI*>
 {
 public:
 	LDropStreams(LDragData &dd)
 	{
 		#if defined(WINDOWS)
 		for (unsigned i=0; i<dd.Data.Length(); i++)
 		{
 			LVariant &v = dd.Data[i];
 			if (v.Type == GV_LIST)
 			{
 				for (auto f: *v.Value.Lst)
 				{
 					if (f->Type == GV_STREAM)
 					{
 						Add(f->Value.Stream.Ptr);
 						f->Value.Stream.Own = false;
 					}
 				}
 			}
 		}
 		#elif defined(MAC)
 		#elif defined(LINUX)
 		#endif
 	}
 
 	~LDropStreams()
 	{
 		DeleteObjects();
 	}
 };
 
 #endif
diff --git a/src/common/Lgi/GuiUtils.cpp b/src/common/Lgi/GuiUtils.cpp
--- a/src/common/Lgi/GuiUtils.cpp
+++ b/src/common/Lgi/GuiUtils.cpp
@@ -1,289 +1,291 @@
 #include <stdio.h>
 #include "lgi/common/Lgi.h"
 #include "lgi/common/SkinEngine.h"
 #if defined(LINUX) && !defined(LGI_SDL)
 #include "LgiWinManGlue.h"
 #endif
 
 //////////////////////////////////////////////////////////////////////////////////
 #if !defined(LK_CONTEXTKEY)
 	// LK_CONTEXTKEY is the key that brings up the context menu
 	#if defined(WINDOWS)
 		#define LK_CONTEXTKEY 0x5d
 	#elif defined(MAC)
-		#define LK_CONTEXTKEY VK_APPS
+		#define LK_CONTEXTKEY 0x6e
 	#elif defined(__GTK_H__)
 		#define LK_CONTEXTKEY GDK_KEY_Menu
 	#else
 		#define LK_CONTEXTKEY 0x5d
 		#warning "Check local platform def for app menu key."
 	#endif
 #endif
 
-LKey::LKey(int key, uint32_t flags)
+LKey::LKey(int Vkey, uint32_t flags)
 {
-	vkey = key;
-	LAssert(flags == 0); // Or impl if you pass something in.
+	c16 = vkey = Vkey;
+	Flags = flags;
+	Data = 0;
+	IsChar = false;
 }
 
 bool LKey::IsContextMenu() const
 {
 	return !IsChar && vkey == LK_CONTEXTKEY;
 }
 
 //////////////////////////////////////////////////////////////////////////////////
 LString LMouse::ToString() const
 {
 	LString s;
 	s.Printf("LMouse(pos=%i,%i view=%p/%s btns=%i/%i/%i/%i/%i dwn=%i dbl=%i "
 			"ctrl=%i alt=%i sh=%i sys=%i)",
 		x, y, // pos
 		Target, Target?Target->GetClass():NULL, // view
 		Left(), Middle(), Right(), Button1(), Button2(), // btns
 		Down(), Double(), // dwn
 		Ctrl(), Alt(), Shift(), System()); // mod keys
 	return s;
 }
 	
 bool LMouse::IsContextMenu() const
 {
 	if (Right())
 		return true;
 	
 	#if defined(MAC)
 	if (Left() && Ctrl())
 		return true;
 	#endif
 	
 	return false;
 }
 
 bool LMouse::ToScreen()
 {
 	if (ViewCoords)
 	{
 		if (!Target)
 		{
 			printf("%s:%i - ToScreen Error: Target=%p ViewCoords=%i\n",
 				_FL,
 				Target,
 				ViewCoords);
 			return false;
 		}
 		
 		LPoint p(x, y);
 		Target->PointToScreen(p);
 		x = p.x; y = p.y;
 		ViewCoords = false;
 	}
 	
 	return true;
 }
 
 bool LMouse::ToView()
 {
 	if (!ViewCoords)
 	{
 		if (!Target)
 		{
 			printf("%s:%i - ToView Error: Target=%p ViewCoords=%i\n",
 				_FL,
 				Target,
 				ViewCoords);
 			return false;
 		}
 		
 		LPoint p(x, y);
 		Target->PointToView(p);
 		x = p.x; y = p.y;
 		ViewCoords = true;
 	}
 	
 	return true;
 }
 
 #if WINNATIVE
 
 	#if !defined(DM_POSITION)
 		#define DM_POSITION         0x00000020L
 	#endif
 
 	typedef WINUSERAPI BOOL (WINAPI *pEnumDisplayDevicesA)(PVOID, DWORD, PDISPLAY_DEVICEA, DWORD);
 	typedef WINUSERAPI BOOL (WINAPI *pEnumDisplayDevicesW)(PVOID, DWORD, PDISPLAY_DEVICEW, DWORD);
 	typedef WINUSERAPI BOOL (WINAPI *pEnumDisplaySettingsA)(LPCSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEA lpDevMode);
 	typedef WINUSERAPI BOOL (WINAPI *pEnumDisplaySettingsW)(LPCWSTR lpszDeviceName, DWORD iModeNum, LPDEVMODEW lpDevMode);
 
 #endif
 
 LPointF GDisplayInfo::Scale()
 {
 	LPointF p((double)Dpi.x / 96.0, (double)Dpi.y / 96.0);
 	return p;
 }
 
 bool LGetDisplays(::LArray<GDisplayInfo*> &Displays, LRect *AllDisplays)
 {
 	#if WINNATIVE
 	
 		if (AllDisplays)
 			AllDisplays->ZOff(-1, -1);
 
 		LLibrary User32("User32");
 		DISPLAY_DEVICEW disp;
 		ZeroObj(disp);
 		disp.cb = sizeof(disp);
 		pEnumDisplayDevicesW EnumDisplayDevicesW = (pEnumDisplayDevicesW) User32.GetAddress("EnumDisplayDevicesW");
 		pEnumDisplaySettingsW EnumDisplaySettingsW = (pEnumDisplaySettingsW) User32.GetAddress("EnumDisplaySettingsW");
 
 		for (int i=0;
 			EnumDisplayDevicesW(0, i, &disp, 0);
 			i++)
 		{
 			DEVMODEW mode;
 			ZeroObj(mode);
 			mode.dmSize = sizeof(mode);
 			mode.dmDriverExtra = sizeof(mode);
 
 			if (EnumDisplaySettingsW(disp.DeviceName, ENUM_CURRENT_SETTINGS, &mode))
 			{
 				GDisplayInfo *Dsp = new GDisplayInfo;
 				if (Dsp)
 				{
 					Dsp->r.ZOff(mode.dmPelsWidth-1, mode.dmPelsHeight-1);
 
 					if (mode.dmFields & DM_POSITION)
 					{
 						Dsp->r.Offset(mode.dmPosition.x, mode.dmPosition.y);
 					}
 					if (AllDisplays)
 					{
 						if (AllDisplays->Valid())
 							AllDisplays->Union(&Dsp->r);
 						else
 							*AllDisplays = Dsp->r;
 					}
 
 					disp.cb = sizeof(disp);
 
 					Dsp->BitDepth = mode.dmBitsPerPel;
 					Dsp->Refresh = mode.dmDisplayFrequency;
 					Dsp->Name = disp.DeviceString;
 					Dsp->Device = disp.DeviceName;
 					Dsp->Dpi.x = Dsp->Dpi.y = mode.dmLogPixels;
 
 					DISPLAY_DEVICEW temp = disp;
 					if (EnumDisplayDevicesW(temp.DeviceName, 0, &disp, 0))
 						Dsp->Monitor = disp.DeviceString;
 
 					Displays.Add(Dsp);
 				}
 			}
 
 			disp.cb = sizeof(disp);
 		}
 
 	#elif defined __GTK_H__
 
 		Gtk::GdkDisplay *Dsp = Gtk::gdk_display_get_default();
 	
 		#if GtkVer(3, 22)
 			int monitors = Gtk::gdk_display_get_n_monitors(Dsp);
 			for (int i=0; i<monitors; i++)
 			{
 				Gtk::GdkMonitor *m = Gtk::gdk_display_get_monitor(Dsp, i);
 				if (!m)
 					continue;
 
 				GDisplayInfo *di = new GDisplayInfo;
 				if (!di)
 					continue;
 
 				Gtk::GdkRectangle geometry;
 				gdk_monitor_get_geometry (m, &geometry);
 				di->r = geometry;
 				di->Device = Gtk::gdk_monitor_get_manufacturer(m);
 				di->Name = Gtk::gdk_monitor_get_model(m);
 				di->Refresh = Gtk::gdk_monitor_get_refresh_rate(m);
 
 				Displays.Add(di);
 			}
 	
 		#endif
 
 	#elif LGI_COCOA
 	
 		for (NSScreen *s in [NSScreen screens])
 		{
 			GDisplayInfo *di = new GDisplayInfo;
 			di->r = s.frame;
 			Displays.Add(di);
 		}
 
 	#endif
 
 	return Displays.Length() > 0;
 }
 
 void GetChildrenList(LViewI *w, List<LViewI> &l)
 {
 	if (!w)
 		return;
 
 	for (auto v: w->IterateViews())
 	{
 		#if WINNATIVE
 		int Style = GetWindowLong(v->Handle(), GWL_STYLE);
 		if (TestFlag(Style, WS_VISIBLE) &&
 			!TestFlag(Style, WS_DISABLED))
 		{
 			if (TestFlag(Style, WS_TABSTOP))
 			{
 				l.Insert(v);
 			}
 
 			GetChildrenList(v, l);
 		}
 		#else
 		if (v->Visible() && v->Enabled())
 		{
 			if (v->GetTabStop())
 			{
 				l.Insert(v);
 			}
 
 			GetChildrenList(v, l);
 		}
 		#endif
 	}
 }
 
 
 LViewI *GetNextTabStop(LViewI *v, bool Back)
 {
 	if (v)
 	{
 		LWindow *Wnd = v->GetWindow();
 		if (Wnd)
 		{
 			List<LViewI> All;
 			GetChildrenList(Wnd, All);
 
 			ssize_t MyIndex = All.IndexOf(v);
 			if (MyIndex >= 0)
 			{
 				int Inc = Back ? -1 : 1;
 				size_t NewIndex = (MyIndex + All.Length() + Inc) % All.Length();
 				return All.ItemAt(NewIndex);
 			}
 			else
 			{
 				return All[0];
 			}
 		}
 	}
 
 	return 0;
 }
 
 
 
diff --git a/src/common/Lgi/LgiCommon.cpp b/src/common/Lgi/LgiCommon.cpp
--- a/src/common/Lgi/LgiCommon.cpp
+++ b/src/common/Lgi/LgiCommon.cpp
@@ -1,2831 +1,2832 @@
 //
 //	Cross platform LGI functions
 //
 #if LGI_COCOA
 #import <Foundation/Foundation.h>
 #endif
 
 #define _WIN32_WINNT 0x501
 
 #include <time.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <fcntl.h>
 
 #ifdef WINDOWS
 	#include <winsock2.h>
 	#include "lgi/common/RegKey.h"
 	#include <sys/types.h>
 	#include <sys/stat.h>
 #else
 	#include <unistd.h>
 	#define _getcwd getcwd
 #endif
 
 #include "lgi/common/Lgi.h"
 #include "lgi/common/Capabilities.h"
 
 #if defined(LINUX) && !defined(LGI_SDL)
 	#include "LgiWinManGlue.h"
 #elif defined(WINDOWS)
 	#include "lgi/common/RegKey.h"
 #endif
 
 #if defined POSIX
 	#include <sys/time.h>
 	#include <sys/types.h>
 	#include <pwd.h>
 	#include <sys/utsname.h>
 	#include "lgi/common/SubProcess.h"
 #endif
 
 #ifdef HAIKU
 	#include <FindDirectory.h>
 	#include <fs_info.h>
 #else
 	#include "SymLookup.h"
 #endif
 #include "lgi/common/Library.h"
 #include "lgi/common/Net.h"
 
 #if defined(__GTK_H__)
 namespace Gtk {
 	#include "LgiWidget.h"
 }
 #endif
 
 //////////////////////////////////////////////////////////////////////////
 // Misc stuff
 #if LGI_COCOA || defined(__GTK_H__)
 	LString LgiArgsAppPath;
 #endif
 #if defined MAC
 	#import <foundation/foundation.h>
+	#include "lgi/common/Uri.h"
 	#if defined LGI_CARBON
 		bool _get_path_FSRef(FSRef &fs, LStringPipe &a)
 		{
 			HFSUniStr255 Name;
 			ZeroObj(Name);
 			FSRef Parent;
 			FSCatalogInfo Cat;
 			ZeroObj(Cat);
 			OSErr e = FSGetCatalogInfo(&fs,
 										kFSCatInfoVolume|kFSCatInfoNodeID,
 										&Cat,
 										&Name,
 										NULL,
 										&Parent);
 			if (!e)
 			{
 				if (_get_path_FSRef(Parent, a))
 				{
 					LAutoString u((char*)LNewConvertCp("utf-8", Name.unicode, "utf-16", Name.length * sizeof(Name.unicode[0]) ));
 
 					// printf("CatInfo = '%s' %x %x\n", u.Get(), Cat.nodeID, Cat.volume);
 					if (u && Cat.nodeID > 2)
 					{
 						a.Print("%s%s", DIR_STR, u.Get());
 					}
 				}
 				
 				return true;
 			}
 
 			return false;
 		}
 
 		LAutoString FSRefPath(FSRef &fs)
 		{
 			LStringPipe a;
 			if (_get_path_FSRef(fs, a))
 			{
 				return LAutoString(a.NewStr());
 			}
 			
 			return LAutoString();
 		}
 	#endif
 #endif
 
 bool LPostEvent(OsView Wnd, int Event, LMessage::Param a, LMessage::Param b)
 {
 	#if LGI_SDL
 
 		SDL_Event e;
 
 		e.type = SDL_USEREVENT;
 		e.user.code = Event;
 		e.user.data1 = Wnd;
 		e.user.data2 = a || b ? new LMessage::EventParams(a, b) : NULL;
 
 		/*
 		printf("LPostEvent Wnd=%p, Event=%i, a/b: %i/%i\n",
 			Wnd, Event, (int)a, (int)b);
 		*/
 
 		return SDL_PushEvent(&e) == 0;
 
 	#elif WINNATIVE
 
 		return PostMessage(Wnd, Event, a, b) != 0;
 
 	#elif defined(__GTK_H__)
 
 		LAssert(Wnd);
 		LViewI *View = (LViewI*) g_object_get_data(GtkCast(Wnd, g_object, GObject), "LViewI");
 		if (View)
 		{
 			LMessage m(0);
 			m.Set(Event, a, b);
 			return m.Send(View);
 		}
 		else printf("%s:%i - Error: LPostEvent can't cast OsView to LViewI\n", _FL);
 
 	#elif defined(MAC) && !LGI_COCOA
 	
 		#if 0
 		int64 Now = LCurrentTime();
 		static int64 Last = 0;
 		static int Count = 0;
 	
 		Count++;
 		if (Now > Last + 1000)
 		{
 			printf("Sent %i events in the last %ims\n", Count, (int)(Now-Last));
 			Last = Now;
 			Count = 0;
 		}
 		#endif
 	
 		EventRef Ev;
 		OSStatus e = CreateEvent(NULL,
 								kEventClassUser,
 								kEventUser,
 								0, // EventTime
 								kEventAttributeNone,
 								&Ev);
 		if (e)
 		{
 			printf("%s:%i - CreateEvent failed with %i\n", _FL, (int)e);
 		}
 		else
 		{
 			EventTargetRef t = GetControlEventTarget(Wnd);
 			
 			e = SetEventParameter(Ev, kEventParamLgiEvent, typeUInt32, sizeof(Event), &Event);
 			if (e) printf("%s:%i - error %i\n", _FL, (int)e);
 			e = SetEventParameter(Ev, kEventParamLgiA, typeUInt32, sizeof(a), &a);
 			if (e) printf("%s:%i - error %i\n", _FL, (int)e);
 			e = SetEventParameter(Ev, kEventParamLgiB, typeUInt32, sizeof(b), &b);
 			if (e) printf("%s:%i - error %i\n", _FL, (int)e);
 			
 			bool Status = false;
 			EventQueueRef q = GetMainEventQueue();
 
 			e = SetEventParameter(Ev, kEventParamPostTarget, typeEventTargetRef, sizeof(t), &t);
 			if (e) printf("%s:%i - error %i\n", _FL, (int)e);
 			e = PostEventToQueue(q, Ev, kEventPriorityStandard);
 			if (e) printf("%s:%i - error %i\n", _FL, (int)e);
 			else Status = true;
 			
 			// printf("PostEventToQueue %i,%i,%i -> %p\n", Event, a, b, q);
 			
 			ReleaseEvent(Ev);
 			
 			return Status;
 		}
 	
 	#else
 	
 		LAssert(!"Not impl.");
 	
 	#endif
 
 	return false;
 }
 
 void LExitApp()
 {
 	exit(0);
 }
 
 //////////////////////////////////////////////////////////////////////////
 #ifdef WIN32
 bool RegisterActiveXControl(char *Dll)
 {
 	LLibrary Lib(Dll);
 	if (Lib.IsLoaded())
 	{
 		#ifdef _MSC_VER
 		typedef HRESULT (STDAPICALLTYPE *p_DllRegisterServer)(void);
 
 		p_DllRegisterServer DllRegisterServer = (p_DllRegisterServer)Lib.GetAddress("DllRegisterServer");
 		if (DllRegisterServer)
 		{
 			return DllRegisterServer() == S_OK;
 		}
 		#else
 		LAssert(!"Not impl.");
 		#endif
 	}
 
 	return false;
 }
 #endif
 
 //////////////////////////////////////////////////////////////////////////
 #ifdef WINDOWS
 #include <lm.h>
 #pragma comment(lib, "netapi32.lib")
 #endif
 
 /// \brief Returns the operating system that Lgi is running on.
 /// \sa Returns one of the defines starting with LGI_OS_UNKNOWN in LgiDefs.h
 int LGetOs
 (
 	/// Returns the version of the OS or NULL if you don't care
 	LArray<int> *Ver
 )
 {
 	#if defined(WIN32) || defined(WIN64)
 
 		static int Os = LGI_OS_UNKNOWN;
 		static int Version = 0, Revision = 0;
 
 		if (Os == LGI_OS_UNKNOWN)
 		{
 			#if defined(WIN64)
 			BOOL IsWow64 = TRUE;
 			#elif defined(WIN32)
 			BOOL IsWow64 = FALSE;
 			IsWow64Process(GetCurrentProcess(), &IsWow64);
 			#endif
 
 			SERVER_INFO_101 *v = NULL;
 			auto r = NetServerGetInfo(NULL, 101, (LPBYTE*)&v);
 			if (r == NERR_Success)
 			{
 				Version = v->sv101_version_major;
 				Revision = v->sv101_version_minor;
 				Os = (v->sv101_version_major >= 6)
 					?
 					#ifdef WIN32
 					(IsWow64 ? LGI_OS_WIN64 : LGI_OS_WIN32)
 					#else
 					LGI_OS_WIN64
 					#endif
 					:
 					LGI_OS_WIN9X;
 
 				NetApiBufferFree(v);
 			}
 			else LAssert(0);
 		}
 
 		if (Ver)
 		{
 			Ver->Add(Version);
 			Ver->Add(Revision);
 		}
 
 		return Os;
 
 	#elif defined LINUX
 
 		if (Ver)
 		{
 			utsname Buf;
 			if (!uname(&Buf))
 			{
 				auto t = LString(Buf.release).SplitDelimit(".");
 				for (int i=0; i<t.Length(); i++)
 				{
 					Ver->Add(atoi(t[i]));
 				}
 			}
 		}
 
 		return LGI_OS_LINUX;
 
 	#elif defined MAC
 
 		#if !defined(__GTK_H__)
 		if (Ver)
 		{
 			NSOperatingSystemVersion v = [[NSProcessInfo processInfo] operatingSystemVersion];
 			Ver->Add((int)v.majorVersion);
 			Ver->Add((int)v.minorVersion);
 			Ver->Add((int)v.patchVersion);
 		}
 		#endif
 		
 		return LGI_OS_MAC_OS_X;
 
 	#elif defined HAIKU
 	
 		return LGI_OS_HAIKU;
 
 	#else
 
 		#error "Impl Me"
 		return LGI_OS_UNKNOWN;
 
 	#endif
 }
 
 const char *LGetOsName()
 {
 	const char *Str[LGI_OS_MAX] =
 	{
 		"Unknown",
 		"Win9x",
 		"Win32",
 		"Win64",
 		"Haiku",
 		"Linux",
 		"MacOSX",
 	};
 
 	auto Os = LGetOs();
 	if (Os > 0 && Os < CountOf(Str))
 		return Str[Os];
 		
 	LAssert(!"Invalid OS index.");
 	return "error";
 }
 
 #ifdef WIN32
 #define RecursiveFileSearch_Wildcard "*.*"
 #else // unix'ish OS
 #define RecursiveFileSearch_Wildcard "*"
 #endif
 
 bool LRecursiveFileSearch(const char *Root,
 							LArray<const char*> *Ext,
 							LArray<char*> *Files,
 							uint64 *Size,
 							uint64 *Count,
 							std::function<bool(const char *Path, class LDirectory *Dir)> Callback,
 							LCancel *Cancel)
 {
 	// validate args
 	if (!Root) return false;
 
 	// get directory enumerator
 	LDirectory Dir;
 	bool Status = true;
 
 	// enumerate the directory contents
 	for (auto Found = Dir.First(Root); Found && (!Cancel || !Cancel->IsCancelled()); Found = Dir.Next())
 	{
 		char Name[300];
 		if (!Dir.Path(Name, sizeof(Name)))
 			continue;
 
 		if (Callback && !Callback(Name, &Dir))
 			continue;
 
 		if (Dir.IsDir())
 		{
 			// dir
 			LRecursiveFileSearch(	Name,
 									Ext,
 									Files,
 									Size,
 									Count,
 									Callback,
 									Cancel);
 
 		}
 		else
 		{
 			// process file
 			bool Match = true; // if no Ext's then default to match
 			if (Ext)
 			{
 				for (int i=0; i<Ext->Length(); i++)
 				{
 					const char *e = (*Ext)[i];
 					char *RawFile = strrchr(Name, DIR_CHAR);
 					if (RawFile &&
 						(Match = MatchStr(e, RawFile+1)))
 					{
 						break;
 					}
 				}
 			}
 
 			if (Match)
 			{
 				// file matched... process:
 				if (Files)
 					Files->Add(NewStr(Name));
 
 				if (Size)
 					*Size += Dir.GetSize();
 
 				if (Count)
 					(*Count)++;
 
 				Status = true;
 			}
 		}
 	}
 
 	return Status;
 }
 
 #define LGI_TRACE_TO_FILE
 // #include <malloc.h>
 
 #ifndef WIN32
 #define _vsnprintf vsnprintf
 #endif
 
 static LStreamI *_LgiTraceStream = NULL;
 
 void LgiTraceSetStream(LStreamI *stream)
 {
 	_LgiTraceStream = stream;
 }
 
 LString LgiTraceGetFilePath()
 {
 	auto Exe = LGetExeFile();
 	if (!Exe)
 		// Well what to do now? I give up
 		return LString("trace.txt");
 
 	LString LogPath;
 	#ifdef MAC
 	auto Dir = strrchr(Exe, DIR_CHAR);
 	if (Dir)
 	{
 		char path[MAX_PATH_LEN];
 		LMakePath(path, sizeof(path), "~/Library/Logs", Dir+1);
 		LogPath.Printf("%s.txt", path);
 	}
 	else
 	#endif
 	{
 		auto Dot = strrchr(Exe, '.');
 		if (Dot && !strchr(Dot, DIR_CHAR))
 			LogPath.Printf("%.*s.txt", (int)(Dot - Exe.Get()), Exe.Get());
 		else
 			LogPath.Printf("%s.txt", Exe.Get());
 	}
 
 	LFile f;		
 	if (f.Open(LogPath, O_WRITE))
 	{
 		f.Close();
 	}
 	else if (auto Dir = strrchr(LogPath, DIR_CHAR))
 	{
 		LString Leaf = Dir + 1;
 		LFile::Path p(LSP_APP_ROOT);
 		if (!p.Exists())
 			FileDev->CreateFolder(p);
 		p += Leaf;
 		LogPath = p.GetFull();
 	}
 	else
 	{
 		return LString("trace.txt");
 	}	
 		
 	return LogPath;
 }
 
 void LgiTrace(const char *Msg, ...)
 {
 	#if defined _INC_MALLOC && WINNATIVE
 		if (_heapchk() != _HEAPOK)
 			return;
 	#endif
 
 	if (!Msg)
 		return;
 
 	#ifdef WIN32
 		static LMutex Sem("LgiTrace");
 		Sem.Lock(_FL, true);
 	#endif
 
 	char Buffer[2049] = "";
 	#ifdef LGI_TRACE_TO_FILE
 		static LFile f;
 		static char LogPath[MAX_PATH_LEN] = "";
 	
 		if (!_LgiTraceStream && LogPath[0] == 0)
 		{
 			auto p = LgiTraceGetFilePath();
 			if (p)
 				strcpy_s(LogPath, sizeof(LogPath), p);
 		}
 	#endif
 
 	va_list Arg;
 	va_start(Arg, Msg);
 	#ifdef LGI_TRACE_TO_FILE
 		int Ch =
 	#endif
 	vsnprintf(Buffer, sizeof(Buffer)-1, Msg, Arg);
 	va_end(Arg);
 
 	#ifdef LGI_TRACE_TO_FILE
 		LStreamI *Output = NULL;
 		if (_LgiTraceStream)
 			Output = _LgiTraceStream;
 		else
 		{
 			if (!f.IsOpen() &&
 				f.Open(LogPath, O_WRITE))
 				f.Seek(0, SEEK_END);
 			Output = &f;
 		}
 
 		if (Output && Ch > 0)
 		{
 			Output->ChangeThread();
 			Output->Write(Buffer, Ch);
 		}
 
 		if (!_LgiTraceStream)
 		{
 			#ifdef WINDOWS
 				// Windows can take AGES to close a file when there is anti-virus on, like 100ms.
 				// We can't afford to wait here so just keep the file open but flush the
 				// buffers if we can.
 				FlushFileBuffers(f.Handle());
 			#else
 				f.Close();
 			#endif
 		}
 	#endif
 
 
 	#if defined WIN32
 		OutputDebugStringA(Buffer);
 		Sem.Unlock();
 	#else
 		printf("%s", Buffer);
 	#endif
 }
 
 #ifndef LGI_STATIC
 #define STACK_SIZE 12
 
 void LStackTrace(const char *Msg, ...)
 {
 	#ifndef HAIKU
 	LSymLookup::Addr Stack[STACK_SIZE];
 	ZeroObj(Stack);
 	LSymLookup *Lu = LAppInst ? LAppInst->GetSymLookup() : NULL;
 	if (!Lu)
 	{
 		printf("%s:%i - Failed to get sym lookup object.\n", _FL);
 		return;
 	}
 	
 	int Frames = Lu ? Lu->BackTrace(0, 0, Stack, STACK_SIZE) : 0;
 	if (Msg)
 	{
 		#ifdef LGI_TRACE_TO_FILE
 			static LFile f;
 			static char LogPath[MAX_PATH_LEN] = "";
 		
 			if (!_LgiTraceStream)
 			{
 			 	if (LogPath[0] == 0)
 				{
 					auto p = LgiTraceGetFilePath();
 					if (p)
 						strcpy_s(LogPath, sizeof(LogPath), p);
 				}
 				if (LogPath[0])
 					f.Open(LogPath, O_WRITE);
 			}
 		#endif
 
 		va_list Arg;
 		va_start(Arg, Msg);
 		char Buffer[2049] = "";
 		int Len = vsnprintf(Buffer, sizeof(Buffer)-1, Msg, Arg);
 		va_end(Arg);
 
 		Lu->Lookup(Buffer+Len, sizeof(Buffer)-Len-1, Stack, Frames);
 
 		#ifdef LGI_TRACE_TO_FILE
 			if (f.IsOpen())
 			{
 				f.Seek(0, SEEK_END);
 				f.Write(Buffer, (int)strlen(Buffer));
 				f.Close();
 			}
 		#endif
 
 		#if defined WIN32
 		OutputDebugStringA(Buffer);
 		#else
 		printf("Trace: %s", Buffer);
 		#endif
 	}
 	#endif
 }
 #endif
 
 bool LTrimDir(char *Path)
 {
 	if (!Path)
 		return false;
 
 	char *p = strrchr(Path, DIR_CHAR);
 	if (!p)
 		return false;
 	if (p[1] == 0) // Trailing DIR_CHAR doesn't count... do it again.
 	{
 		*p = 0;
 		p = strrchr(Path, DIR_CHAR);
 		if (!p)
 			return false;
 	}
 
 	*p = 0;
 	return true;
 }
 
 LString LMakeRelativePath(const char *Base, const char *Path)
 {
 	LStringPipe Status;
 
 	if (Base && Path)
 	{
 		#ifdef WIN32
 		bool SameNs = strnicmp(Base, Path, 3) == 0;
 		#else
 		bool SameNs = true;
 		#endif
 		if (SameNs)
 		{
 			auto b = LString(Base + 1).SplitDelimit(":\\/");
 			auto p = LString(Path + 1).SplitDelimit(":\\/");
 			int Same = 0;
 			while (Same < b.Length() && Same < p.Length() && stricmp(b[Same], p[Same]) == 0)
 			{
 				Same++;
 			}
 
 			for (int i = Same; i<b.Length(); i++)
 			{
 				Status.Print("..%s", DIR_STR);
 			}
 			if (Same >= b.Length())
 			{
 				Status.Print(".%s", DIR_STR);
 			}
 
 			for (int n = Same; n<p.Length(); n++)
 			{
 				if (n > Same)
 				{
 					Status.Push(DIR_STR);
 				}
 				Status.Push(p[n]);
 			}
 		}
 	}
 
 	return Status.NewLStr();
 }
 
 bool LIsRelativePath(const char *Path)
 {
 	if (!Path)
 		return false;
 
 	if (*Path == '.')
 		return true;
 
 	#ifdef WIN32
 	if (IsAlpha(Path[0]) && Path[1] == ':') // Drive letter path
 		return false;
 	#endif
 
 	if (*Path == DIR_CHAR)
 		return false;
 
 	if (strstr(Path, "://")) // Protocol def
 		return false;
 
 	return true; // Correct or not???
 }
 
 bool LMakePath(char *Str, int StrSize, const char *Path, const char *File)
 {
 	if (!Str || StrSize <= 0 || !Path || !File)
 	{
 		printf("%s:%i - Invalid LMakePath(%p,%i,%s,%s) param\n", _FL, Str, StrSize, Path, File);
 		return false;
 	}
 
 	if (StrSize <= 4)
 	{
 		printf("%s:%i - LgiMakeFile buf size=%i?\n", _FL, StrSize);
 	}
 
 	if (Str && Path && File)
 	{
 		char Dir[] = { '/', '\\', 0 };
 
 		if (Path[0] == '~')
 		{
 			auto Parts = LString(Path).SplitDelimit(Dir, 2);
 			char *s = Str, *e = Str + StrSize;
 			for (auto p: Parts)
 			{
 				if (p.Equals("~"))
 				{
 					LGetSystemPath(LSP_HOME, s, e - s);
 					s += strlen(s);
 				}
 				else
 					s += sprintf_s(s, e - s, "%s%s", DIR_STR, p.Get());
 			}
 		}
 		else if (Str != Path)
 		{
 			strcpy_s(Str, StrSize, Path);
 		}
 
 		#define EndStr() Str[strlen(Str)-1]
 		#define EndDir() if (!strchr(Dir, EndStr())) strcat(Str, DIR_STR);
 
 		size_t Len = strlen(Str);
 		char *End = Str + (Len ? Len - 1 : 0);
 		if (strchr(Dir, *End) && End > Str)
 		{
 			*End = 0;
 		}
 
 		auto T = LString(File).SplitDelimit(Dir);
 		for (int i=0; i<T.Length(); i++)
 		{
 			if (!stricmp(T[i], "."))
 				;
 			else if (!stricmp(T[i], ".."))
 				LTrimDir(Str);
 			else if (!stricmp(T[i], "~"))
 				LGetSystemPath(LSP_HOME, Str, StrSize);
 			else
 			{
 				size_t Len = strlen(Str);
 				if (!strchr(Dir, Str[Len-1]))
 				{
 					if (Len >= StrSize - 1)
 						return false;
 					Str[Len++] = DIR_CHAR;
 					Str[Len] = 0;
 				}
 				size_t SegLen = strlen(T[i]);
 				if (Len + SegLen + 1 > StrSize)
 				{
 					return false;
 				}				
 				strcpy_s(Str + Len, StrSize - Len, T[i]);
 			}
 		}
 	}
 	
 	return true;
 }
 
 bool LgiGetTempPath(char *Dst, int DstSize)
 {
 	return LGetSystemPath(LSP_TEMP, Dst, DstSize);
 }
 
 bool LGetSystemPath(LSystemPath Which, char *Dst, ssize_t DstSize)
 {
 	if (!Dst || DstSize <= 0)
 		return false;
 
 	LFile::Path p;
 	LString s = p.GetSystem(Which, 0);
 	if (!s)
 		return false;
 
 	strcpy_s(Dst, DstSize, s);
 	return true;
 }
 
 LString LGetSystemPath(LSystemPath Which, int WordSize)
 {
 	LFile::Path p;
 	return p.GetSystem(Which, WordSize);
 }
 
 LFile::Path::State LFile::Path::Exists()
 {
 	if (Length() == 0)
 		return TypeNone;
 
 	#ifdef WINDOWS
 	struct _stat64 s;
 	int r = _stat64(GetFull(), &s);
 	if (r)
 		return TypeNone;
 	
 	if (s.st_mode & _S_IFDIR)
 		return TypeFolder;
 
 	if (s.st_mode & _S_IFREG)
 		return TypeFile;
 	#else
 	struct stat s;
 	int r = stat(GetFull(), &s);
 	if (r)
 		return TypeNone;
 	
 	if (S_ISDIR(s.st_mode))
 		return TypeFolder;
 
 	if (S_ISREG(s.st_mode))
 		return TypeFile;
 	#endif
 		
 	return TypeNone;
 }
 
 LString LFile::Path::PrintAll()
 {
 	LStringPipe p;
 	
 	#define _(name) \
 		p.Print(#name ": '%s'\n", GetSystem(name).Get());
 
 	_(LSP_OS)
 	_(LSP_OS_LIB)
 	_(LSP_TEMP)
 	_(LSP_COMMON_APP_DATA)
 	_(LSP_USER_APP_DATA)
 	_(LSP_LOCAL_APP_DATA)
 	_(LSP_DESKTOP)
 	_(LSP_HOME)
 	_(LSP_USER_APPS)
 	_(LSP_EXE)
 	_(LSP_TRASH)
 	_(LSP_APP_INSTALL)
 	_(LSP_APP_ROOT)
 	_(LSP_USER_DOCUMENTS)
 	_(LSP_USER_MUSIC)
 	_(LSP_USER_VIDEO)
 	_(LSP_USER_DOWNLOADS)
 	_(LSP_USER_LINKS)
 	_(LSP_USER_PICTURES)
 	
 	#undef _
 
 	#if LGI_COCOA
 
 		int Domains[] = {NSUserDomainMask, NSSystemDomainMask};
 		const char *DomainName[] = {"User", "System"};
 		for (int i=0; i<CountOf(Domains); i++)
 		{
 			#define _(name) \
 			{ \
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( name, Domains[i], YES); \
 				if (paths) \
 				{ \
 					if ([paths count] > 0) \
 					{ \
 						LString s = [paths objectAtIndex:0]; \
 						p.Print("%s." #name ": '%s'\n", DomainName[i], s.Get()); \
 					} \
 					else p.Print("%s." #name ": null\n", DomainName[i]); \
 				} \
 			}
 
 			_(NSApplicationDirectory)
 			_(NSDemoApplicationDirectory)
 			_(NSDeveloperApplicationDirectory)
 			_(NSAdminApplicationDirectory)
 			_(NSLibraryDirectory)
 			_(NSDeveloperDirectory)
 			_(NSUserDirectory)
 			_(NSDocumentationDirectory)
 			_(NSDocumentDirectory)
 			_(NSCoreServiceDirectory)
 			_(NSAutosavedInformationDirectory)
 			_(NSDesktopDirectory)
 			_(NSCachesDirectory)
 			_(NSApplicationSupportDirectory)
 			_(NSDownloadsDirectory)
 			_(NSInputMethodsDirectory)
 			_(NSMoviesDirectory)
 			_(NSMusicDirectory)
 			_(NSPicturesDirectory)
 			_(NSPrinterDescriptionDirectory)
 			_(NSSharedPublicDirectory)
 			_(NSPreferencePanesDirectory)
 			_(NSApplicationScriptsDirectory)
 			_(NSItemReplacementDirectory)
 			_(NSAllApplicationsDirectory)
 			_(NSAllLibrariesDirectory)
 			_(NSTrashDirectory)
 
 			#undef _
 		}
 
 	#endif
 
 	return p.NewLStr();
 }
 
 LString LFile::Path::GetSystem(LSystemPath Which, int WordSize)
 {
 	LString Path;
 
 	#if defined(WIN32)
 		#ifndef CSIDL_PROFILE
 			#define CSIDL_PROFILE						0x0028
 		#endif 
 		#if !defined(CSIDL_MYDOCUMENTS)
 			#define CSIDL_MYDOCUMENTS					0x0005
 		#endif
 		#if !defined(CSIDL_MYMUSIC)
 			#define CSIDL_MYMUSIC						0x000d
 		#endif
 		#if !defined(CSIDL_MYVIDEO)
 			#define CSIDL_MYVIDEO						0x000e
 		#endif
 		#if !defined(CSIDL_LOCAL_APPDATA)
 			#define CSIDL_LOCAL_APPDATA					0x001c
 		#endif
 		#if !defined(CSIDL_COMMON_APPDATA)
 			#define CSIDL_COMMON_APPDATA				0x0023
 		#endif
 		#if !defined(CSIDL_APPDATA)
 			#define CSIDL_APPDATA						0x001a
 		#endif
 	#endif
 
 	/*
 	#if defined(LINUX) && !defined(LGI_SDL)
 	// Ask our window manager add-on if it knows the path
 	LLibrary *WmLib = LAppInst ? LAppInst->GetWindowManagerLib() : NULL;
 	if (WmLib)
 	{
 		Proc_LgiWmGetPath WmGetPath = (Proc_LgiWmGetPath) WmLib->GetAddress("LgiWmGetPath");
 		char Buf[MAX_PATH_LEN];
 		if (WmGetPath && WmGetPath(Which, Buf, sizeof(Buf)))
 		{
 			Path = Buf;
 			return Path;
 		}
 	}
 	#endif
 	*/
 
 	switch (Which)
 	{
 		default:
 			break;
 		case LSP_USER_DOWNLOADS:
 		{
 			#if defined(__GTK_H__)
 			
 				auto p = Gtk::g_get_user_special_dir(Gtk::G_USER_DIRECTORY_DOWNLOAD);
 				Path = p;
 			
 			#elif defined(WIN32) && defined(_MSC_VER)
 
 				// OMG!!!! Really?
 			
 				#ifndef REFKNOWNFOLDERID
 				typedef GUID KNOWNFOLDERID;
 				#define REFKNOWNFOLDERID const KNOWNFOLDERID &
 				GUID FOLDERID_Downloads = {0x374DE290,0x123F,0x4565,{0x91,0x64,0x39,0xC4,0x92,0x5E,0x46,0x7B}};
 				#endif
 			
 				LLibrary Shell("Shell32.dll");
 				typedef HRESULT (STDAPICALLTYPE *pSHGetKnownFolderPath)(REFKNOWNFOLDERID rfid, DWORD dwFlags, HANDLE hToken, PWSTR *ppszPath);
 				pSHGetKnownFolderPath SHGetKnownFolderPath = (pSHGetKnownFolderPath)Shell.GetAddress("SHGetKnownFolderPath");
 				if (SHGetKnownFolderPath)
 				{
 					PWSTR ptr = NULL;
 					HRESULT r = SHGetKnownFolderPath(FOLDERID_Downloads, 0, NULL, &ptr);
 					if (SUCCEEDED(r))
 					{
 						LAutoString u8(WideToUtf8(ptr));
 						if (u8)
 							Path = u8;
 						CoTaskMemFree(ptr);
 					}
 				}
 
 				if (!Path.Get())
 				{
 					LRegKey k(false, "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders");
 					char *p = k.GetStr("{374DE290-123F-4565-9164-39C4925E467B}");
 					if (LDirExists(p))
 						Path = p;
 				}
 			
 				if (!Path.Get())
 				{
 					LString MyDoc = WinGetSpecialFolderPath(CSIDL_MYDOCUMENTS);
 					if (MyDoc)
 					{
 						char Buf[MAX_PATH_LEN];
 						LMakePath(Buf, sizeof(Buf), MyDoc, "Downloads");
 						if (LDirExists(Buf))
 							Path = Buf;
 					}
 				}
 
 				if (!Path.Get())
 				{
 					LString Profile = WinGetSpecialFolderPath(CSIDL_PROFILE);
 					if (Profile)
 					{
 						char Buf[MAX_PATH_LEN];
 						LMakePath(Buf, sizeof(Buf), Profile, "Downloads");
 						if (LDirExists(Buf))
 							Path = Buf;
 					}
 				}
 
 			#elif LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDownloadsDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					if ([paths count])
 						Path = [paths objectAtIndex:0];
 				}
 				
 			#elif defined(HAIKU)
 			
 				
 
 			#else
 
 				LAssert(!"Not implemented");
 
 			#endif
 			break;
 		}
 		case LSP_USER_LINKS:
 		{
 			LString Home = LGetSystemPath(LSP_HOME);
 			
 			#if defined(WIN32)
 
 				char p[MAX_PATH_LEN];
 				if (LMakePath(p, sizeof(p), Home, "Links"))
 					Path = p;
 
 			#elif defined(LINUX)
 
 				char p[MAX_PATH_LEN];
 				if (LMakePath(p, sizeof(p), Home, ".config/gtk-3.0"))
 					Path = p;
 			
 			#endif
 			break;
 		}
 		case LSP_USER_PICTURES:
 		{
 			#if defined(__GTK_H__)
 			
 				auto p = Gtk::g_get_user_special_dir(Gtk::G_USER_DIRECTORY_DOCUMENTS);
 				Path = p;
 			
 			#elif defined(WIN32)
 	
 				Path = WinGetSpecialFolderPath(CSIDL_MYPICTURES);
 				if (Path)
 					return Path;
 	
 			#elif defined LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSPicturesDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					if ([paths count])
 						Path = [paths objectAtIndex:0];
 				}
 
 			#endif
 
 			// Default to ~/Pictures
 			char hm[MAX_PATH_LEN];
 			LString Home = LGetSystemPath(LSP_HOME);
 			if (LMakePath(hm, sizeof(hm), Home, "Pictures"))
 				Path = hm;
 			break;
 		}
 		case LSP_USER_DOCUMENTS:
 		{
 			char path[MAX_PATH_LEN];
 			
 			#if defined(__GTK_H__)
 			
 				auto p = Gtk::g_get_user_special_dir(Gtk::G_USER_DIRECTORY_DOCUMENTS);
 				if (p)
 					Path = p;
 			
 			#elif defined(WIN32) && defined(_MSC_VER)
 			
 				Path = WinGetSpecialFolderPath(CSIDL_MYDOCUMENTS);
 			
 			#elif defined LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDocumentDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					if ([paths count])
 						Path = [paths objectAtIndex:0];
 				}
 				
 			#elif defined(HAIKU)
 			
 				if(	find_directory
 					(
 						B_SYSTEM_DOCUMENTATION_DIRECTORY,
 						dev_for_path("/boot"),
 						true,
 						path, sizeof(path)
 					) == B_OK)
 					Path = path;
 
 			#endif
 
 			if (!Path)
 			{
 				// Default to ~/Documents
 				if (LMakePath(path, sizeof(path), LGetSystemPath(LSP_HOME), "Documents"))
 					Path = path;
 			}
 			break;
 		}
 		case LSP_USER_MUSIC:
 		{
 			char path[MAX_PATH_LEN];
 
 			#if defined WIN32
 
 				Path = WinGetSpecialFolderPath(CSIDL_MYMUSIC);
 			
 			#elif defined(__GTK_H__)
 			
 				auto p = Gtk::g_get_user_special_dir(Gtk::G_USER_DIRECTORY_MUSIC);
 				if (p)
 					Path = p;
 			
 			#elif defined LGI_CARBON
 			
 				FSRef Ref;
 				OSErr e = FSFindFolder(kUserDomain, kMusicDocumentsFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", _FL, e);
 				else
 				{
 					LAutoString a = FSRefPath(Ref);
 					if (a)
 						Path = a.Get();
 				}
 
 			#elif LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSMusicDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					if ([paths count])
 						Path = [paths objectAtIndex:0];
 				}
 
 			#elif defined(HAIKU)
 			
 				if(	find_directory
 					(
 						B_USER_SOUNDS_DIRECTORY,
 						dev_for_path("/boot"),
 						true,
 						path, sizeof(path)
 					) == B_OK)
 					Path = path;
 
 			#endif
 			
 			if (!Path)
 			{
 				// Default to ~/Music
 				if (LMakePath(path, sizeof(path), LGetSystemPath(LSP_HOME), "Music"))
 					Path = path;
 			}
 			break;
 		}
 		case LSP_USER_VIDEO:
 		{
 			char path[MAX_PATH_LEN];
 
 			#if defined WIN32
 
 				Path = WinGetSpecialFolderPath(CSIDL_MYVIDEO);
 
 			#elif defined(__GTK_H__)
 			
 				auto p = Gtk::g_get_user_special_dir(Gtk::G_USER_DIRECTORY_VIDEOS);
 				if (p)
 					Path = p;
 			
 			#elif defined LGI_CARBON
 
 				FSRef Ref;
 				OSErr e = FSFindFolder(kUserDomain, kMovieDocumentsFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", _FL, e);
 				else
 				{
 					LAutoString a = FSRefPath(Ref);
 					if (a)
 						Path = a.Get();
 				}
 
 			#elif LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSMoviesDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					if ([paths count])
 						Path = [paths objectAtIndex:0];
 				}
 
 			#endif
 			
 			if (!Path)
 			{
 				// Default to ~/Video
 				if (LMakePath(path, sizeof(path), LGetSystemPath(LSP_HOME), "Video"))
 					Path = path;
 			}
 			break;
 		}
 		case LSP_USER_APPS:
 		{
 			#if defined WIN32
 
 				int Id =
 					#ifdef WIN64
 					CSIDL_PROGRAM_FILES
 					#else
 					CSIDL_PROGRAM_FILESX86
 					#endif
 					;
 
 				if (WordSize == 32)
 					Id = CSIDL_PROGRAM_FILESX86;
 				else if (WordSize == 64)
 					Id = CSIDL_PROGRAM_FILES;
 
 				Path = WinGetSpecialFolderPath(Id);
 
 			#elif defined(HAIKU)
 
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_USER_APPS_DIRECTORY, dev_for_path("/boot"), true, path, sizeof(path)) == B_OK)
 					Path = path;
 			
 			#elif LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSApplicationDirectory, NSSystemDomainMask, YES);
 				if (paths)
 				{
 					if ([paths count])
 						Path = [paths objectAtIndex:0];
 				}
 
 			#elif defined MAC
 
 				Path = "/Applications";
 
 			#elif defined LINUX
 
 				Path = "/usr/bin";
 
 			#else
 
 				LAssert(!"Impl me.");
 
 			#endif
 			break;
 		}
 		case LSP_APP_INSTALL:
 		{
 			Path = LGetSystemPath(LSP_EXE);
 			if (Path)
 			{
 				size_t Last = Path.RFind(DIR_STR);
 				if (Last > 0)
 				{
 					LString s = Path(Last, -1);
 					if
 					(
 						stristr(s,
 								#ifdef _DEBUG
 								"Debug"
 								#else
 								"Release"
 								#endif
 								)
 					)
 						Path = Path(0, Last);
 				}					
 			}
 			break;
 		}
 		case LSP_APP_ROOT:
 		{
 			#ifndef LGI_STATIC
 			const char *Name = NULL;
 			
 			// Try and get the configured app name:
 			if (LAppInst)
 				Name = LAppInst->LBase::Name();
 			
 			if (!Name)
 			{
 				// Use the exe name?
 				LString Exe = LGetExeFile();
 				char *l = LGetLeaf(Exe);
 				if (l)
 				{
 					#ifdef WIN32
 					char *d = strrchr(l, '.');
 					*d = NULL;
 					#endif
 					Name = l;
 					// printf("%s:%i - name '%s'\n", _FL, Name);
 				}
 			}
 			
 			if (!Name)
 			{
 				LAssert(0);
 				break;
 			}
 
 			#if defined MAC
 
 				#if LGI_COCOA
 			
 					NSArray *paths = NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES);
 					if (paths)
 						Path = [[paths objectAtIndex:0] UTF8String];
 			
 				#elif LGI_CARBON
 			
 					FSRef Ref;
 					OSErr e = FSFindFolder(kUserDomain, kDomainLibraryFolderType, kDontCreateFolder, &Ref);
 					if (e)
 					{
 						printf("%s:%i - FSFindFolder failed e=%i\n", _FL, e);
 						LAssert(0);
 					}
 					else
 					{
 						LAutoString Base = FSRefPath(Ref);
 						Path = Base.Get();
 					}
 			
 				#else
 
 					struct passwd *pw = getpwuid(getuid());
 					if (!pw)
 						return false;
 					Path.Printf("%s/Library", pw->pw_dir);
 			
 				#endif
 
 			#elif defined WIN32
 
 				Path = WinGetSpecialFolderPath(CSIDL_APPDATA);
 
 			#elif defined LINUX
 
 				char Dot[128];
 				snprintf(Dot, sizeof(Dot), ".%s", Name);
 				Name = Dot;
 				struct passwd *pw = getpwuid(getuid());
 				if (pw)
 					Path = pw->pw_dir;
 				else
 					LAssert(0);
 
 			#elif defined(HAIKU)
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_USER_DIRECTORY , volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 
 			#else
 
 				LAssert(0);
 
 			#endif
 
 			if (Path)
 			{
 				Path += DIR_STR;
 				Path += Name;
 			}
 			#endif
 			break;
 		}
 		case LSP_OS:
 		{
 			#if defined WIN32
 
 				char16 p[MAX_PATH_LEN];
 				if (GetWindowsDirectoryW(p, CountOf(p)) > 0)
 					Path = p;
 
 			#elif defined(HAIKU)
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_SYSTEM_DIRECTORY, volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 			
 			#elif defined LGI_CARBON
 			
 				FSRef Ref;
 				OSErr e = FSFindFolder(kOnAppropriateDisk,  kSystemFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", __FILE__, __LINE__, e);
 				else
 				{
 					LAutoString u = FSRefPath(Ref);
 					if (u)
 						Path = u.Get();
 				}
 
 			#elif defined LGI_COCOA
 			
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSLibraryDirectory, NSSystemDomainMask, YES);
 				if (paths)
 				{
 					Path = [paths objectAtIndex:0];
 					LTrimDir(Path);
 				}
 
 			#elif defined LINUX
 
 				Path = "/boot"; // it'll do for now...
 
 			#endif
 			break;
 		}
 		case LSP_OS_LIB:
 		{
 			#if defined WIN32
 
 				char16 p[MAX_PATH_LEN];
 				if (GetSystemDirectoryW(p, CountOf(p)) > 0)
 					Path = p;
 			
 			#elif defined(HAIKU)
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_SYSTEM_LIB_DIRECTORY, volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 			
 			#elif defined MAC
 			
 				Path = "/Library";
 
 			#elif defined LINUX
 
 				Path = "/lib"; // it'll do for now...
 
 			#endif
 			break;
 		}
 		case LSP_TEMP:
 		{
 			#if defined WIN32
 
 				char16 t[MAX_PATH_LEN];
 				if (GetTempPathW(CountOf(t), t) > 0)
 				{
 					LAutoString utf(WideToUtf8(t));
 					if (utf)
 						Path = utf;
 				}
 
 			#elif defined LGI_CARBON
 			
 				FSRef Ref;
 				OSErr e = FSFindFolder(kUserDomain, kTemporaryFolderType, kCreateFolder, &Ref);
 				if (e) LgiTrace("%s:%i - FSFindFolder failed e=%i\n", _FL, e);
 				else
 				{
 					LAutoString u = FSRefPath(Ref);
 					if (u)
 					{
 						Path = u.Get();
 					}
 					else LgiTrace("%s:%i - FSRefPath failed.\n", _FL);
 				}
 			
 			#elif defined LGI_COCOA
 			
 				NSString *tempDir = NSTemporaryDirectory();
 				if (tempDir)
 					Path = tempDir;
 				else
 					LAssert(!"No tmp folder?");
 			
 			#elif defined LINUX
 
 				Path = "/tmp"; // it'll do for now...
 			
 			#else
 			
 				LAssert(!"Impl me.");
 
 			#endif
 			break;
 		}
 		case LSP_COMMON_APP_DATA:
 		{
 			#if defined WIN32
 
 				Path = WinGetSpecialFolderPath(CSIDL_COMMON_APPDATA);
 			
 			#elif defined LGI_CARBON
 			
 				FSRef Ref;
 				OSErr e = FSFindFolder(kOnSystemDisk, kDomainLibraryFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", _FL, e);
 				else
 				{
 					auto u = FSRefPath(Ref);
 					if (u)
 						Path = u.Get();
 				}
 			
 			#elif defined LGI_COCOA
 			
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSLibraryDirectory, NSSystemDomainMask, YES);
 				if (paths)
 				{
 					Path = [paths objectAtIndex:0];
 				}
 
 			#elif defined LINUX
 
 				Path = "/usr";
 			
 			#else
 			
 				LAssert(!"Impl me.");
 
 			#endif
 			break;
 		}
 		case LSP_USER_APP_DATA:
 		{
 			#if defined WIN32
 			
 				Path = WinGetSpecialFolderPath(CSIDL_APPDATA);
 
 			#elif defined LGI_CARBON
 			
 				FSRef Ref;
 				OSErr e = FSFindFolder(kUserDomain, kDomainLibraryFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", __FILE__, __LINE__, e);
 				else
 				{
 					auto u = FSRefPath(Ref);
 					if (u)
 						Path = u.Get();
 				}
 			
 			#elif defined LGI_COCOA
 			
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSLibraryDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					Path = [paths objectAtIndex:0];
 				}
 			
 			#elif defined LINUX
 
 				Path = "/usr";
 
 			#elif defined HAIKU
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_USER_SETTINGS_DIRECTORY, volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 
 			#else
 			
 				LAssert(!"Impl me.");
 
 			#endif
 			break;
 		}
 		case LSP_LOCAL_APP_DATA:
 		{
 			#if defined WIN32
 			
 				Path = WinGetSpecialFolderPath(CSIDL_LOCAL_APPDATA);
 			
 			#elif defined LGI_COCOA
 			
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSLibraryDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					Path = [paths objectAtIndex:0];
 				}
 			
 			#else
 			
 				LAssert(!"Impl me.");
 			
 			#endif
 			break;
 		}
 		case LSP_DESKTOP:
 		{
 			#if defined(WINDOWS) && defined(_MSC_VER)
 
 				Path = WinGetSpecialFolderPath(CSIDL_DESKTOPDIRECTORY);
 			
 			#elif defined(HAIKU)
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_DESKTOP_DIRECTORY, volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 			
 			#elif defined(__GTK_H__)
 			
 				auto p = Gtk::g_get_user_special_dir(Gtk::G_USER_DIRECTORY_DESKTOP);
 				Path = p;
 			
 			#elif defined LGI_COCOA
 			
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSDesktopDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					Path = [paths objectAtIndex:0];
 				}
 			
 			#elif defined LGI_CARBON
 
 				FSRef Ref;
 				OSErr e = FSFindFolder(kOnAppropriateDisk, kDesktopFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", __FILE__, __LINE__, e);
 				else
 				{
 					LAutoString u = FSRefPath(Ref);
 					if (u)
 						Path = u.Get();
 				}
 
 			#elif defined POSIX
 
 				struct passwd *pw = getpwuid(getuid());
 				if (pw)
 				{
 					#ifdef LINUX
 					WindowManager wm = LGetWindowManager();
 					if (wm == WM_Gnome)
 					{
 						Path.Printf("%s/.gnome-desktop", pw->pw_dir);
 					}
 					#endif
 
 					if (!LDirExists(Path))
 					{
 						Path.Printf("%s/Desktop", pw->pw_dir);
 					}
 				}
 			
 			#else
 
 				#error "Impl me."
 
 			#endif
 			break;
 		}
 		case LSP_HOME:
 		{
 			#if defined WIN32
 
 				Path = WinGetSpecialFolderPath(CSIDL_PROFILE);
 			
 			#elif defined(HAIKU)
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_USER_DIRECTORY, volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 			
 			#elif defined LGI_COCOA
 			
 				NSString *home = NSHomeDirectory();
 				if (home)
 					Path = home;
 				else
 					LAssert(!"No home path?");
 
 			#elif defined POSIX
 
 				struct passwd *pw = getpwuid(getuid());
 				if (pw)
 					Path = pw->pw_dir;
 			
 			#else
 			
 				#error "Impl me."
 			
 			#endif
 			break;
 		}
 		case LSP_EXE:
 		{
 			Path = LGetExeFile();
 			if (!Path)
 				break;
 			auto p = Path.RFind(DIR_STR);
 			if (p > 0)
 				Path.Length(p);
 			break;
 		}
 		case LSP_TRASH:
 		{
 			#if defined LINUX
 			
 				switch (LGetWindowManager())
 				{
 					case WM_Kde:
 					{
 						static char KdeTrash[256] = "";
 						
 						if (!ValidStr(KdeTrash))
 						{
 							// Ask KDE where the current trash is...
 							LStringPipe o;
 							LSubProcess p("kde-config", "--userpath trash");
 							if (p.Start())
 							{
 								p.Communicate(&o);
 								char *s = o.NewStr();
 								if (s)
 								{
 									// Store it..
 									strcpy_s(KdeTrash, sizeof(KdeTrash), s);
 									DeleteArray(s);
 
 									// Clear out any crap at the end...
 									char *e = KdeTrash + strlen(KdeTrash) - 1;
 									while (e > KdeTrash && strchr(" \r\n\t/", *e))
 									{
 										*e-- = 0;
 									}
 								}
 								else
 								{
 									printf("%s:%i - No output from 'kde-config'.\n", _FL);
 								}
 							}
 							else
 							{
 								printf("%s:%i - Run 'kde-config' failed.\n", _FL);
 							}
 						}
 
 						if (ValidStr(KdeTrash))
 							Path = KdeTrash;
 						break;
 					}
 					default:
 					{
 						LString Home = LGetSystemPath(LSP_HOME);
 						if (!Home)
 						{
 							LgiTrace("%s:%i - Can't get LSP_HOME.\n", _FL);
 							break;
 						}
 						
 						char p[MAX_PATH_LEN];
 						if (!LMakePath(p, sizeof(p), Home, ".local/share/Trash/files") ||
 							!LDirExists(p))
 						{
 							LgiTrace("%s:%i - '%s' doesn't exist.\n", _FL, p);
 							break;
 						}
 						
 						Path = p;
 						break;
 					}
 				}
 			
 			#elif defined(HAIKU)
 
 				dev_t volume = dev_for_path("/boot");
 				char path[MAX_PATH_LEN] = "";
 				if (find_directory(B_TRASH_DIRECTORY, volume, true, path, sizeof(path)) == B_OK)
 					Path = path;
 			
 			#elif defined LGI_CARBON
 			
 				FSRef Ref;
 				OSErr e = FSFindFolder(kUserDomain, kTrashFolderType, kDontCreateFolder, &Ref);
 				if (e) printf("%s:%i - FSFindFolder failed e=%i\n", _FL, e);
 				else
 				{
 					LAutoString u = FSRefPath(Ref);
 					if (u)
 						Path = u.Get();
 				}
 			
 			#elif defined LGI_COCOA
 
 				NSArray *paths = NSSearchPathForDirectoriesInDomains( NSTrashDirectory, NSUserDomainMask, YES);
 				if (paths)
 				{
 					Path = [paths objectAtIndex:0];
 				}
 
 			#elif defined(WIN32)
 
 				LAssert(0);
 
 			#endif
 			break;
 		}
 	}
 
 	return Path;
 }
 
 LString LGetExeFile()
 {
 	#if defined WIN32
 
 		char16 Exe[MAX_PATH_LEN];
 		if (GetModuleFileNameW(NULL, Exe, CountOf(Exe)) > 0)
 		{
 			LString e = Exe;
 			if (e)
 			{
 				return e;
 			}
 			else
 			{
 				LgiMsg(0, "LgiFromNativeCp returned 0, ANSI CodePage=%i (%s)", "LgiGetExeFile Error", MB_OK, GetACP(), LAnsiToLgiCp());
 				return LString();
 			}
 		}
 
 		LString m;
 		m.Printf("GetModuleFileName failed err: %08.8X", GetLastError());
 		MessageBoxA(0, m, "LgiGetExeFile Error", MB_OK);
 		LExitApp();
 
 	#elif defined HAIKU
 
 		// Copy the string so as to not allow callers to change it
 		return LgiArgsAppPath.Get();
 
 	#elif defined LINUX
 
 		static char ExePathCache[MAX_PATH_LEN] = "";
 		bool Status = false;
 
 		// this is _REALLY_ lame way to do it... but hey there aren't any
 		// other better ways to get the full path of the running executable
 		if (!ExePathCache[0])
 		{
 			// First try the self method
 			int Len = readlink("/proc/self/exe", ExePathCache, sizeof(ExePathCache));
 			Status = LFileExists(ExePathCache);
 			// printf("readlink=%i Status=%i Exe='%s'\n", Len, Status, ExePathCache);
 			if (!Status)
 			{
 				ExePathCache[0] = 0;
 				
 				// Next try the map file method
 				char ProcFile[256];
 				sprintf_s(ProcFile, sizeof(ProcFile), "/proc/%i/maps", getpid());
 				int fd = open(ProcFile, O_RDONLY);
 
 				if (fd >= 0)
 				{
 					int Len = 16 << 10; // is this enough?
 										// no better way of determining the length of proc info?
 					char *Buf = new char[Len+1];
 					if (Buf)
 					{
 						int r = read(fd, Buf, Len);
 						Buf[r] = 0;
 
 						char *s = strchr(Buf, '/');
 						if (s)
 						{
 							char *e = strchr(s, '\n');
 							if (e)
 							{
 								*e = 0;
 								strcpy_s(ExePathCache, sizeof(ExePathCache), s);
 								Status = true;
 							}
 						}
 						
 						DeleteArray(Buf);
 					}
 
 					close(fd);
 				}
 				else
 				{
 					// Non proc system (like cygwin for example)
 					// char Cmd[256];
 					// sprintf_s(Cmd, sizeof(Cmd), "ps | grep \"%i\"", getpid());
 					
 					LStringPipe Ps;
 					LSubProcess p("ps");
 					if (p.Start())
 					{
 						p.Communicate(&Ps);
 						char *PsOutput = Ps.NewStr();
 						if (PsOutput)
 						{
 							auto n = LString(PsOutput).SplitDelimit("\r\n");
 							for (int i=0; !Status && i<n.Length(); i++)
 							{
 								auto t = n[i].SplitDelimit(" \t\r\n");
 								if (t.Length() > 7)
 								{
 									int LinePid = 0;
 									for (int i=0; i<t.Length()-1; i++)
 									{
 										if (IsDigit(t[i][0]))
 										{
 											LinePid = atoi(t[i]);
 											break;
 										}
 									}
 
 									if (LinePid == getpid())
 									{
 										strcpy_s(ExePathCache, sizeof(ExePathCache), t[t.Length()-1]);
 										Status = true;
 									}
 								}
 							}
 							
 							DeleteArray(PsOutput);
 						}					
 					}
 				}
 			}
 		}
 		else Status = true;
 
 		if (Status)
 			return ExePathCache;
 		
 		return LString();
 	
 	#elif defined MAC
 	
 		#if LGI_COCOA || defined __GTK_H__
 
 		char Dest[MAX_PATH_LEN];
 		if (LFileExists(LgiArgsAppPath))
 		{
 			LMakePath(Dest, sizeof(Dest), LgiArgsAppPath, "../../..");
 			return Dest;
 		}
 		else printf("%s:%i - No executable path: %s\n", _FL, LgiArgsAppPath.Get());
 	
 		#else
 	
 		ProcessSerialNumber ps;
 		OSErr e = GetCurrentProcess(&ps);
 		if (!e)
 		{
 			FSRef fs;
 			OSStatus s = GetProcessBundleLocation(&ps, &fs);
 			if (!s)
 			{
 				LAutoString u = FSRefPath(fs);
 				if (!e)
 				{
 					return LString(u);
 				}
 				else printf("%s:%i - FSGetCatalogInfo failed (e=%i).\n", _FL, e);
 			}
 			else printf("%s:%i - GetProcessBundleLocation failed (e=%i).\n", _FL, (int)s);
 		}
 		else printf("%s:%i - GetCurrentProcess failed (e=%i).\n", _FL, e);
 	
 		#endif
 		
 	#endif
 
 	return LString();
 }
 
 LString LGetExePath()
 {
 	return LGetSystemPath(LSP_EXE);
 }
 
 char *LGetExtension(const char *File)
 {
 	if (File)
 	{
 		char *Dot = strrchr((char*)File, '.');
 		if (Dot && !strchr(Dot, DIR_CHAR))
 		{
 			return Dot + 1;
 		}
 	}
 
 	return 0;
 }
 
 #define DEBUG_FIND_FILE		0
 #if DEBUG_FIND_FILE
 #define LOG_DEBUG(...)		LgiTrace(__VA_ARGS__)
 #else
 #define LOG_DEBUG(...)
 #endif
 
 static void _LFindFile(const char *Name, LString *GStr, LAutoString *AStr)
 {
 	LOG_DEBUG("%s:%i - Name='%s'\n", _FL, Name);
 	
 	if (!Name)
 		return;
 
 	#ifndef MAC
 	LString Exe = LGetExePath();
 	#else
 	LString Exe = LGetExeFile();
 	#endif
 
 	LOG_DEBUG("%s:%i - Exe='%s'\n", _FL, Exe.Get());
 
 	char CurWorking[MAX_PATH_LEN];
 	_getcwd(CurWorking, sizeof(CurWorking));
 	const char *PrefPath[] =
 	{
 		".",
 		"..",
 		"Code",
 		"src",
 		#ifdef MAC
 			"./Contents/Resources",
 		#else
 			"./Resources",
 			"./resources",
 			"../Resources",
 			"../resources",
 		#endif
 		"../Code",
 		"../../Resources",
 		"../../resources",
 		#if defined(LINUX)
 			// AppDir support:
 			"../..",
 			"../../usr/share/applications",
 		#elif defined(WIN32)
 			"../Debug",
 			"../Release",
 			"../../Debug",
 			"../../Release",
 		#endif
 		CurWorking,
 		0
 	};
 
 	// Look in prefered paths first...
 	for (const char **Pref = PrefPath; *Pref; Pref++)
 	{
 		char Path[MAX_PATH_LEN];
 		if (LIsRelativePath(*Pref))
 		{
 			LMakePath(Path, sizeof(Path), Exe, *Pref);
 			LMakePath(Path, sizeof(Path), Path, Name);
 		}
 		else
 		{
 			LMakePath(Path, sizeof(Path), *Pref, Name);
 		}
 		size_t PathLen = strlen(Path);
 		LAssert(PathLen < sizeof(Path));
 
 		bool Exists = LFileExists(Path);
 		LOG_DEBUG("\t%s = %i\n", Path, Exists);
 		if (Exists)
 		{
 			if (GStr)
 				*GStr = Path;
 			else if (AStr)
 				AStr->Reset(NewStr(Path));
 			return;
 		}
 
 		#ifdef WIN32
 		if (PathLen < sizeof(Path) - 4)
 		{
 			strcat(Path, ".lnk");
 			if (LResolveShortcut(Path, Path, sizeof(Path)))
 			{
 				if (GStr)
 					*GStr = Path;
 				else if (AStr)
 					AStr->Reset(NewStr(Path));
 				return;
 			}
 		}
 		#endif
 	}
 
 	// General search fall back...
 	LArray<const char*> Ext;
 	LArray<char*> Files;
 	Ext.Add((char*)Name);
 	if (LRecursiveFileSearch(Exe, &Ext, &Files) &&
 		Files.Length())
 	{
 		if (GStr)
 			*GStr = Files[0];
 		else
 		{
 			AStr->Reset(Files[0]);
 			Files.DeleteAt(0);
 		}
 	}
 	Files.DeleteArrays();
 }
 
 LString LFindFile(const char *Name)
 {
 	LString s;
 	_LFindFile(Name, &s, NULL);
 	return s;
 }
 
 #if defined WIN32
 static LARGE_INTEGER Freq = {0};
 static bool CurTimeInit = false;
 #endif
 
 uint64_t LCurrentTime()
 {
 	#if defined WIN32
 
 	if (!CurTimeInit)
 	{
 		CurTimeInit = true;
 		if (!QueryPerformanceFrequency(&Freq))
 			Freq.QuadPart = 0;
 	}
 
 	if (Freq.QuadPart)
 	{
 		// Return performance counter in ms
 		LARGE_INTEGER i;
 		if (QueryPerformanceCounter(&i))
 		{
 			return i.QuadPart * 1000 / Freq.QuadPart;
 		}
 
 		// Now what?? Give up and go back to tick count I guess.
 		Freq.QuadPart = 0;
 	}
 
 	// Fall back for systems without a performance counter.
 	return GetTickCount();
 
 	#elif defined LGI_CARBON
 	
 	UnsignedWide t;
 	Microseconds(&t);
 	uint64 i = ((uint64)t.hi << 32) | t.lo;
 	return i / 1000;
 
 	#else
 
 	timeval tv;
 	gettimeofday(&tv, 0);
 	return (tv.tv_sec * 1000) + (tv.tv_usec / 1000);
 
 	#endif
 }
 
 uint64_t LMicroTime()
 {
 	#if defined WIN32
 
 	if (!CurTimeInit)
 	{
 		CurTimeInit = true;
 		if (!QueryPerformanceFrequency(&Freq))
 			Freq.QuadPart = 0;
 	}
 	if (Freq.QuadPart)
 	{
 		// Return performance counter in ms
 		LARGE_INTEGER i;
 		if (QueryPerformanceCounter(&i))
 		{
 			return i.QuadPart * 1000000 / Freq.QuadPart;
 		}
 	}
 	return 0;
 
 	#elif defined LGI_CARBON
 	
 	UnsignedWide t;
 	Microseconds(&t);
 	return ((uint64)t.hi << 32) | t.lo;
 
 	#else
 
 	timeval tv;
 	gettimeofday(&tv, 0);
 	return (tv.tv_sec * 1000000) + tv.tv_usec;
 
 	#endif
 }
 
 int LIsReleaseBuild()
 {
 	#ifdef _DEBUG
 	return 0;
 	#else
 	return 1;
  	#endif
 }
 
 bool LIsVolumeRoot(const char *Path)
 {
 	if (!Path)
 		return false;
 	
 	#ifdef WIN32
 		if
 		(
 			IsAlpha(Path[0])
 			&&
 			Path[1] == ':'
 			&&
 			(
 				(Path[2] == 0)
 				||
 				(Path[2] == '\\' && Path[3] == 0)
 			)
 		)
 		{
 			return true;
 		}
 	#else
 		auto t = LString(Path).SplitDelimit(DIR_STR);
 		if (t.Length() == 0)
 			return true;
 		#ifdef MAC
 			if (!stricmp(t[0], "Volumes") &&
 				t.Length() == 2)
 				return true;
 		#else
 			if (!stricmp(t[0], "mnt") &&
 				t.Length() == 2)
 				return true;
 		#endif
 	#endif
 	
 	return false;
 }
 
 LString LFormatSize(int64_t Size)
 {
 	char Buf[64];
 	LFormatSize(Buf, sizeof(Buf), Size);
 	return Buf;
 }
 
 void LFormatSize(char *Str, int SLen, int64_t Size)
 {
 	int64_t K = 1024;
 	int64_t M = K * K;
 	int64_t G = K * M;
 	int64_t T = K * G;
 
 	if (Size == 1)
 	{
 		strcpy_s(Str, SLen, "1 byte");
 	}
 	else if (Size < K)
 	{
 		sprintf_s(Str, SLen, "%u bytes", (int)Size);
 	}
 	else if (Size < 10 * K)
 	{
 		double d = (double)Size;
 		sprintf_s(Str, SLen, "%.2f KiB", d / K);
 	}
 	else if (Size < M)
 	{
 		sprintf_s(Str, SLen, "%u KiB", (int) (Size / K));
 	}
 	else if (Size < G)
 	{
 		double d = (double)Size;
 		sprintf_s(Str, SLen, "%.2f MiB", d / M);
 	}
 	else if (Size < T)
 	{
 		double d = (double)Size;
 		sprintf_s(Str, SLen, "%.2f GiB", d / G);
 	}
 	else
 	{
 		double d = (double)Size;
 		sprintf_s(Str, SLen, "%.2f TiB", d / T);
 	}
 }
 
 char *LTokStr(const char *&s)
 {
 	char *Status = 0;
 
 	if (s && *s)
 	{
 		// Skip whitespace
 		static char Delim[] = ", \t\r\n";
 		while (*s && strchr(Delim, *s)) s++;
 		if (*s)
 		{
 			if (strchr("\'\"", *s))
 			{
 				char Delim = *s++;
 				const char *e = strchr(s, Delim);
 				if (!e)
 				{
 					// error, no end delimiter
 					e = s;
 					while (*e) e++;
 				}
 				Status = NewStr(s, e - s);
 				s = *e ? e + 1 : e;
 			}
 			else
 			{
 				const char *e = s;
 				while (*e && !strchr(Delim, *e)) e++;
 				Status = NewStr(s, e - s);
 				s = e;
 			}
 		}		
 	}
 	
 	return Status;
 }
 
 LString LGetEnv(const char *Var)
 {
 #ifdef _MSC_VER
 	char *s = NULL;
 	size_t sz;
 	errno_t err = _dupenv_s(&s, &sz, Var);
 	if (err)
 		return LString();
 
 	LString ret(s);
 	free(s);
 	return ret;
 #else
 	return getenv("PATH");
 #endif
 }
 
 LString::Array LGetPath()
 {
 	LString::Array Paths;
 
 	#ifdef MAC
 		// OMG, WHY?! Seriously?
 		//
 		// The GUI application path is NOT the same as what is configured for the terminal.
 		// At least in 10.12. And I don't know how to make them the same. This works around
 		// that for the time being.
 		
 		#if 1
 		
 		LFile EctPaths("/etc/paths", O_READ);
 		Paths = EctPaths.Read().Split("\n");
 		
 		#else
 		
 		LFile::Path Home(LSP_HOME);
 		Home += ".profile";
 		if (!Home.Exists())
 		{
 			Home--;
 			Home += ".zprofile";
 		}
 		auto Profile = LFile(Home, O_READ).Read().Split("\n");
 		for (auto Ln : Profile)
 		{
 			auto p = Ln.SplitDelimit(" =", 2);
 			if (p.Length() == 3 &&
 				p[0].Equals("export") &&
 				p[1].Equals("PATH"))
 			{
 				Paths = p[2].Strip("\"").SplitDelimit(LGI_PATH_SEPARATOR);
 				Paths.SetFixedLength(false);
 				for (auto &p : Paths)
 				{
 					if (p.Equals("$PATH"))
 					{
 						auto SysPath = LGetEnv("PATH").SplitDelimit(LGI_PATH_SEPARATOR);
 						for (unsigned i=0; i<SysPath.Length(); i++)
 						{
 							if (i) Paths.New() = SysPath[i];
 							else p = SysPath[i];
 						}
 					}
 				}
 				break;
 			}
 		}
 		
 		#endif
 		
 	#else
 		auto Path = LGetEnv("PATH");
 		// printf("Path='%s'\n", Path.Get());
 		Paths = Path.SplitDelimit(LGI_PATH_SEPARATOR);
 	#endif
 
 	return Paths;
 }
 
 //////////////////////////////////////////////////////////////////////////////
 DoEvery::DoEvery(int p) // p = timeout in ms
 {
 	Init(p);
 }
 
 void DoEvery::Init(int p) // p = timeout in ms
 {
 	LastTime = LCurrentTime();
 	if (p > 0)
 	{
 		Period = p;
 	}
 }
 
 bool DoEvery::DoNow()
 {
 	int64 Now = LCurrentTime();
 	if (LastTime + Period < Now)
 	{
 		LastTime = Now;
 		return true;
 	}
 	return false;
 }
 
 //////////////////////////////////////////////////////////////////////
 bool LCapabilityClient::NeedsCapability(const char *Name, const char *Param)
 {
     for (auto t: Targets)
         t->NeedsCapability(Name, Param);
     return Targets.Length() > 0;
 }
 
 LCapabilityClient::~LCapabilityClient()
 {
     for (auto t: Targets)
         t->Clients.Delete(this);
 }
 
 void LCapabilityClient::Register(LCapabilityTarget *t)
 {
     if (t && !Targets.HasItem(t))
     {
         Targets.Add(t);
         t->Clients.Add(this);
     }
 }
 
 LCapabilityTarget::~LCapabilityTarget()
 {
     for (auto c: Clients)
         c->Targets.Delete(this);
 }
 
 /////////////////////////////////////////////////////////////////////
 #define BUF_SIZE (4 << 10)
 #define PROFILE_MICRO	1
 
 LProfile::LProfile(const char *Name, int HideMs)
 {
 	MinMs = HideMs;
 	Used = 0;
 	Buf = NULL;
 	Add(Name);
 }
 
 LProfile::~LProfile()
 {
 	Add("End");
 	
 	uint64 TotalMs = s.Last().Time - s[0].Time;
 	if (MinMs > 0)
 	{
 		if (TotalMs < MinMs
 			#if PROFILE_MICRO
 			* 1000
 			#endif
 			)
 		{
 			return;
 		}
 	}
 	
 	uint64 accum = 0;
 	for (int i=0; i<s.Length()-1; i++)
 	{
 		Sample &a = s[i];
 		Sample &b = s[i+1];
 		
 		auto indent = i ? "    " : "";
 		auto diff = b.Time - a.Time;
 		accum += diff;
 
 		#if PROFILE_MICRO
 		LgiTrace("%s%s = +%.2f = %.2f ms\n", indent, a.Name,
 			(double)diff/1000.0,
 			(double)accum/1000.0);
 		#else
 		LgiTrace("%s%s = +" LPrintfInt64 " = " LPrintfInt64 " ms\n", indent, a.Name,
 			diff,
 			accum);
 		#endif
 	}
 
 	#if PROFILE_MICRO
 	LgiTrace("    Total = %.2f ms\n", (double)TotalMs/1000.0);
 	#else
 	LgiTrace("    Total = " LPrintfInt64 " ms\n", TotalMs);
 	#endif
 
 	DeleteArray(Buf);
 }
 
 void LProfile::HideResultsIfBelow(int Ms)
 {
 	MinMs = Ms;
 }
 
 void LProfile::Add(const char *Name)
 {
 	s.Add(Sample(
 		#if PROFILE_MICRO
 		LMicroTime(),
 		#else
 		LCurrentTime(),
 		#endif
 		Name));
 }
 
 void LProfile::Add(const char *File, int Line)
 {
 	if (!Buf)
 		if (!(Buf = new char[BUF_SIZE]))
 			return;
 	if (Used > BUF_SIZE - 64)
 	{
 		LAssert(0);
 		return;
 	}
 	char *Name = Buf + Used;
 	Used += sprintf_s(Name, BUF_SIZE - Used, "%s:%i", File, Line) + 1;
 	s.Add(Sample(
 		#if PROFILE_MICRO
 		LMicroTime(),
 		#else
 		LCurrentTime(),
 		#endif
 		Name));
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 bool LIsValidEmail(LString Email)
 {
 	// Local part
 	char buf[321];
 	char *o = buf;
 	char *e = Email;
 
 	if (!Email || *e == '.')
 		return false;
 
 	#define OutputChar()	\
 		if (o - buf >= sizeof(buf) - 1)	\
 			return false;	\
 		*o++ = *e++
 
 	// Local part
 	while (*e)
 	{
 		if (strchr("!#$%&\'*+-/=?^_`.{|}~", *e) ||
 			IsAlpha((uchar)*e) ||
 			IsDigit((uchar)*e))
 		{
 			OutputChar();
 		}
 		else if (*e == '\"')
 		{
 			// Quoted string
 			OutputChar();
 
 			bool quote = false;
 			while (*e && !quote)
 			{
 				quote = *e == '\"';
 				OutputChar();
 			}
 		}
 		else if (*e == '\\')
 		{
 			// Quoted character
 			e++;
 			if (*e < ' ' || *e >= 0x7f)
 				return false;
 			OutputChar();
 		}
 		else if (*e == '@')
 		{
 			break;
 		}
 		else
 		{
 			// Illegal character
 			return false;
 		}
 	}
 
 	// Process the '@'
 	if (*e != '@' || o - buf > 64)
 		return false;
 	OutputChar();
 	
 	// Domain part...
 	if (*e == '[')
 	{
 		// IP addr
 		OutputChar();
 
 		// Initial char must by a number
 		if (!IsDigit(*e))
 			return false;
 		
 		// Check the rest...
 		char *Start = e;
 		while (*e)
 		{
 			if (IsDigit(*e) ||
 				*e == '.')
 			{
 				OutputChar();
 			}
 			else
 			{
 				return false;
 			}
 		}
 
 		// Not a valid IP
 		if (e - Start > 15)
 			return false;
 
 		if (*e != ']')
 			return false;
 
 		OutputChar();
 	}
 	else
 	{
 		// Hostname, check initial char
 		if (!IsAlpha(*e) && !IsDigit(*e))
 			return false;
 		
 		// Check the rest.
 		while (*e)
 		{
 			if (IsAlpha(*e) ||
 				IsDigit(*e) ||
 				strchr(".-", *e))
 			{
 				OutputChar();
 			}
 			else
 			{
 				return false;
 			}
 		}
 	}
 
 	// Remove any trailing dot/dash
 	while (strchr(".-", o[-1]))
 		o--;
 
 	// Output
 	*o = 0;
 	LAssert(o - buf <= sizeof(buf));
 	if (strcmp(Email, buf))
 		Email.Set(buf, o - buf);
 	return true;
 }
 
 //////////////////////////////////////////////////////////////////////////
 LString LGetAppForProtocol(const char *Protocol)
 {
 	LString App;
 
 	if (!Protocol)
 		return App;
 
 	#ifdef WINDOWS
 		LRegKey k(false, "HKEY_CLASSES_ROOT\\%s\\shell\\open\\command", Protocol);
 		if (k.IsOk())
 		{
 			const char *p = k.GetStr();
 			if (p)
 			{
 				LAutoString a(LTokStr(p));
 				App = a.Get();
 			}
 		}
 	#elif defined(LINUX)
 		const char *p = NULL;
 		if (stricmp(Protocol, "mailto"))
 			p = "xdg-email";
 		else
 			p = "xdg-open";
 		LString Path = LGetEnv("PATH");
 		LString::Array a = Path.SplitDelimit(LGI_PATH_SEPARATOR);
 		for (auto i : a)
 		{
 			LFile::Path t(i);
 			t += p;
 			if (t.Exists())
 			{
 				App = t.GetFull();
 				break;
 			}
 		}
 	#elif defined(__GTK_H__)
 		LAssert(!"What to do?");
 	#elif defined(MAC)
 		// Get the handler type
 		LString s;
 		s.Printf("%s://domain/path", Protocol);
 		auto str = s.NsStr();
 		auto type = [NSURL URLWithString:str];
 		[str release];
 		auto handlerUrl = [[NSWorkspace sharedWorkspace] URLForApplicationToOpenURL:type];
 		[type release];
 		if (handlerUrl)
 		{
 			// Convert to app path
 			s = [handlerUrl absoluteString];
 			LUri uri(s);
 			if (uri.sProtocol.Equals("file"))
 				App = uri.sPath.RStrip("/");
 			else
 				LgiTrace("%s:%i - Error: unknown protocol '%s'\n", _FL, uri.sProtocol.Get());
 		}
 		[handlerUrl release];
 	#else
 		#warning "Impl me."
 	#endif
 
 	return App;
 }
 
diff --git a/src/mac/cocoa/General.mm b/src/mac/cocoa/General.mm
--- a/src/mac/cocoa/General.mm
+++ b/src/mac/cocoa/General.mm
@@ -1,602 +1,603 @@
 // Mac Implementation of General LGI functions
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
 // #define _POSIX_TIMERS
 #include <time.h>
 
 #include "lgi/common/Lgi.h"
 #include "lgi/common/Process.h"
 #include "lgi/common/TextLabel.h"
 #include "lgi/common/Button.h"
 #include "lgi/common/Net.h"
+#include "lgi/common/Uri.h"
 
 #include <sys/types.h>
 #include <pwd.h>
 #include <uuid/uuid.h>
 
 ////////////////////////////////////////////////////////////////
 // Local helper functions
 CFStringRef Utf8ToCFString(const char *s, ssize_t len = -1)
 {
 	if (s && len < 0)
 		len = strlen(s);
 	return CFStringCreateWithBytes(kCFAllocatorDefault, (const UInt8*)s, len, kCFStringEncodingUTF8, false);
 }
 
 char *CFStringToUtf8(CFStringRef r)
 {
 	if (r == NULL)
 		return 0;
 	
 	char *Buffer = 0;
 	CFRange g = { 0, CFStringGetLength(r) };
 	CFIndex Used;
 	
 	if (CFStringGetBytes(r,
 						 g,
 						 kCFStringEncodingUTF8,
 						 0,
 						 false,
 						 0,
 						 0,
 						 &Used))
 	{
 		if ((Buffer = new char[Used+1]))
 		{
 			CFStringGetBytes(r,
 							 g,
 							 kCFStringEncodingUTF8,
 							 0,
 							 false,
 							 (UInt8*)Buffer,
 							 Used,
 							 &Used);
 			
 			Buffer[Used] = 0;
 		}
 	}
 	
 	return Buffer;
 }
 
 bool _lgi_check_file(char *Path)
 {
 	if (Path)
 	{
 		if (LFileExists(Path))
 		{
 			// file is there
 			return true;
 		}
 		else
 		{
 			// shortcut?
 			char *e = Path + strlen(Path);
 			strcpy(e, ".lnk");
 			if (LFileExists(Path))
 			{
 				// resolve shortcut
 				char Link[256];
 				if (LResolveShortcut(Path, Link, sizeof(Link)))
 				{
 					// check destination of link
 					if (LFileExists(Link))
 					{
 						strcpy(Path, Link);
 						return true;
 					}
 				}
 			}
 			*e = 0;
 		}
 	}
 	
 	return false;
 }
 
 void LSleep(uint32 i)
 {
 	struct timespec request, remain;
 	
 	ZeroObj(request);
 	ZeroObj(remain);
 	
 	request.tv_sec = i / 1000;
 	request.tv_nsec = (i % 1000) * 1000000;
 	
 	while (nanosleep(&request, &remain) == -1)
 	{
 		request = remain;
 	}
 }
 
 char *p2c(unsigned char *s)
 {
 	if (s)
 	{
 		s[1+s[0]] = 0;
 		return (char*)s + 1;
 	}
 	return 0;
 }
 
 void c2p255(Str255 &d, char *s)
 {
 	if (s)
 	{
 		size_t Len = strlen(s);
 		if (Len > 255) Len = 255;
 		d[0] = Len;
 		for (int i=0; i<Len; i++)
 			d[1+i] = s[i];
 	}
 }
 
 void _lgi_assert(bool b, const char *test, const char *file, int line)
 {
 	static bool Asserting = false;
 	
 	if (!b && !Asserting)
 	{
 		Asserting = true;
 		printf("%s:%i - Assert failed:\n%s\n", file, line, test);
 		
 #ifdef _DEBUG
 		
 		LStringPipe p;
 		p.Print("Assert failed, file: %s, line: %i\n%s", file, line, test);
 		int Result = 2;
 		
 #if LGI_COCOA
         if (LAppInst)
         {
             LCocoaAssert *ca = [[LCocoaAssert alloc] init:p.NewLStr()];
             auto hnd = LAppInst->Handle();
             [hnd.p performSelectorOnMainThread:@selector(assert:) withObject:ca waitUntilDone:true];
             switch (ca.result)
             {
                 case NSAlertFirstButtonReturn: // Debug/Break
                     Result = 2;
                     break;
                 case NSAlertSecondButtonReturn: // Ingore/Continue
                     Result = 3;
                     break;
                 case NSAlertThirdButtonReturn: // Exit/Abort
                     Result = 1;
                     break;
             }
             [ca release];
         }
 #else
 		GAlert a(0, "Assert Failed", Assert.Msg, "Abort", "Debug", "Ignore");
 		Result = a.DoModal();
 #endif
 		
 		switch (Result)
 		{
 			default:
 			{
 				exit(-1);
 				break;
 			}
 			case 2:
 			{
 				// Crash here to bring up the debugger...
 				int *p = 0;
 				*p = 0;
 				break;
 			}
 			case 3:
 			{
 				break;
 			}
 		}
 		
 #endif
 		
 		Asserting = false;
 	}
 }
 
 ////////////////////////////////////////////////////////////////////////
 // Implementations
 LMessage CreateMsg(int m, LMessage::Param a, LMessage::Param b)
 {
 	static class LMessage Msg(0);
 	Msg.Set(m, a, b);
 	return Msg;
 }
 
 OsView DefaultOsView(LView *v)
 {
 	return NULL;
 }
 
 LString LGetFileMimeType(const char *File)
 {
 	return LAppInst ? LAppInst->GetFileMimeType(File) : NULL;
 }
 
 bool _GetIniField(char *Grp, char *Field, char *In, char *Out, int OutSize)
 {
 	if (ValidStr(In))
 	{
 		bool InGroup = false;
 		auto t = LString(In).SplitDelimit("\r\n");
 		
 		for (int i=0; i<t.Length(); i++)
 		{
 			char *Line = t[i];
 			if (*Line == '[')
 			{
 				// Reset inside group at the start of each group
 				InGroup = false;
 				
 				char *e = strchr(++Line, ']');
 				if (e)
 				{
 					*e = 0;
 					InGroup = stricmp(Grp, Line) == 0;
 				}
 			}
 			else if (InGroup)
 			{
 				char *e = strchr(Line, '=');
 				if (e)
 				{
 					// Point v to the data after the equals
 					// Leave e pointing to the byte before
 					char *v = e-- + 1;
 					
 					// Seek e through any whitespace between the equals and the
 					// field name
 					while (e > Line && strchr(" \t", *e)) e--;
 					
 					// Seek v through any whitespace after the equals
 					while (*v && strchr(" \t", *v)) v++;
 					
 					// Calculate the length of the field
 					size_t flen = e - Line;
 					
 					// Check the current field against the input field
 					if (strnicmp(Field, Line, flen) == 0)
 					{
 						while (	*v &&
 							   strchr("\r\n", *v) == 0 &&
 							   OutSize > 1) // leave space for NULL
 						{
 							*Out++ = *v++;
 							OutSize--;
 						}
 						
 						// Add the NULL
 						*Out++ = 0;
 						
 						return true;
 					}
 				}
 			}
 		}
 	}
 	
 	return false;
 }
 
 bool LGetAppsForMimeType(const char *Mime, LArray<LAppInfo> &Apps, int Limit)
 {
 	auto mt = Utf8ToCFString(Mime);
 	if (mt)
 	{
 		auto uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, mt, NULL);
 		if (uti)
 		{
 			CFURLRef appUrl = LSCopyDefaultApplicationURLForContentType(uti, kLSRolesAll, nil);
 			if (appUrl)
 			{
 				NSString *path = [(__bridge NSURL *)appUrl path];
 				NSString *name = [[NSFileManager defaultManager] displayNameAtPath:path];
 				if (path && name)
 				{
 					auto &a = Apps.New();
 					a.Path = path;
 					a.Name = name;
 				}
 				
 				CFRelease(appUrl);
 				if (path) [path release];
 				if (name) [name release];
 			}
 			CFRelease(uti);
 		}
 		CFRelease(mt);
 	}
 	
 	return Apps.Length() > 0;
 }
 
 LString LGetAppForMimeType(const char *Mime)
 {
 	LArray<LAppInfo> Apps;
 	if (LGetAppsForMimeType(Mime, Apps, 1))
 		return Apps[0].Path.Get();
 	return LString();
 }
 
 int LgiRand(int Limit)
 {
 	return rand() % Limit;
 }
 
 bool LPlaySound(const char *FileName, int ASync)
 {
 	return LExecute(FileName);
 }
 
 #if LGI_CARBON
 OSErr FinderLaunch(long nTargets, FSRef *targetList)
 {
 	OSErr err = unimpErr;
 	
 	AppleEvent theAEvent, theReply;
 	AEAddressDesc fndrAddress;
 	AEDescList targetListDesc;
 	OSType fndrCreator;
 	AliasHandle targetAlias;
 	long index;
 	
 	/* verify parameters */
 	if ((nTargets == 0) || (targetList == NULL))
 		return paramErr;
 	
 	/* set up locals  */
 	AECreateDesc(typeNull, NULL, 0, &theAEvent);
 	AECreateDesc(typeNull, NULL, 0, &fndrAddress);
 	AECreateDesc(typeNull, NULL, 0, &theReply);
 	AECreateDesc(typeNull, NULL, 0, &targetListDesc);
 	targetAlias = NULL;
 	fndrCreator = 'MACS';
 	
 	/* create an open documents event targeting the finder */
 	err = AECreateDesc(typeApplSignature, (Ptr) &fndrCreator,
 					   sizeof(fndrCreator), &fndrAddress);
 	
 	if (err == noErr)
 	{
 		err = AECreateAppleEvent(kCoreEventClass,
 								 kAEOpenDocuments,
 								 &fndrAddress,
 								 kAutoGenerateReturnID,
 								 kAnyTransactionID,
 								 &theAEvent);
 	}
 	
 	
 	if (err == noErr)
 	{
 		/* create the list of files to open */
 		err = AECreateList(NULL, 0, false, &targetListDesc);
 	}
 	
 	if (err == noErr)
 	{
 		for (index=0; index < nTargets; index++)
 		{
 			if (targetAlias == NULL)
 			{
 				// err = NewAlias(NULL, (targetList + index), &targetAlias);
 				err = FSNewAlias(NULL, (targetList + index), &targetAlias);
 			}
 			else
 			{
 				Boolean Changed;
 				err = FSUpdateAlias(NULL, (targetList + index), targetAlias, &Changed);
 			}
 			
 			if (err == noErr)
 			{
 				HLock((Handle) targetAlias);
 				err = AEPutPtr(	&targetListDesc,
 							   (index + 1),
 							   typeAlias,
 							   *targetAlias,
 							   GetHandleSize((Handle) targetAlias));
 				HUnlock((Handle) targetAlias);
 			}
 		}
 	}
 	
 	/* add the file list to the apple event */
 	if( err == noErr )
 	{
 		err = AEPutParamDesc(&theAEvent, keyDirectObject, &targetListDesc);
 	}
 	
 	if (err == noErr)
 	{
 		/* send the event to the Finder */
 		err = AESend(&theAEvent,
 					 &theReply,
 					 kAENoReply,
 					 kAENormalPriority,
 					 kAEDefaultTimeout,
 					 NULL,
 					 NULL);
 	}
 	
 	/* clean up and leave */
 	if (targetAlias != NULL)
 		DisposeHandle((Handle) targetAlias);
 	AEDisposeDesc(&targetListDesc);
 	AEDisposeDesc(&theAEvent);
 	AEDisposeDesc(&fndrAddress);
 	AEDisposeDesc(&theReply);
 	
 	return err;
 }
 #endif
 
 LString LErrorCodeToString(uint32 ErrorCode)
 {
 	const char *e = strerror(ErrorCode);
 	static char tmp[32];
 	if (!e)
 	{
 		sprintf_s(tmp, sizeof(tmp), "Error(%i)", ErrorCode);
 		e = tmp;
 	}
 	
 	return e;
 }
 
 bool LExecute(const char *File, const char *Args, const char *Dir, LString *ErrorMsg)
 {
 	bool Status = false;
 	
 	if (File)
 	{
 		LUri uri(File);
 		
 		if (uri.sProtocol)
 		{
 			CFStringRef s = CFStringCreateWithBytes(kCFAllocatorDefault, (UInt8*)File, strlen(File), kCFStringEncodingUTF8, false);
 			CFURLRef u = CFURLCreateWithString(NULL, s, NULL);
 			Status = LSOpenCFURLRef(u, 0) == 0;
 			CFRelease(u);
 			CFRelease(s);
 		}
 		else
 		{
 			#if LGI_CARBON
 			FSRef r;
 			OSStatus e = FSPathMakeRef((UInt8*)File, &r, NULL);
 			char Path[MAX_PATH];
 			
 			if (e)
 			{
 				// Check if this is an application
 				snprintf(Path, sizeof(Path), "/Applications/%s", File);
 				e = FSPathMakeRef((UInt8*)Path, &r, NULL);
 				if (!e)
 					File = Path;
 			}
 			
 			if (e) printf("%s:%i - FSPathMakeRef failed with %i\n", _FL, (int)e);
 			else
 			#endif
 			{
 				// Is this an app bundle?
 				bool IsAppBundle = false;
 				auto Last = strrchr(File, '/');
 				if (Last)
 				{
 					auto Dot = strrchr(Last, '.');
 					IsAppBundle = Dot && !stricmp(Dot, ".app");
 					
 					/* Ideally in OSX before 10.6 we'd convert to calling the executable in
 					 the bundle rather the 'open' the app bundle, because open doesn't
 					 support arguments before 10.6
 					 if (ValidStr(Args))
 					 {
 						 GArray<int> Ver;
 						 LgiGetOs(Ver);
 						 if (Ver.Length() > 1)
 						 {
 							 if (Ver[0] < 10 ||
 							 Ver[1] < 6)
 							 {
 								 IsAppBundle = false;
 							 }
 						 }
 					 }
 					 */
 				}
 				
 				struct stat s;
 				int st = stat(File, &s);
 				
 				if (IsAppBundle)
 				{
 					char cmd[512];
 					if (ValidStr((char*)Args))
 						snprintf(cmd, sizeof(cmd), "open -a \"%s\" %s", File, Args);
 					else
 						snprintf(cmd, sizeof(cmd), "open -a \"%s\"", File);
 					system(cmd);
 				}
 				else if (st == 0 &&
 						 S_ISREG(s.st_mode) &&
 						 (s.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
 				{
 					// This is an executable file
 					if (!fork())
 					{
 						if (Dir)
 							chdir(Dir);
 						
 						LArray<const char*> a;
 						a.Add(File);
 						
 						char *p;
 						while ((p = LTokStr(Args)))
 						{
 							a.Add(p);
 						}
 						a.Add(0);
 						
 						char *env[] = {0};
 						execve(File, (char*const*)&a[0], env);
 					}
 					
 					return true;
 				}
 				else
 				{
 					// Document
 					#if LGI_CARBON
 						e = FinderLaunch(1, &r);
 						if (e) printf("%s:%i - FinderLaunch faied with %i\n", _FL, (int)e);
 						else Status = true;
 					#elif LGI_COCOA
 						LString file = File;
 						auto url = [[NSURL alloc] initFileURLWithPath:file.NsStr()];
 						Status = [[NSWorkspace sharedWorkspace] openURL:url];
 					#endif
 				}
 			}
 		}
 	}
 	
 	return Status;
 }
 
 bool LGetMimeTypeExtensions(const char *Mime, LArray<LString> &Ext)
 {
 	size_t Start = Ext.Length();
 	
 #define HardCodeExtention(Mime, Ext1, Ext2) \
 else if (!stricmp(Mime, Mime)) \
 {	if (Ext1) Ext.Add(Ext1); \
 if (Ext2) Ext.Add(Ext2); }
 	
 	if (!Mime);
 	HardCodeExtention("text/calendar", "ics", (const char*)NULL)
 	HardCodeExtention("text/x-vcard", "vcf", (const char*)NULL)
 	HardCodeExtention("text/mbox", "mbx", "mbox");
 	
 	return Ext.Length() > Start;
 }
 
 
 LString LCurrentUserName()
 {
 	struct passwd *pw = getpwuid(geteuid());
 	if (pw)
 		return pw->pw_name;
 	
 	return "";
 }
 
diff --git a/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj b/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj
--- a/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj
+++ b/src/mac/cocoa/LgiCocoa.xcodeproj/project.pbxproj
@@ -1,1196 +1,1192 @@
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
 	classes = {
 	};
 	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		340833152698F8FF0028012F /* FontPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 340833122698F8FE0028012F /* FontPriv.h */; };
 		340833162698F8FF0028012F /* FontType.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340833132698F8FE0028012F /* FontType.cpp */; };
 		340833172698F8FF0028012F /* TypeFace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 340833142698F8FE0028012F /* TypeFace.cpp */; };
 		3409C0CA27580ED60050302A /* ListItemRadioBtn.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0C727580ED60050302A /* ListItemRadioBtn.h */; };
 		3409C0CB27580ED60050302A /* List.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0C827580ED60050302A /* List.h */; };
 		3409C0CC27580ED60050302A /* ListItemCheckBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0C927580ED60050302A /* ListItemCheckBox.h */; };
 		3409C0D0275812CB0050302A /* Profile.h in Headers */ = {isa = PBXBuildFile; fileRef = 3409C0CF275812CB0050302A /* Profile.h */; };
 		34109857217A9805007020CE /* LCocoaView.h in Sources */ = {isa = PBXBuildFile; fileRef = 34109856217A9805007020CE /* LCocoaView.h */; };
 		34114C8B23091E6E00F342B1 /* LgiClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 34114C8A23091E6E00F342B1 /* LgiClasses.h */; };
 		3413170E23068FFE008CE982 /* FileSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3413170D23068FFE008CE982 /* FileSelect.cpp */; };
 		34131710230694D1008CE982 /* Gel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3413170F230694D1008CE982 /* Gel.cpp */; };
 		3415168F26EC32E7007EE35F /* TextView4.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3415168E26EC32E7007EE35F /* TextView4.cpp */; };
 		3415169326EC32FF007EE35F /* TextView3.h in Headers */ = {isa = PBXBuildFile; fileRef = 3415169126EC32FF007EE35F /* TextView3.h */; };
 		3415169426EC32FF007EE35F /* TextView4.h in Headers */ = {isa = PBXBuildFile; fileRef = 3415169226EC32FF007EE35F /* TextView4.h */; };
 		3418EBCF25D9FEA600EA168A /* Progress.h in Headers */ = {isa = PBXBuildFile; fileRef = 3418EBCE25D9FEA600EA168A /* Progress.h */; };
 		3418EBD125D9FEF500EA168A /* ProgressDlg.h in Headers */ = {isa = PBXBuildFile; fileRef = 3418EBD025D9FEF500EA168A /* ProgressDlg.h */; };
 		3427064727A0E20C0043F733 /* CocoaView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3427064627A0E20C0043F733 /* CocoaView.mm */; };
 		343874B5230F46B200CF96B4 /* Window.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B1230F46B200CF96B4 /* Window.h */; };
 		343874B6230F46B200CF96B4 /* View.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B2230F46B200CF96B4 /* View.h */; };
 		343874B7230F46B200CF96B4 /* App.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B3230F46B200CF96B4 /* App.h */; };
 		343874B8230F46B200CF96B4 /* Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 343874B4230F46B200CF96B4 /* Layout.h */; };
 		343BE8C72355D0CE00742E21 /* PopupList.h in Headers */ = {isa = PBXBuildFile; fileRef = 343BE8C62355D0CE00742E21 /* PopupList.h */; };
 		3449B8CE26BBF6B10022A9B8 /* Notifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 3449B8CD26BBF6B10022A9B8 /* Notifications.h */; };
 		344CFBC8237365B800AE6B35 /* ClipBoard.h in Headers */ = {isa = PBXBuildFile; fileRef = 344CFBC7237365B800AE6B35 /* ClipBoard.h */; };
 		345920FF1F25649000098DFD /* Font.h in Headers */ = {isa = PBXBuildFile; fileRef = 345920FC1F25649000098DFD /* Font.h */; };
 		345921001F25649000098DFD /* FontCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 345920FD1F25649000098DFD /* FontCache.h */; };
 		345921011F25649000098DFD /* FontSelect.h in Headers */ = {isa = PBXBuildFile; fileRef = 345920FE1F25649000098DFD /* FontSelect.h */; };
 		345EB84E235C6C01007D05DB /* Popup.h in Headers */ = {isa = PBXBuildFile; fileRef = 345EB84D235C6C01007D05DB /* Popup.h */; };
 		346DDEC1240C882900751380 /* RadioGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 346DDEC0240C882900751380 /* RadioGroup.h */; };
 		346FACE71D3C720B00FFEBCE /* Message.h in Headers */ = {isa = PBXBuildFile; fileRef = 346FACE61D3C720B00FFEBCE /* Message.h */; };
 		346FACEB1D3C75AE00FFEBCE /* Uri.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346FACE91D3C75AE00FFEBCE /* Uri.cpp */; };
 		346FACEC1D3C75AE00FFEBCE /* MDStringToDigest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 346FACEA1D3C75AE00FFEBCE /* MDStringToDigest.cpp */; };
 		3471868823A9AF8900F8C952 /* SubProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3471868723A9AF8900F8C952 /* SubProcess.cpp */; };
 		3477C2751CBF07DD0028B84B /* App.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2741CBF07DD0028B84B /* App.mm */; };
 		3477C2781CBF08050028B84B /* ClipBoard.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2761CBF08050028B84B /* ClipBoard.mm */; };
 		3477C2821CBF086A0028B84B /* General.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27A1CBF086A0028B84B /* General.mm */; };
 		3477C2831CBF086A0028B84B /* Layout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27B1CBF086A0028B84B /* Layout.mm */; };
 		3477C2841CBF086A0028B84B /* Menu.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27C1CBF086A0028B84B /* Menu.mm */; };
 		3477C2851CBF086A0028B84B /* Printer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27D1CBF086A0028B84B /* Printer.mm */; };
 		3477C2861CBF086A0028B84B /* Thread.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27E1CBF086A0028B84B /* Thread.mm */; };
 		3477C2871CBF086A0028B84B /* View.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C27F1CBF086A0028B84B /* View.mm */; };
 		3477C2881CBF086A0028B84B /* Widgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2801CBF086A0028B84B /* Widgets.mm */; };
 		3477C2891CBF086A0028B84B /* Window.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2811CBF086A0028B84B /* Window.mm */; };
 		3477C28F1CBF08C10028B84B /* Gdc2.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28B1CBF08C10028B84B /* Gdc2.mm */; };
 		3477C2901CBF08C10028B84B /* MemDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28C1CBF08C10028B84B /* MemDC.cpp */; };
 		3477C2911CBF08C10028B84B /* PrintDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28D1CBF08C10028B84B /* PrintDC.cpp */; };
 		3477C2921CBF08C10028B84B /* ScreenDC.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C28E1CBF08C10028B84B /* ScreenDC.cpp */; };
 		3477C2971CBF09320028B84B /* File.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2941CBF09320028B84B /* File.mm */; };
 		3477C2981CBF09320028B84B /* Mem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2951CBF09320028B84B /* Mem.mm */; };
 		3477C2991CBF09320028B84B /* ShowFileProp_Mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */; };
 		3477C2A11CBF0A920028B84B /* Mem.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29B1CBF0A920028B84B /* Mem.h */; };
 		3477C2A21CBF0A920028B84B /* SymLookup.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29C1CBF0A920028B84B /* SymLookup.h */; };
 		3477C2A31CBF0A920028B84B /* LgiMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29D1CBF0A920028B84B /* LgiMac.h */; };
 		3477C2A41CBF0A920028B84B /* LgiOs.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29E1CBF0A920028B84B /* LgiOs.h */; };
 		3477C2A51CBF0A920028B84B /* LgiOsClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C29F1CBF0A920028B84B /* LgiOsClasses.h */; };
 		3477C2A61CBF0A920028B84B /* LgiOsDefs.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2A01CBF0A920028B84B /* LgiOsDefs.h */; };
 		3477C2A81CBF0AAF0028B84B /* Lgi.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2A71CBF0AAF0028B84B /* Lgi.h */; };
 		3477C2AA1CBF22A00028B84B /* File.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2A91CBF22A00028B84B /* File.h */; };
 		3477C2AC1CBF72170028B84B /* ViewPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2AB1CBF72170028B84B /* ViewPriv.h */; };
 		3477C2AF1CBF96B90028B84B /* LgiRes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2AE1CBF96B90028B84B /* LgiRes.cpp */; };
 		3477C2B11CBF96C40028B84B /* Res.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B01CBF96C40028B84B /* Res.cpp */; };
 		3477C2B41CBF96F20028B84B /* LMsg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B31CBF96F20028B84B /* LMsg.cpp */; };
 		3477C2B71CBF973F0028B84B /* GuiUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B61CBF973F0028B84B /* GuiUtils.cpp */; };
 		3477C2B91CBF977F0028B84B /* LgiCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2B81CBF977F0028B84B /* LgiCommon.cpp */; };
 		3477C2BB1CBF97C80028B84B /* GdcCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2BA1CBF97C80028B84B /* GdcCommon.cpp */; };
 		3477C2C11CBF9A040028B84B /* String.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C01CBF9A040028B84B /* String.cpp */; };
 		3477C2C81CC046310028B84B /* TextView3.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C41CC046310028B84B /* TextView3.cpp */; };
 		3477C2C91CC046310028B84B /* Unicode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C51CC046310028B84B /* Unicode.cpp */; };
 		3477C2CA1CC046310028B84B /* Utf8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C61CC046310028B84B /* Utf8.cpp */; };
 		3477C2CB1CC046310028B84B /* XmlTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2C71CC046310028B84B /* XmlTree.cpp */; };
 		3477C2CE1CC047BE0028B84B /* Charset.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2CD1CC047BE0028B84B /* Charset.cpp */; };
 		3477C2D01CC047F50028B84B /* ToolBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2CF1CC047F50028B84B /* ToolBar.cpp */; };
 		3477C2D31CC048100028B84B /* Containers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D21CC048100028B84B /* Containers.cpp */; };
 		3477C2D51CC0481B0028B84B /* Array.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C2D41CC0481B0028B84B /* Array.h */; };
 		3477C2D71CC048390028B84B /* Popup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D61CC048390028B84B /* Popup.cpp */; };
 		3477C2DB1CC048F90028B84B /* DisplayString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D81CC048F90028B84B /* DisplayString.cpp */; };
 		3477C2DC1CC048F90028B84B /* Font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2D91CC048F90028B84B /* Font.cpp */; };
 		3477C2DD1CC048F90028B84B /* FontSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2DA1CC048F90028B84B /* FontSystem.cpp */; };
 		3477C2DF1CC04A030028B84B /* ScrollBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2DE1CC04A030028B84B /* ScrollBar.cpp */; };
 		3477C2E11CC04A3C0028B84B /* FontSelect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E01CC04A3C0028B84B /* FontSelect.cpp */; };
 		3477C2E31CC04A5C0028B84B /* Stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E21CC04A5C0028B84B /* Stream.cpp */; };
 		3477C2E51CC04A7F0028B84B /* ViewCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E41CC04A7F0028B84B /* ViewCommon.cpp */; };
 		3477C2E71CC04B1E0028B84B /* Surface.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E61CC04B1E0028B84B /* Surface.cpp */; };
 		3477C2E91CC04B5D0028B84B /* Rand.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2E81CC04B5D0028B84B /* Rand.cpp */; };
 		3477C2EB1CC04B890028B84B /* Filter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2EA1CC04B890028B84B /* Filter.cpp */; };
 		3477C2EF1CC04BBB0028B84B /* ItemContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2EC1CC04BBB0028B84B /* ItemContainer.cpp */; };
 		3477C2F01CC04BBB0028B84B /* List.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2ED1CC04BBB0028B84B /* List.cpp */; };
 		3477C2F11CC04BBB0028B84B /* Tree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2EE1CC04BBB0028B84B /* Tree.cpp */; };
 		3477C2FF1CC04BF00028B84B /* Bitmap.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F21CC04BF00028B84B /* Bitmap.cpp */; };
 		3477C3001CC04BF00028B84B /* Box.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F31CC04BF00028B84B /* Box.cpp */; };
 		3477C3011CC04BF00028B84B /* Button.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F41CC04BF00028B84B /* Button.cpp */; };
 		3477C3021CC04BF00028B84B /* CheckBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F51CC04BF00028B84B /* CheckBox.cpp */; };
 		3477C3031CC04BF00028B84B /* Combo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F61CC04BF00028B84B /* Combo.cpp */; };
 		3477C3041CC04BF00028B84B /* Edit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F71CC04BF00028B84B /* Edit.cpp */; };
 		3477C3051CC04BF00028B84B /* Panel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F81CC04BF00028B84B /* Panel.cpp */; };
 		3477C3061CC04BF00028B84B /* Progress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2F91CC04BF00028B84B /* Progress.cpp */; };
 		3477C3071CC04BF00028B84B /* RadioGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FA1CC04BF00028B84B /* RadioGroup.cpp */; };
 		3477C3081CC04BF00028B84B /* Splitter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FB1CC04BF00028B84B /* Splitter.cpp */; };
 		3477C3091CC04BF00028B84B /* TableLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FC1CC04BF00028B84B /* TableLayout.cpp */; };
 		3477C30A1CC04BF00028B84B /* TabView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FD1CC04BF00028B84B /* TabView.cpp */; };
 		3477C30B1CC04BF00028B84B /* TextLabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C2FE1CC04BF00028B84B /* TextLabel.cpp */; };
 		3477C30D1CC04C560028B84B /* FindReplace.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C30C1CC04C560028B84B /* FindReplace.cpp */; };
 		3477C3101CC04C790028B84B /* Css.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C30E1CC04C790028B84B /* Css.cpp */; };
 		3477C3111CC04C790028B84B /* CssTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C30F1CC04C790028B84B /* CssTools.cpp */; };
 		3477C3131CC04CB10028B84B /* Rect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3121CC04CB10028B84B /* Rect.cpp */; };
 		3477C3161CC04CCB0028B84B /* Library.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3151CC04CCB0028B84B /* Library.cpp */; };
 		3477C3191CC04CF10028B84B /* ThreadCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3181CC04CF10028B84B /* ThreadCommon.cpp */; };
 		3477C31D1CC04D3F0028B84B /* Net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C31B1CC04D3F0028B84B /* Net.cpp */; };
-		3477C31E1CC04D3F0028B84B /* NetTools.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C31C1CC04D3F0028B84B /* NetTools.cpp */; };
 		3477C3201CC04D630028B84B /* ThreadEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C31F1CC04D630028B84B /* ThreadEvent.cpp */; };
 		3477C3221CC04DA00028B84B /* Colour.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3211CC04DA00028B84B /* Colour.cpp */; };
 		3477C3241CC04DD70028B84B /* Object.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3231CC04DD70028B84B /* Object.cpp */; };
 		3477C3261CC04DE20028B84B /* Mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3251CC04DE20028B84B /* Mutex.cpp */; };
 		3477C3281CC04E020028B84B /* Variant.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3271CC04E020028B84B /* Variant.cpp */; };
 		3477C3311CC04E120028B84B /* 8Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3291CC04E120028B84B /* 8Bit.cpp */; };
 		3477C3321CC04E120028B84B /* 64Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32A1CC04E120028B84B /* 64Bit.cpp */; };
 		3477C3331CC04E120028B84B /* 16Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32B1CC04E120028B84B /* 16Bit.cpp */; };
 		3477C3341CC04E120028B84B /* 24Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32C1CC04E120028B84B /* 24Bit.cpp */; };
 		3477C3351CC04E120028B84B /* 32Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32D1CC04E120028B84B /* 32Bit.cpp */; };
 		3477C3361CC04E120028B84B /* 48Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C32E1CC04E120028B84B /* 48Bit.cpp */; };
 		3477C3381CC04E120028B84B /* Alpha.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3301CC04E120028B84B /* Alpha.cpp */; };
 		3477C33A1CC04ED90028B84B /* DragAndDrop.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3391CC04ED90028B84B /* DragAndDrop.mm */; };
 		3477C33D1CC088590028B84B /* FileCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C33C1CC088590028B84B /* FileCommon.cpp */; };
 		3477C33F1CC0A6780028B84B /* Token.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C33E1CC0A6780028B84B /* Token.cpp */; };
 		3477C3411CC0A68E0028B84B /* DateTime.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3401CC0A68E0028B84B /* DateTime.cpp */; };
 		3477C3431CC0A6B90028B84B /* DocView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3421CC0A6B90028B84B /* DocView.cpp */; };
 		3477C3451CC0A9DE0028B84B /* Input.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3441CC0A9DE0028B84B /* Input.cpp */; };
 		3477C3471CC0AA220028B84B /* WindowCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3461CC0AA220028B84B /* WindowCommon.cpp */; };
 		3477C3491CC0AA7E0028B84B /* ProgressDlg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C3481CC0AA7E0028B84B /* ProgressDlg.cpp */; };
 		3477C34B1CC0AB0B0028B84B /* ToolTip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C34A1CC0AB0B0028B84B /* ToolTip.cpp */; };
 		3477C34D1CC0ACED0028B84B /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 3477C34C1CC0ACED0028B84B /* md5.c */; };
 		3477C3501CC0C3D60028B84B /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3477C34F1CC0C3D60028B84B /* Cocoa.framework */; };
 		3477C35B1CC1AEEA0028B84B /* LgiInc.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C35A1CC1AEEA0028B84B /* LgiInc.h */; };
 		3477C35D1CC2253E0028B84B /* LgiInterfaces.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C35C1CC2253E0028B84B /* LgiInterfaces.h */; };
 		3477C43A1CC234750028B84B /* MemStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C4391CC234750028B84B /* MemStream.cpp */; };
 		3477C46D1CC26DEB0028B84B /* Alert.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C46C1CC26DEB0028B84B /* Alert.cpp */; };
 		3477C4ED1CC27F1C0028B84B /* TrayIcon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3477C4EC1CC27F1C0028B84B /* TrayIcon.cpp */; };
 		3477C5171CC303B70028B84B /* LgiUiBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 3477C5161CC303B70028B84B /* LgiUiBase.h */; };
 		347AFB9827A0DC5E00BE4ABE /* 15Bit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 347AFB9727A0DC5E00BE4ABE /* 15Bit.cpp */; };
 		348362421F233A77003B2A6D /* Stream.h in Headers */ = {isa = PBXBuildFile; fileRef = 348362411F233A77003B2A6D /* Stream.h */; };
 		34837C4925C677ED00D103B4 /* AppPriv.h in Headers */ = {isa = PBXBuildFile; fileRef = 34837C4825C677ED00D103B4 /* AppPriv.h */; };
 		348CD46A25C63E56001AA32B /* AppCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 348CD46925C63E56001AA32B /* AppCommon.cpp */; };
 		348E99CE2876850F0067E92A /* ObjCWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 348E99CD2876850F0067E92A /* ObjCWrapper.h */; };
 		3491A28523678DB800604C29 /* DropFiles.h in Headers */ = {isa = PBXBuildFile; fileRef = 3491A28423678DB700604C29 /* DropFiles.h */; };
 		34A3ACE820568D5800B1D62A /* StringLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34A3ACE720568D5800B1D62A /* StringLayout.cpp */; };
 		34A3ACEA20568D9700B1D62A /* MenuCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34A3ACE920568D9700B1D62A /* MenuCommon.cpp */; };
 		34B14E3426951C6E004C22CC /* Slider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B14E3326951C6E004C22CC /* Slider.cpp */; };
 		34B531D822F65734002B50F7 /* Menu.h in Headers */ = {isa = PBXBuildFile; fileRef = 34B531D722F65734002B50F7 /* Menu.h */; };
 		34B6B19123CFD0F100C24906 /* DragAndDropCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34B6B19023CFD0F100C24906 /* DragAndDropCommon.cpp */; };
 		34BF15072871503B001B4CA5 /* DrawListSurface.h in Headers */ = {isa = PBXBuildFile; fileRef = 34BF15062871503B001B4CA5 /* DrawListSurface.h */; };
 		34C072C12369878100E1E222 /* DropFiles.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C072C02369878100E1E222 /* DropFiles.cpp */; };
 		34C81A5A25DA0AA10053F93A /* Base64.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34C81A5925DA0AA10053F93A /* Base64.cpp */; };
 		34CD9F7223D5768B0039F259 /* Unicode.h in Headers */ = {isa = PBXBuildFile; fileRef = 34CD9F7123D5768B0039F259 /* Unicode.h */; };
 		34D1B3C121748A2800BC6B58 /* Path.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 34D1B3C021748A2800BC6B58 /* Path.cpp */; };
 		34D21CEC217981AE003D1EA6 /* EventTargetThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D21CEB217981AE003D1EA6 /* EventTargetThread.h */; };
 		34D28926275B3D9F005961A8 /* DateTime.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D28925275B3D9F005961A8 /* DateTime.h */; };
 		34D28929275B3DB0005961A8 /* Variant.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D28928275B3DB0005961A8 /* Variant.h */; };
 		34D6AA1722D3749A005D739E /* Gdc2.h in Headers */ = {isa = PBXBuildFile; fileRef = 34D6AA1622D3749A005D739E /* Gdc2.h */; };
 		34EE8BB12748A55600F12915 /* TextFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 34EE8BB02748A55600F12915 /* TextFile.h */; };
 		34F3EC4329BD374E00BB9B58 /* Rect.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F3EC4229BD374E00BB9B58 /* Rect.h */; };
 		34F6151F27E55C5D00FE5B0C /* Thread.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F6151D27E55C5D00FE5B0C /* Thread.h */; };
 		34F6152027E55C5D00FE5B0C /* ThreadEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */; };
 		34F6153E27E5628600FE5B0C /* Token.h in Headers */ = {isa = PBXBuildFile; fileRef = 34F6153D27E5628600FE5B0C /* Token.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
 		340833122698F8FE0028012F /* FontPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontPriv.h; path = ../../../private/common/FontPriv.h; sourceTree = SOURCE_ROOT; };
 		340833132698F8FE0028012F /* FontType.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontType.cpp; path = ../../common/Gdc2/Font/FontType.cpp; sourceTree = SOURCE_ROOT; };
 		340833142698F8FE0028012F /* TypeFace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TypeFace.cpp; path = ../../common/Gdc2/Font/TypeFace.cpp; sourceTree = SOURCE_ROOT; };
 		3409C0C727580ED60050302A /* ListItemRadioBtn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ListItemRadioBtn.h; path = ../../../include/lgi/common/ListItemRadioBtn.h; sourceTree = SOURCE_ROOT; };
 		3409C0C827580ED60050302A /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = List.h; path = ../../../include/lgi/common/List.h; sourceTree = SOURCE_ROOT; };
 		3409C0C927580ED60050302A /* ListItemCheckBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ListItemCheckBox.h; path = ../../../include/lgi/common/ListItemCheckBox.h; sourceTree = SOURCE_ROOT; };
 		3409C0CF275812CB0050302A /* Profile.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = Profile.h; path = ../../../include/lgi/common/Profile.h; sourceTree = "<group>"; };
 		34109853217A975E007020CE /* View.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = View.h; path = ../../../include/lgi/common/View.h; sourceTree = SOURCE_ROOT; };
 		34109856217A9805007020CE /* LCocoaView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LCocoaView.h; path = ../../../include/lgi/mac/cocoa/LCocoaView.h; sourceTree = SOURCE_ROOT; };
 		34114C8A23091E6E00F342B1 /* LgiClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiClasses.h; path = ../../../include/lgi/common/LgiClasses.h; sourceTree = "<group>"; };
 		3413170D23068FFE008CE982 /* FileSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileSelect.cpp; path = ../../common/Lgi/FileSelect.cpp; sourceTree = SOURCE_ROOT; };
 		3413170F230694D1008CE982 /* Gel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Gel.cpp; path = ../../common/Skins/Gel/Gel.cpp; sourceTree = SOURCE_ROOT; };
 		3415168E26EC32E7007EE35F /* TextView4.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextView4.cpp; path = ../../common/Text/TextView4.cpp; sourceTree = SOURCE_ROOT; };
 		3415169126EC32FF007EE35F /* TextView3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextView3.h; path = ../../../include/lgi/common/TextView3.h; sourceTree = SOURCE_ROOT; };
 		3415169226EC32FF007EE35F /* TextView4.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextView4.h; path = ../../../include/lgi/common/TextView4.h; sourceTree = SOURCE_ROOT; };
 		3418EBCE25D9FEA600EA168A /* Progress.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Progress.h; path = ../../../include/lgi/common/Progress.h; sourceTree = "<group>"; };
 		3418EBD025D9FEF500EA168A /* ProgressDlg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProgressDlg.h; path = ../../../include/lgi/common/ProgressDlg.h; sourceTree = "<group>"; };
 		3427064627A0E20C0043F733 /* CocoaView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CocoaView.mm; sourceTree = SOURCE_ROOT; };
 		343874B1230F46B200CF96B4 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Window.h; path = ../../../include/lgi/common/Window.h; sourceTree = SOURCE_ROOT; };
 		343874B2230F46B200CF96B4 /* View.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = View.h; path = ../../../include/lgi/common/View.h; sourceTree = "<group>"; };
 		343874B3230F46B200CF96B4 /* App.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = App.h; path = ../../../include/lgi/common/App.h; sourceTree = SOURCE_ROOT; };
 		343874B4230F46B200CF96B4 /* Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Layout.h; path = ../../../include/lgi/common/Layout.h; sourceTree = "<group>"; };
 		343BE8C62355D0CE00742E21 /* PopupList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PopupList.h; path = ../../../include/lgi/common/PopupList.h; sourceTree = "<group>"; };
 		3449B8CD26BBF6B10022A9B8 /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = ../../../include/lgi/common/Notifications.h; sourceTree = "<group>"; };
 		344CFBC7237365B800AE6B35 /* ClipBoard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ClipBoard.h; path = ../../../include/lgi/common/ClipBoard.h; sourceTree = "<group>"; };
 		345920FC1F25649000098DFD /* Font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Font.h; path = ../../../include/lgi/common/Font.h; sourceTree = SOURCE_ROOT; };
 		345920FD1F25649000098DFD /* FontCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontCache.h; path = ../../../include/lgi/common/FontCache.h; sourceTree = SOURCE_ROOT; };
 		345920FE1F25649000098DFD /* FontSelect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FontSelect.h; path = ../../../include/lgi/common/FontSelect.h; sourceTree = SOURCE_ROOT; };
 		345EB84D235C6C01007D05DB /* Popup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Popup.h; path = ../../../include/lgi/common/Popup.h; sourceTree = SOURCE_ROOT; };
 		346DDEC0240C882900751380 /* RadioGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RadioGroup.h; path = ../../../include/lgi/common/RadioGroup.h; sourceTree = SOURCE_ROOT; };
 		346FACE61D3C720B00FFEBCE /* Message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Message.h; path = ../../../include/lgi/common/Message.h; sourceTree = "<group>"; };
 		346FACE91D3C75AE00FFEBCE /* Uri.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Uri.cpp; path = ../../common/Net/Uri.cpp; sourceTree = SOURCE_ROOT; };
 		346FACEA1D3C75AE00FFEBCE /* MDStringToDigest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MDStringToDigest.cpp; path = ../../common/Net/MDStringToDigest.cpp; sourceTree = SOURCE_ROOT; };
 		3471868723A9AF8900F8C952 /* SubProcess.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = SubProcess.cpp; path = ../../common/Lgi/SubProcess.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2681CBF020F0028B84B /* LgiCocoa.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LgiCocoa.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		3477C26D1CBF020F0028B84B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; };
 		3477C2741CBF07DD0028B84B /* App.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = App.mm; sourceTree = SOURCE_ROOT; };
 		3477C2761CBF08050028B84B /* ClipBoard.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ClipBoard.mm; sourceTree = SOURCE_ROOT; };
 		3477C27A1CBF086A0028B84B /* General.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = General.mm; sourceTree = SOURCE_ROOT; };
 		3477C27B1CBF086A0028B84B /* Layout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Layout.mm; sourceTree = SOURCE_ROOT; };
 		3477C27C1CBF086A0028B84B /* Menu.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Menu.mm; sourceTree = SOURCE_ROOT; };
 		3477C27D1CBF086A0028B84B /* Printer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Printer.mm; sourceTree = SOURCE_ROOT; };
 		3477C27E1CBF086A0028B84B /* Thread.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Thread.mm; sourceTree = SOURCE_ROOT; };
 		3477C27F1CBF086A0028B84B /* View.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = View.mm; sourceTree = SOURCE_ROOT; };
 		3477C2801CBF086A0028B84B /* Widgets.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Widgets.mm; sourceTree = SOURCE_ROOT; };
 		3477C2811CBF086A0028B84B /* Window.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Window.mm; sourceTree = SOURCE_ROOT; };
 		3477C28B1CBF08C10028B84B /* Gdc2.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Gdc2.mm; sourceTree = SOURCE_ROOT; };
 		3477C28C1CBF08C10028B84B /* MemDC.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = MemDC.cpp; path = ../common/MemDC.cpp; sourceTree = SOURCE_ROOT; };
 		3477C28D1CBF08C10028B84B /* PrintDC.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = PrintDC.cpp; path = ../common/PrintDC.cpp; sourceTree = SOURCE_ROOT; };
 		3477C28E1CBF08C10028B84B /* ScreenDC.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ScreenDC.cpp; path = ../common/ScreenDC.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2941CBF09320028B84B /* File.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = File.mm; sourceTree = SOURCE_ROOT; };
 		3477C2951CBF09320028B84B /* Mem.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Mem.mm; sourceTree = SOURCE_ROOT; };
 		3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ShowFileProp_Mac.mm; sourceTree = SOURCE_ROOT; };
 		3477C29B1CBF0A920028B84B /* Mem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Mem.h; path = ../../../include/lgi/common/Mem.h; sourceTree = "<group>"; };
 		3477C29C1CBF0A920028B84B /* SymLookup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SymLookup.h; path = ../../../include/lgi/mac/cocoa/SymLookup.h; sourceTree = "<group>"; };
 		3477C29D1CBF0A920028B84B /* LgiMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiMac.h; path = ../../../include/lgi/mac/cocoa/LgiMac.h; sourceTree = "<group>"; };
 		3477C29E1CBF0A920028B84B /* LgiOs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiOs.h; path = ../../../include/lgi/mac/cocoa/LgiOs.h; sourceTree = "<group>"; };
 		3477C29F1CBF0A920028B84B /* LgiOsClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiOsClasses.h; path = ../../../include/lgi/mac/cocoa/LgiOsClasses.h; sourceTree = "<group>"; };
 		3477C2A01CBF0A920028B84B /* LgiOsDefs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiOsDefs.h; path = ../../../include/lgi/mac/cocoa/LgiOsDefs.h; sourceTree = "<group>"; };
 		3477C2A71CBF0AAF0028B84B /* Lgi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Lgi.h; path = ../../../include/lgi/common/Lgi.h; sourceTree = "<group>"; };
 		3477C2A91CBF22A00028B84B /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = File.h; path = ../../../include/lgi/common/File.h; sourceTree = SOURCE_ROOT; };
 		3477C2AB1CBF72170028B84B /* ViewPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewPriv.h; path = ../../../private/common/ViewPriv.h; sourceTree = SOURCE_ROOT; };
 		3477C2AE1CBF96B90028B84B /* LgiRes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = LgiRes.cpp; path = ../../common/Resource/LgiRes.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B01CBF96C40028B84B /* Res.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Res.cpp; path = ../../common/Resource/Res.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B31CBF96F20028B84B /* LMsg.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = LMsg.cpp; path = ../../common/Lgi/LMsg.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B61CBF973F0028B84B /* GuiUtils.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = GuiUtils.cpp; path = ../../common/Lgi/GuiUtils.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2B81CBF977F0028B84B /* LgiCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = LgiCommon.cpp; path = ../../common/Lgi/LgiCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2BA1CBF97C80028B84B /* GdcCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = GdcCommon.cpp; path = ../../common/Gdc2/GdcCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C01CBF9A040028B84B /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = String.cpp; path = ../../common/Text/String.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C41CC046310028B84B /* TextView3.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextView3.cpp; path = ../../common/Text/TextView3.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C51CC046310028B84B /* Unicode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Unicode.cpp; path = ../../common/Text/Unicode.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C61CC046310028B84B /* Utf8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utf8.cpp; path = ../../common/Text/Utf8.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2C71CC046310028B84B /* XmlTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XmlTree.cpp; path = ../../common/Text/XmlTree.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2CD1CC047BE0028B84B /* Charset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Charset.cpp; path = ../../common/Gdc2/Font/Charset.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2CF1CC047F50028B84B /* ToolBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToolBar.cpp; path = ../../common/Widgets/ToolBar.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D21CC048100028B84B /* Containers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Containers.cpp; path = ../../common/General/Containers.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D41CC0481B0028B84B /* Array.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Array.h; path = ../../../include/lgi/common/Array.h; sourceTree = SOURCE_ROOT; };
 		3477C2D61CC048390028B84B /* Popup.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp.preprocessed; fileEncoding = 4; name = Popup.cpp; path = ../../common/Widgets/Popup.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D81CC048F90028B84B /* DisplayString.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DisplayString.cpp; path = ../../common/Gdc2/Font/DisplayString.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2D91CC048F90028B84B /* Font.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Font.cpp; path = ../../common/Gdc2/Font/Font.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2DA1CC048F90028B84B /* FontSystem.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = FontSystem.cpp; path = ../../common/Gdc2/Font/FontSystem.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2DE1CC04A030028B84B /* ScrollBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ScrollBar.cpp; path = ../../common/Widgets/ScrollBar.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E01CC04A3C0028B84B /* FontSelect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FontSelect.cpp; path = ../../common/Lgi/FontSelect.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E21CC04A5C0028B84B /* Stream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Stream.cpp; path = ../../common/Lgi/Stream.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E41CC04A7F0028B84B /* ViewCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = ViewCommon.cpp; path = ../../common/Lgi/ViewCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E61CC04B1E0028B84B /* Surface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Surface.cpp; path = ../../common/Gdc2/Surface.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2E81CC04B5D0028B84B /* Rand.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rand.cpp; path = ../../common/Lgi/Rand.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2EA1CC04B890028B84B /* Filter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Filter.cpp; path = ../../common/Gdc2/Filters/Filter.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2EC1CC04BBB0028B84B /* ItemContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ItemContainer.cpp; path = ../../common/Widgets/ItemContainer.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2ED1CC04BBB0028B84B /* List.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = List.cpp; path = ../../common/Widgets/List.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2EE1CC04BBB0028B84B /* Tree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Tree.cpp; path = ../../common/Widgets/Tree.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F21CC04BF00028B84B /* Bitmap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Bitmap.cpp; path = ../../common/Widgets/Bitmap.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F31CC04BF00028B84B /* Box.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Box.cpp; path = ../../common/Widgets/Box.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F41CC04BF00028B84B /* Button.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Button.cpp; path = ../../common/Widgets/Button.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F51CC04BF00028B84B /* CheckBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CheckBox.cpp; path = ../../common/Widgets/CheckBox.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F61CC04BF00028B84B /* Combo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Combo.cpp; path = ../../common/Widgets/Combo.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F71CC04BF00028B84B /* Edit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Edit.cpp; path = ../../common/Widgets/Edit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F81CC04BF00028B84B /* Panel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Panel.cpp; path = ../../common/Widgets/Panel.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2F91CC04BF00028B84B /* Progress.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Progress.cpp; path = ../../common/Widgets/Progress.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FA1CC04BF00028B84B /* RadioGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RadioGroup.cpp; path = ../../common/Widgets/RadioGroup.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FB1CC04BF00028B84B /* Splitter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Splitter.cpp; path = ../../common/Widgets/Splitter.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FC1CC04BF00028B84B /* TableLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TableLayout.cpp; path = ../../common/Widgets/TableLayout.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FD1CC04BF00028B84B /* TabView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TabView.cpp; path = ../../common/Widgets/TabView.cpp; sourceTree = SOURCE_ROOT; };
 		3477C2FE1CC04BF00028B84B /* TextLabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = TextLabel.cpp; path = ../../common/Widgets/TextLabel.cpp; sourceTree = SOURCE_ROOT; };
 		3477C30C1CC04C560028B84B /* FindReplace.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FindReplace.cpp; path = ../../common/Lgi/FindReplace.cpp; sourceTree = SOURCE_ROOT; };
 		3477C30E1CC04C790028B84B /* Css.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Css.cpp; path = ../../common/Lgi/Css.cpp; sourceTree = SOURCE_ROOT; };
 		3477C30F1CC04C790028B84B /* CssTools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CssTools.cpp; path = ../../common/Lgi/CssTools.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3121CC04CB10028B84B /* Rect.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Rect.cpp; path = ../../common/Gdc2/Rect.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3151CC04CCB0028B84B /* Library.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Library.cpp; path = ../../common/Lgi/Library.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3181CC04CF10028B84B /* ThreadCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadCommon.cpp; path = ../../common/Lgi/ThreadCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C31B1CC04D3F0028B84B /* Net.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Net.cpp; path = ../../common/Net/Net.cpp; sourceTree = SOURCE_ROOT; };
-		3477C31C1CC04D3F0028B84B /* NetTools.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetTools.cpp; path = ../../common/Net/NetTools.cpp; sourceTree = SOURCE_ROOT; };
 		3477C31F1CC04D630028B84B /* ThreadEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ThreadEvent.cpp; path = ../../common/Lgi/ThreadEvent.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3211CC04DA00028B84B /* Colour.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Colour.cpp; path = ../../common/Gdc2/Colour.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3231CC04DD70028B84B /* Object.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Object.cpp; path = ../../common/Lgi/Object.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3251CC04DE20028B84B /* Mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Mutex.cpp; path = ../../common/Lgi/Mutex.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3271CC04E020028B84B /* Variant.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Variant.cpp; path = ../../common/Lgi/Variant.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3291CC04E120028B84B /* 8Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 8Bit.cpp; path = ../../common/Gdc2/8Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32A1CC04E120028B84B /* 64Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 64Bit.cpp; path = ../../common/Gdc2/64Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32B1CC04E120028B84B /* 16Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 16Bit.cpp; path = ../../common/Gdc2/16Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32C1CC04E120028B84B /* 24Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 24Bit.cpp; path = ../../common/Gdc2/24Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32D1CC04E120028B84B /* 32Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 32Bit.cpp; path = ../../common/Gdc2/32Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C32E1CC04E120028B84B /* 48Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 48Bit.cpp; path = ../../common/Gdc2/48Bit.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3301CC04E120028B84B /* Alpha.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Alpha.cpp; path = ../../common/Gdc2/Alpha.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3391CC04ED90028B84B /* DragAndDrop.mm */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = DragAndDrop.mm; sourceTree = SOURCE_ROOT; };
 		3477C33C1CC088590028B84B /* FileCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FileCommon.cpp; path = ../../common/General/FileCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C33E1CC0A6780028B84B /* Token.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Token.cpp; path = ../../common/Text/Token.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3401CC0A68E0028B84B /* DateTime.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = DateTime.cpp; path = ../../common/General/DateTime.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3421CC0A6B90028B84B /* DocView.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DocView.cpp; path = ../../common/Text/DocView.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3441CC0A9DE0028B84B /* Input.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Input.cpp; path = ../../common/Lgi/Input.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3461CC0AA220028B84B /* WindowCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = WindowCommon.cpp; path = ../../common/Lgi/WindowCommon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C3481CC0AA7E0028B84B /* ProgressDlg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ProgressDlg.cpp; path = ../../common/Widgets/ProgressDlg.cpp; sourceTree = SOURCE_ROOT; };
 		3477C34A1CC0AB0B0028B84B /* ToolTip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ToolTip.cpp; path = ../../common/Lgi/ToolTip.cpp; sourceTree = SOURCE_ROOT; };
 		3477C34C1CC0ACED0028B84B /* md5.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 4; name = md5.c; path = ../../common/Hash/md5/md5.c; sourceTree = SOURCE_ROOT; };
 		3477C34F1CC0C3D60028B84B /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = ../../../../../../../../System/Library/Frameworks/Cocoa.framework; sourceTree = "<group>"; };
 		3477C35A1CC1AEEA0028B84B /* LgiInc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiInc.h; path = ../../../include/lgi/common/LgiInc.h; sourceTree = "<group>"; };
 		3477C35C1CC2253E0028B84B /* LgiInterfaces.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiInterfaces.h; path = ../../../include/lgi/common/LgiInterfaces.h; sourceTree = "<group>"; };
 		3477C4391CC234750028B84B /* MemStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MemStream.cpp; path = ../../common/Lgi/MemStream.cpp; sourceTree = SOURCE_ROOT; };
 		3477C46C1CC26DEB0028B84B /* Alert.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Alert.cpp; path = ../../common/Lgi/Alert.cpp; sourceTree = SOURCE_ROOT; };
 		3477C4EC1CC27F1C0028B84B /* TrayIcon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = TrayIcon.cpp; path = ../../common/Lgi/TrayIcon.cpp; sourceTree = SOURCE_ROOT; };
 		3477C5161CC303B70028B84B /* LgiUiBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LgiUiBase.h; path = ../../../include/lgi/common/LgiUiBase.h; sourceTree = "<group>"; };
 		347AFB9727A0DC5E00BE4ABE /* 15Bit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = 15Bit.cpp; path = ../../common/Gdc2/15Bit.cpp; sourceTree = SOURCE_ROOT; };
 		348362411F233A77003B2A6D /* Stream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Stream.h; path = ../../../include/lgi/common/Stream.h; sourceTree = SOURCE_ROOT; };
 		34837C4825C677ED00D103B4 /* AppPriv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppPriv.h; path = ../../../private/mac/AppPriv.h; sourceTree = SOURCE_ROOT; };
 		348CD46925C63E56001AA32B /* AppCommon.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = AppCommon.cpp; path = ../../common/Lgi/AppCommon.cpp; sourceTree = SOURCE_ROOT; };
 		348E99CD2876850F0067E92A /* ObjCWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjCWrapper.h; path = ../../../include/lgi/mac/cocoa/ObjCWrapper.h; sourceTree = "<group>"; };
 		3491A28423678DB700604C29 /* DropFiles.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = DropFiles.h; path = ../../../include/lgi/common/DropFiles.h; sourceTree = SOURCE_ROOT; };
 		34A3ACE720568D5800B1D62A /* StringLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = StringLayout.cpp; path = ../../common/Gdc2/Font/StringLayout.cpp; sourceTree = SOURCE_ROOT; };
 		34A3ACE920568D9700B1D62A /* MenuCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MenuCommon.cpp; path = ../../common/Lgi/MenuCommon.cpp; sourceTree = SOURCE_ROOT; };
 		34B14E3326951C6E004C22CC /* Slider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Slider.cpp; path = ../../common/Widgets/Slider.cpp; sourceTree = SOURCE_ROOT; };
 		34B531D722F65734002B50F7 /* Menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Menu.h; path = ../../../include/lgi/common/Menu.h; sourceTree = "<group>"; };
 		34B6B19023CFD0F100C24906 /* DragAndDropCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DragAndDropCommon.cpp; path = ../../common/Lgi/DragAndDropCommon.cpp; sourceTree = SOURCE_ROOT; };
 		34BF15062871503B001B4CA5 /* DrawListSurface.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DrawListSurface.h; path = ../../../../../lgi/trunk/include/lgi/common/DrawListSurface.h; sourceTree = "<group>"; };
 		34C072C02369878100E1E222 /* DropFiles.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; name = DropFiles.cpp; path = ../../common/Lgi/DropFiles.cpp; sourceTree = SOURCE_ROOT; };
 		34C81A5925DA0AA10053F93A /* Base64.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Base64.cpp; path = ../../common/Net/Base64.cpp; sourceTree = SOURCE_ROOT; };
 		34CD9F7123D5768B0039F259 /* Unicode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Unicode.h; path = ../../../include/lgi/common/Unicode.h; sourceTree = SOURCE_ROOT; };
 		34D1B3C021748A2800BC6B58 /* Path.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Path.cpp; path = ../../common/Gdc2/Path/Path.cpp; sourceTree = SOURCE_ROOT; };
 		34D21CEB217981AE003D1EA6 /* EventTargetThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = EventTargetThread.h; path = ../../../include/lgi/common/EventTargetThread.h; sourceTree = SOURCE_ROOT; };
 		34D28925275B3D9F005961A8 /* DateTime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DateTime.h; path = ../../../include/lgi/common/DateTime.h; sourceTree = SOURCE_ROOT; };
 		34D28928275B3DB0005961A8 /* Variant.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Variant.h; path = ../../../include/lgi/common/Variant.h; sourceTree = SOURCE_ROOT; };
 		34D6AA1622D3749A005D739E /* Gdc2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Gdc2.h; path = ../../../include/lgi/common/Gdc2.h; sourceTree = SOURCE_ROOT; };
 		34EE8BB02748A55600F12915 /* TextFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TextFile.h; path = ../../../include/lgi/common/TextFile.h; sourceTree = "<group>"; };
 		34F3EC4229BD374E00BB9B58 /* Rect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Rect.h; path = ../../../include/lgi/common/Rect.h; sourceTree = SOURCE_ROOT; };
 		34F6151D27E55C5D00FE5B0C /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Thread.h; path = ../../../../../lgi/trunk/include/lgi/common/Thread.h; sourceTree = "<group>"; };
 		34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ThreadEvent.h; path = ../../../../../lgi/trunk/include/lgi/common/ThreadEvent.h; sourceTree = "<group>"; };
 		34F6153D27E5628600FE5B0C /* Token.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Token.h; path = ../../../../../lgi/trunk/include/lgi/common/Token.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
 		3477C2641CBF020F0028B84B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				3477C3501CC0C3D60028B84B /* Cocoa.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
 		3415168D26EC32C8007EE35F /* TextCtrls */ = {
 			isa = PBXGroup;
 			children = (
 				3415169126EC32FF007EE35F /* TextView3.h */,
 				3415169226EC32FF007EE35F /* TextView4.h */,
 				3415168E26EC32E7007EE35F /* TextView4.cpp */,
 				3477C2C41CC046310028B84B /* TextView3.cpp */,
 			);
 			name = TextCtrls;
 			sourceTree = "<group>";
 		};
 		346FACE81D3C723700FFEBCE /* Resources */ = {
 			isa = PBXGroup;
 			children = (
 				3477C26D1CBF020F0028B84B /* Info.plist */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
 		};
 		3477C25E1CBF020F0028B84B = {
 			isa = PBXGroup;
 			children = (
 				346FACE81D3C723700FFEBCE /* Resources */,
 				3477C26A1CBF020F0028B84B /* Classes */,
 				3477C29A1CBF0A700028B84B /* Headers */,
 				3477C34E1CC0C3A30028B84B /* Link */,
 				3477C2691CBF020F0028B84B /* Products */,
 			);
 			sourceTree = "<group>";
 		};
 		3477C2691CBF020F0028B84B /* Products */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2681CBF020F0028B84B /* LgiCocoa.framework */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
 		3477C26A1CBF020F0028B84B /* Classes */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2B21CBF96E60028B84B /* Dialogs */,
 				3477C33B1CC0881E0028B84B /* Files */,
 				3477C2931CBF09240028B84B /* General */,
 				3477C28A1CBF08760028B84B /* Graphics */,
 				3477C2731CBF07410028B84B /* Interface_Cocoa */,
 				3477C2B51CBF972B0028B84B /* Interface_XP */,
 				3477C3141CC04CC00028B84B /* Libraries */,
 				3477C2D11CC048000028B84B /* Memory */,
 				3477C31A1CC04D290028B84B /* Network */,
 				3477C4051CC22F920028B84B /* Process */,
 				3477C2AD1CBF96AA0028B84B /* Resources */,
 				3477C2BF1CBF99F00028B84B /* Text */,
 				3477C3171CC04CDE0028B84B /* Threads */,
 				3477C2CC1CC046370028B84B /* Widgets */,
 			);
 			name = Classes;
 			path = Lgi;
 			sourceTree = SOURCE_ROOT;
 			usesTabs = 1;
 		};
 		3477C2731CBF07410028B84B /* Interface_Cocoa */ = {
 			isa = PBXGroup;
 			children = (
 				343874B3230F46B200CF96B4 /* App.h */,
 				3477C2741CBF07DD0028B84B /* App.mm */,
 				344CFBC7237365B800AE6B35 /* ClipBoard.h */,
 				3477C2761CBF08050028B84B /* ClipBoard.mm */,
 				3427064627A0E20C0043F733 /* CocoaView.mm */,
 				3477C3391CC04ED90028B84B /* DragAndDrop.mm */,
 				3477C27A1CBF086A0028B84B /* General.mm */,
 				343874B4230F46B200CF96B4 /* Layout.h */,
 				3477C27B1CBF086A0028B84B /* Layout.mm */,
 				34109856217A9805007020CE /* LCocoaView.h */,
 				3477C27C1CBF086A0028B84B /* Menu.mm */,
 				3477C27D1CBF086A0028B84B /* Printer.mm */,
 				343874B2230F46B200CF96B4 /* View.h */,
 				3477C27F1CBF086A0028B84B /* View.mm */,
 				3477C2AB1CBF72170028B84B /* ViewPriv.h */,
 				3477C2801CBF086A0028B84B /* Widgets.mm */,
 				343874B1230F46B200CF96B4 /* Window.h */,
 				3477C2811CBF086A0028B84B /* Window.mm */,
 				34109853217A975E007020CE /* View.h */,
 			);
 			name = Interface_Cocoa;
 			sourceTree = "<group>";
 		};
 		3477C28A1CBF08760028B84B /* Graphics */ = {
 			isa = PBXGroup;
 			children = (
 				34F3EC4229BD374E00BB9B58 /* Rect.h */,
 				3413170F230694D1008CE982 /* Gel.cpp */,
 				34D6AA1622D3749A005D739E /* Gdc2.h */,
 				34D1B3C021748A2800BC6B58 /* Path.cpp */,
 				3477C3211CC04DA00028B84B /* Colour.cpp */,
 				3477C2BA1CBF97C80028B84B /* GdcCommon.cpp */,
 				3477C2EA1CC04B890028B84B /* Filter.cpp */,
 				3477C3121CC04CB10028B84B /* Rect.cpp */,
 				3477C28B1CBF08C10028B84B /* Gdc2.mm */,
 				3477C2BE1CBF97E20028B84B /* Applicators */,
 				3477C2BD1CBF97DA0028B84B /* Fonts */,
 				3477C2BC1CBF97D10028B84B /* Surfaces */,
 			);
 			name = Graphics;
 			sourceTree = "<group>";
 		};
 		3477C2931CBF09240028B84B /* General */ = {
 			isa = PBXGroup;
 			children = (
 				34C81A5925DA0AA10053F93A /* Base64.cpp */,
 				3477C3401CC0A68E0028B84B /* DateTime.cpp */,
 				34D28925275B3D9F005961A8 /* DateTime.h */,
 				3477C3421CC0A6B90028B84B /* DocView.cpp */,
 				3477C2951CBF09320028B84B /* Mem.mm */,
 				3477C34C1CC0ACED0028B84B /* md5.c */,
 				3477C3231CC04DD70028B84B /* Object.cpp */,
 				3477C2E81CC04B5D0028B84B /* Rand.cpp */,
 				3477C2961CBF09320028B84B /* ShowFileProp_Mac.mm */,
 				3477C3271CC04E020028B84B /* Variant.cpp */,
 				34D28928275B3DB0005961A8 /* Variant.h */,
 			);
 			name = General;
 			sourceTree = "<group>";
 		};
 		3477C29A1CBF0A700028B84B /* Headers */ = {
 			isa = PBXGroup;
 			children = (
 				348E99CD2876850F0067E92A /* ObjCWrapper.h */,
 				34BF15062871503B001B4CA5 /* DrawListSurface.h */,
 				3477C2A71CBF0AAF0028B84B /* Lgi.h */,
 				34114C8A23091E6E00F342B1 /* LgiClasses.h */,
 				3477C35A1CC1AEEA0028B84B /* LgiInc.h */,
 				3477C35C1CC2253E0028B84B /* LgiInterfaces.h */,
 				3477C29D1CBF0A920028B84B /* LgiMac.h */,
 				3477C29E1CBF0A920028B84B /* LgiOs.h */,
 				3477C29F1CBF0A920028B84B /* LgiOsClasses.h */,
 				3477C2A01CBF0A920028B84B /* LgiOsDefs.h */,
 				3477C5161CC303B70028B84B /* LgiUiBase.h */,
 				3477C29B1CBF0A920028B84B /* Mem.h */,
 				3449B8CD26BBF6B10022A9B8 /* Notifications.h */,
 				3409C0CF275812CB0050302A /* Profile.h */,
 				3477C29C1CBF0A920028B84B /* SymLookup.h */,
 				34EE8BB02748A55600F12915 /* TextFile.h */,
 				34F6151D27E55C5D00FE5B0C /* Thread.h */,
 				34F6151E27E55C5D00FE5B0C /* ThreadEvent.h */,
 				34F6153D27E5628600FE5B0C /* Token.h */,
 			);
 			name = Headers;
 			sourceTree = "<group>";
 		};
 		3477C2AD1CBF96AA0028B84B /* Resources */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2B01CBF96C40028B84B /* Res.cpp */,
 				3477C2AE1CBF96B90028B84B /* LgiRes.cpp */,
 			);
 			name = Resources;
 			path = ../../common/Gdc2/Rect.cpp;
 			sourceTree = SOURCE_ROOT;
 		};
 		3477C2B21CBF96E60028B84B /* Dialogs */ = {
 			isa = PBXGroup;
 			children = (
 				3413170D23068FFE008CE982 /* FileSelect.cpp */,
 				3477C46C1CC26DEB0028B84B /* Alert.cpp */,
 				3477C3481CC0AA7E0028B84B /* ProgressDlg.cpp */,
 				3477C3441CC0A9DE0028B84B /* Input.cpp */,
 				3477C30C1CC04C560028B84B /* FindReplace.cpp */,
 				3477C2E01CC04A3C0028B84B /* FontSelect.cpp */,
 				3477C2B31CBF96F20028B84B /* LMsg.cpp */,
 			);
 			name = Dialogs;
 			sourceTree = "<group>";
 		};
 		3477C2B51CBF972B0028B84B /* Interface_XP */ = {
 			isa = PBXGroup;
 			children = (
 				34837C4825C677ED00D103B4 /* AppPriv.h */,
 				348CD46925C63E56001AA32B /* AppCommon.cpp */,
 				34B6B19023CFD0F100C24906 /* DragAndDropCommon.cpp */,
 				3491A28423678DB700604C29 /* DropFiles.h */,
 				34C072C02369878100E1E222 /* DropFiles.cpp */,
 				34B531D722F65734002B50F7 /* Menu.h */,
 				34A3ACE920568D9700B1D62A /* MenuCommon.cpp */,
 				346FACE61D3C720B00FFEBCE /* Message.h */,
 				3477C4EC1CC27F1C0028B84B /* TrayIcon.cpp */,
 				3477C34A1CC0AB0B0028B84B /* ToolTip.cpp */,
 				3477C3461CC0AA220028B84B /* WindowCommon.cpp */,
 				3477C2E41CC04A7F0028B84B /* ViewCommon.cpp */,
 				3477C2B81CBF977F0028B84B /* LgiCommon.cpp */,
 				3477C2B61CBF973F0028B84B /* GuiUtils.cpp */,
 			);
 			name = Interface_XP;
 			sourceTree = "<group>";
 		};
 		3477C2BC1CBF97D10028B84B /* Surfaces */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2E61CC04B1E0028B84B /* Surface.cpp */,
 				3477C28E1CBF08C10028B84B /* ScreenDC.cpp */,
 				3477C28C1CBF08C10028B84B /* MemDC.cpp */,
 				3477C28D1CBF08C10028B84B /* PrintDC.cpp */,
 			);
 			name = Surfaces;
 			sourceTree = "<group>";
 		};
 		3477C2BD1CBF97DA0028B84B /* Fonts */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2CD1CC047BE0028B84B /* Charset.cpp */,
 				3477C2D81CC048F90028B84B /* DisplayString.cpp */,
 				3477C2D91CC048F90028B84B /* Font.cpp */,
 				345920FC1F25649000098DFD /* Font.h */,
 				345920FD1F25649000098DFD /* FontCache.h */,
 				340833122698F8FE0028012F /* FontPriv.h */,
 				345920FE1F25649000098DFD /* FontSelect.h */,
 				3477C2DA1CC048F90028B84B /* FontSystem.cpp */,
 				340833132698F8FE0028012F /* FontType.cpp */,
 				34A3ACE720568D5800B1D62A /* StringLayout.cpp */,
 				340833142698F8FE0028012F /* TypeFace.cpp */,
 			);
 			name = Fonts;
 			sourceTree = "<group>";
 		};
 		3477C2BE1CBF97E20028B84B /* Applicators */ = {
 			isa = PBXGroup;
 			children = (
 				3477C3291CC04E120028B84B /* 8Bit.cpp */,
 				347AFB9727A0DC5E00BE4ABE /* 15Bit.cpp */,
 				3477C32B1CC04E120028B84B /* 16Bit.cpp */,
 				3477C32C1CC04E120028B84B /* 24Bit.cpp */,
 				3477C32D1CC04E120028B84B /* 32Bit.cpp */,
 				3477C32E1CC04E120028B84B /* 48Bit.cpp */,
 				3477C32A1CC04E120028B84B /* 64Bit.cpp */,
 				3477C3301CC04E120028B84B /* Alpha.cpp */,
 			);
 			name = Applicators;
 			sourceTree = "<group>";
 		};
 		3477C2BF1CBF99F00028B84B /* Text */ = {
 			isa = PBXGroup;
 			children = (
 				3477C30E1CC04C790028B84B /* Css.cpp */,
 				3477C30F1CC04C790028B84B /* CssTools.cpp */,
 				3477C2C01CBF9A040028B84B /* String.cpp */,
 				3477C33E1CC0A6780028B84B /* Token.cpp */,
 				3477C2C51CC046310028B84B /* Unicode.cpp */,
 				34CD9F7123D5768B0039F259 /* Unicode.h */,
 				3477C2C61CC046310028B84B /* Utf8.cpp */,
 				3477C2C71CC046310028B84B /* XmlTree.cpp */,
 			);
 			name = Text;
 			sourceTree = "<group>";
 		};
 		3477C2CC1CC046370028B84B /* Widgets */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2F21CC04BF00028B84B /* Bitmap.cpp */,
 				3477C2F31CC04BF00028B84B /* Box.cpp */,
 				3477C2F41CC04BF00028B84B /* Button.cpp */,
 				3477C2F51CC04BF00028B84B /* CheckBox.cpp */,
 				3477C2F61CC04BF00028B84B /* Combo.cpp */,
 				3477C2F71CC04BF00028B84B /* Edit.cpp */,
 				3477C2EC1CC04BBB0028B84B /* ItemContainer.cpp */,
 				3477C2ED1CC04BBB0028B84B /* List.cpp */,
 				3409C0C827580ED60050302A /* List.h */,
 				3409C0C927580ED60050302A /* ListItemCheckBox.h */,
 				3409C0C727580ED60050302A /* ListItemRadioBtn.h */,
 				3477C2F81CC04BF00028B84B /* Panel.cpp */,
 				3477C2D61CC048390028B84B /* Popup.cpp */,
 				345EB84D235C6C01007D05DB /* Popup.h */,
 				343BE8C62355D0CE00742E21 /* PopupList.h */,
 				3477C2F91CC04BF00028B84B /* Progress.cpp */,
 				3418EBCE25D9FEA600EA168A /* Progress.h */,
 				3418EBD025D9FEF500EA168A /* ProgressDlg.h */,
 				3477C2FA1CC04BF00028B84B /* RadioGroup.cpp */,
 				346DDEC0240C882900751380 /* RadioGroup.h */,
 				3477C2DE1CC04A030028B84B /* ScrollBar.cpp */,
 				34B14E3326951C6E004C22CC /* Slider.cpp */,
 				3477C2FB1CC04BF00028B84B /* Splitter.cpp */,
 				3477C2FC1CC04BF00028B84B /* TableLayout.cpp */,
 				3477C2FD1CC04BF00028B84B /* TabView.cpp */,
 				3415168D26EC32C8007EE35F /* TextCtrls */,
 				3477C2FE1CC04BF00028B84B /* TextLabel.cpp */,
 				3477C2CF1CC047F50028B84B /* ToolBar.cpp */,
 				3477C2EE1CC04BBB0028B84B /* Tree.cpp */,
 			);
 			name = Widgets;
 			sourceTree = "<group>";
 		};
 		3477C2D11CC048000028B84B /* Memory */ = {
 			isa = PBXGroup;
 			children = (
 				3477C2D41CC0481B0028B84B /* Array.h */,
 				3477C2D21CC048100028B84B /* Containers.cpp */,
 				3477C4391CC234750028B84B /* MemStream.cpp */,
 				3477C2E21CC04A5C0028B84B /* Stream.cpp */,
 				348362411F233A77003B2A6D /* Stream.h */,
 			);
 			name = Memory;
 			sourceTree = "<group>";
 		};
 		3477C3141CC04CC00028B84B /* Libraries */ = {
 			isa = PBXGroup;
 			children = (
 				3477C3151CC04CCB0028B84B /* Library.cpp */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
 		};
 		3477C3171CC04CDE0028B84B /* Threads */ = {
 			isa = PBXGroup;
 			children = (
 				34D21CEB217981AE003D1EA6 /* EventTargetThread.h */,
 				3477C27E1CBF086A0028B84B /* Thread.mm */,
 				3477C3251CC04DE20028B84B /* Mutex.cpp */,
 				3477C31F1CC04D630028B84B /* ThreadEvent.cpp */,
 				3477C3181CC04CF10028B84B /* ThreadCommon.cpp */,
 			);
 			name = Threads;
 			sourceTree = "<group>";
 		};
 		3477C31A1CC04D290028B84B /* Network */ = {
 			isa = PBXGroup;
 			children = (
 				346FACE91D3C75AE00FFEBCE /* Uri.cpp */,
 				346FACEA1D3C75AE00FFEBCE /* MDStringToDigest.cpp */,
 				3477C31B1CC04D3F0028B84B /* Net.cpp */,
-				3477C31C1CC04D3F0028B84B /* NetTools.cpp */,
 			);
 			name = Network;
 			sourceTree = "<group>";
 		};
 		3477C33B1CC0881E0028B84B /* Files */ = {
 			isa = PBXGroup;
 			children = (
 				3477C33C1CC088590028B84B /* FileCommon.cpp */,
 				3477C2A91CBF22A00028B84B /* File.h */,
 				3477C2941CBF09320028B84B /* File.mm */,
 			);
 			name = Files;
 			sourceTree = "<group>";
 		};
 		3477C34E1CC0C3A30028B84B /* Link */ = {
 			isa = PBXGroup;
 			children = (
 				3477C34F1CC0C3D60028B84B /* Cocoa.framework */,
 			);
 			name = Link;
 			sourceTree = "<group>";
 		};
 		3477C4051CC22F920028B84B /* Process */ = {
 			isa = PBXGroup;
 			children = (
 				3471868723A9AF8900F8C952 /* SubProcess.cpp */,
 			);
 			name = Process;
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
 		3477C2651CBF020F0028B84B /* Headers */ = {
 			isa = PBXHeadersBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				344CFBC8237365B800AE6B35 /* ClipBoard.h in Headers */,
 				3449B8CE26BBF6B10022A9B8 /* Notifications.h in Headers */,
 				343874B8230F46B200CF96B4 /* Layout.h in Headers */,
 				3477C2AC1CBF72170028B84B /* ViewPriv.h in Headers */,
 				3409C0CA27580ED60050302A /* ListItemRadioBtn.h in Headers */,
 				3477C35D1CC2253E0028B84B /* LgiInterfaces.h in Headers */,
 				34F6153E27E5628600FE5B0C /* Token.h in Headers */,
 				3477C2A51CBF0A920028B84B /* LgiOsClasses.h in Headers */,
 				3491A28523678DB800604C29 /* DropFiles.h in Headers */,
 				3415169326EC32FF007EE35F /* TextView3.h in Headers */,
 				34B531D822F65734002B50F7 /* Menu.h in Headers */,
 				34114C8B23091E6E00F342B1 /* LgiClasses.h in Headers */,
 				34D28926275B3D9F005961A8 /* DateTime.h in Headers */,
 				3477C35B1CC1AEEA0028B84B /* LgiInc.h in Headers */,
 				34F6152027E55C5D00FE5B0C /* ThreadEvent.h in Headers */,
 				348362421F233A77003B2A6D /* Stream.h in Headers */,
 				3477C2A61CBF0A920028B84B /* LgiOsDefs.h in Headers */,
 				3409C0CC27580ED60050302A /* ListItemCheckBox.h in Headers */,
 				345EB84E235C6C01007D05DB /* Popup.h in Headers */,
 				34BF15072871503B001B4CA5 /* DrawListSurface.h in Headers */,
 				34F6151F27E55C5D00FE5B0C /* Thread.h in Headers */,
 				34D21CEC217981AE003D1EA6 /* EventTargetThread.h in Headers */,
 				343BE8C72355D0CE00742E21 /* PopupList.h in Headers */,
 				34EE8BB12748A55600F12915 /* TextFile.h in Headers */,
 				34CD9F7223D5768B0039F259 /* Unicode.h in Headers */,
 				34837C4925C677ED00D103B4 /* AppPriv.h in Headers */,
 				34F3EC4329BD374E00BB9B58 /* Rect.h in Headers */,
 				3409C0D0275812CB0050302A /* Profile.h in Headers */,
 				3477C2A11CBF0A920028B84B /* Mem.h in Headers */,
 				3477C2D51CC0481B0028B84B /* Array.h in Headers */,
 				3477C5171CC303B70028B84B /* LgiUiBase.h in Headers */,
 				3477C2AA1CBF22A00028B84B /* File.h in Headers */,
 				343874B5230F46B200CF96B4 /* Window.h in Headers */,
 				34D28929275B3DB0005961A8 /* Variant.h in Headers */,
 				348E99CE2876850F0067E92A /* ObjCWrapper.h in Headers */,
 				3477C2A21CBF0A920028B84B /* SymLookup.h in Headers */,
 				34D6AA1722D3749A005D739E /* Gdc2.h in Headers */,
 				3477C2A41CBF0A920028B84B /* LgiOs.h in Headers */,
 				340833152698F8FF0028012F /* FontPriv.h in Headers */,
 				343874B7230F46B200CF96B4 /* App.h in Headers */,
 				3418EBCF25D9FEA600EA168A /* Progress.h in Headers */,
 				346DDEC1240C882900751380 /* RadioGroup.h in Headers */,
 				345921011F25649000098DFD /* FontSelect.h in Headers */,
 				346FACE71D3C720B00FFEBCE /* Message.h in Headers */,
 				3477C2A31CBF0A920028B84B /* LgiMac.h in Headers */,
 				3418EBD125D9FEF500EA168A /* ProgressDlg.h in Headers */,
 				343874B6230F46B200CF96B4 /* View.h in Headers */,
 				345920FF1F25649000098DFD /* Font.h in Headers */,
 				3415169426EC32FF007EE35F /* TextView4.h in Headers */,
 				3477C2A81CBF0AAF0028B84B /* Lgi.h in Headers */,
 				345921001F25649000098DFD /* FontCache.h in Headers */,
 				3409C0CB27580ED60050302A /* List.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXHeadersBuildPhase section */
 
 /* Begin PBXNativeTarget section */
 		3477C2671CBF020F0028B84B /* LgiCocoa */ = {
 			isa = PBXNativeTarget;
 			buildConfigurationList = 3477C2701CBF020F0028B84B /* Build configuration list for PBXNativeTarget "LgiCocoa" */;
 			buildPhases = (
 				3477C2631CBF020F0028B84B /* Sources */,
 				3477C2641CBF020F0028B84B /* Frameworks */,
 				3477C2651CBF020F0028B84B /* Headers */,
 				3477C2661CBF020F0028B84B /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
 			name = LgiCocoa;
 			productName = Lgi;
 			productReference = 3477C2681CBF020F0028B84B /* LgiCocoa.framework */;
 			productType = "com.apple.product-type.framework";
 		};
 /* End PBXNativeTarget section */
 
 /* Begin PBXProject section */
 		3477C25F1CBF020F0028B84B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 1240;
 				ORGANIZATIONNAME = Memecode;
 				TargetAttributes = {
 					3477C2671CBF020F0028B84B = {
 						CreatedOnToolsVersion = 7.3;
 					};
 				};
 			};
 			buildConfigurationList = 3477C2621CBF020F0028B84B /* Build configuration list for PBXProject "LgiCocoa" */;
 			compatibilityVersion = "Xcode 10.0";
 			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
 				Base,
 			);
 			mainGroup = 3477C25E1CBF020F0028B84B;
 			productRefGroup = 3477C2691CBF020F0028B84B /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
 				3477C2671CBF020F0028B84B /* LgiCocoa */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
 		3477C2661CBF020F0028B84B /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
 		3477C2631CBF020F0028B84B /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 				3477C2CE1CC047BE0028B84B /* Charset.cpp in Sources */,
 				3477C3111CC04C790028B84B /* CssTools.cpp in Sources */,
 				34A3ACE820568D5800B1D62A /* StringLayout.cpp in Sources */,
 				3477C2DB1CC048F90028B84B /* DisplayString.cpp in Sources */,
 				34B14E3426951C6E004C22CC /* Slider.cpp in Sources */,
 				3477C33A1CC04ED90028B84B /* DragAndDrop.mm in Sources */,
 				3477C2DC1CC048F90028B84B /* Font.cpp in Sources */,
 				3477C2831CBF086A0028B84B /* Layout.mm in Sources */,
 				3477C34D1CC0ACED0028B84B /* md5.c in Sources */,
 				3477C2C81CC046310028B84B /* TextView3.cpp in Sources */,
 				3477C2861CBF086A0028B84B /* Thread.mm in Sources */,
 				3477C2821CBF086A0028B84B /* General.mm in Sources */,
 				3477C3131CC04CB10028B84B /* Rect.cpp in Sources */,
 				3477C3451CC0A9DE0028B84B /* Input.cpp in Sources */,
 				34B6B19123CFD0F100C24906 /* DragAndDropCommon.cpp in Sources */,
 				3477C31D1CC04D3F0028B84B /* Net.cpp in Sources */,
 				3477C28F1CBF08C10028B84B /* Gdc2.mm in Sources */,
 				3477C30A1CC04BF00028B84B /* TabView.cpp in Sources */,
 				3427064727A0E20C0043F733 /* CocoaView.mm in Sources */,
 				3477C33F1CC0A6780028B84B /* Token.cpp in Sources */,
 				3477C2D01CC047F50028B84B /* ToolBar.cpp in Sources */,
 				3477C3011CC04BF00028B84B /* Button.cpp in Sources */,
 				3477C3061CC04BF00028B84B /* Progress.cpp in Sources */,
 				3477C3001CC04BF00028B84B /* Box.cpp in Sources */,
 				3477C2871CBF086A0028B84B /* View.mm in Sources */,
 				3477C3021CC04BF00028B84B /* CheckBox.cpp in Sources */,
 				3477C2BB1CBF97C80028B84B /* GdcCommon.cpp in Sources */,
 				3477C2E51CC04A7F0028B84B /* ViewCommon.cpp in Sources */,
 				347AFB9827A0DC5E00BE4ABE /* 15Bit.cpp in Sources */,
 				34131710230694D1008CE982 /* Gel.cpp in Sources */,
 				3477C2D71CC048390028B84B /* Popup.cpp in Sources */,
 				3477C3091CC04BF00028B84B /* TableLayout.cpp in Sources */,
 				3477C2E11CC04A3C0028B84B /* FontSelect.cpp in Sources */,
 				3477C2DF1CC04A030028B84B /* ScrollBar.cpp in Sources */,
 				3477C2F11CC04BBB0028B84B /* Tree.cpp in Sources */,
 				3413170E23068FFE008CE982 /* FileSelect.cpp in Sources */,
 				3477C3281CC04E020028B84B /* Variant.cpp in Sources */,
 				3477C2AF1CBF96B90028B84B /* LgiRes.cpp in Sources */,
 				3471868823A9AF8900F8C952 /* SubProcess.cpp in Sources */,
 				3477C3161CC04CCB0028B84B /* Library.cpp in Sources */,
 				3477C3051CC04BF00028B84B /* Panel.cpp in Sources */,
 				3477C2901CBF08C10028B84B /* MemDC.cpp in Sources */,
 				34C072C12369878100E1E222 /* DropFiles.cpp in Sources */,
 				3477C30D1CC04C560028B84B /* FindReplace.cpp in Sources */,
 				3477C34B1CC0AB0B0028B84B /* ToolTip.cpp in Sources */,
 				3415168F26EC32E7007EE35F /* TextView4.cpp in Sources */,
 				3477C3201CC04D630028B84B /* ThreadEvent.cpp in Sources */,
 				3477C3031CC04BF00028B84B /* Combo.cpp in Sources */,
 				3477C30B1CC04BF00028B84B /* TextLabel.cpp in Sources */,
 				3477C2B71CBF973F0028B84B /* GuiUtils.cpp in Sources */,
 				3477C2911CBF08C10028B84B /* PrintDC.cpp in Sources */,
 				3477C2B91CBF977F0028B84B /* LgiCommon.cpp in Sources */,
 				34D1B3C121748A2800BC6B58 /* Path.cpp in Sources */,
 				3477C2CA1CC046310028B84B /* Utf8.cpp in Sources */,
 				3477C2971CBF09320028B84B /* File.mm in Sources */,
 				3477C43A1CC234750028B84B /* MemStream.cpp in Sources */,
 				3477C3191CC04CF10028B84B /* ThreadCommon.cpp in Sources */,
 				3477C2781CBF08050028B84B /* ClipBoard.mm in Sources */,
 				346FACEC1D3C75AE00FFEBCE /* MDStringToDigest.cpp in Sources */,
 				3477C3491CC0AA7E0028B84B /* ProgressDlg.cpp in Sources */,
 				346FACEB1D3C75AE00FFEBCE /* Uri.cpp in Sources */,
 				3477C2B11CBF96C40028B84B /* Res.cpp in Sources */,
 				340833162698F8FF0028012F /* FontType.cpp in Sources */,
 				3477C4ED1CC27F1C0028B84B /* TrayIcon.cpp in Sources */,
 				3477C2991CBF09320028B84B /* ShowFileProp_Mac.mm in Sources */,
 				3477C2921CBF08C10028B84B /* ScreenDC.cpp in Sources */,
 				3477C2981CBF09320028B84B /* Mem.mm in Sources */,
 				3477C2CB1CC046310028B84B /* XmlTree.cpp in Sources */,
 				3477C2EF1CC04BBB0028B84B /* ItemContainer.cpp in Sources */,
 				3477C3081CC04BF00028B84B /* Splitter.cpp in Sources */,
 				34109857217A9805007020CE /* LCocoaView.h in Sources */,
 				3477C46D1CC26DEB0028B84B /* Alert.cpp in Sources */,
 				3477C3381CC04E120028B84B /* Alpha.cpp in Sources */,
 				3477C2EB1CC04B890028B84B /* Filter.cpp in Sources */,
 				3477C3321CC04E120028B84B /* 64Bit.cpp in Sources */,
 				3477C3041CC04BF00028B84B /* Edit.cpp in Sources */,
 				3477C3361CC04E120028B84B /* 48Bit.cpp in Sources */,
 				3477C3261CC04DE20028B84B /* Mutex.cpp in Sources */,
 				3477C2851CBF086A0028B84B /* Printer.mm in Sources */,
 				3477C33D1CC088590028B84B /* FileCommon.cpp in Sources */,
 				3477C3471CC0AA220028B84B /* WindowCommon.cpp in Sources */,
 				3477C3071CC04BF00028B84B /* RadioGroup.cpp in Sources */,
 				3477C2FF1CC04BF00028B84B /* Bitmap.cpp in Sources */,
 				3477C2E91CC04B5D0028B84B /* Rand.cpp in Sources */,
 				3477C2E71CC04B1E0028B84B /* Surface.cpp in Sources */,
 				3477C3241CC04DD70028B84B /* Object.cpp in Sources */,
 				3477C2E31CC04A5C0028B84B /* Stream.cpp in Sources */,
 				34A3ACEA20568D9700B1D62A /* MenuCommon.cpp in Sources */,
 				3477C3341CC04E120028B84B /* 24Bit.cpp in Sources */,
 				3477C3351CC04E120028B84B /* 32Bit.cpp in Sources */,
-				3477C31E1CC04D3F0028B84B /* NetTools.cpp in Sources */,
 				3477C2881CBF086A0028B84B /* Widgets.mm in Sources */,
 				340833172698F8FF0028012F /* TypeFace.cpp in Sources */,
 				3477C2891CBF086A0028B84B /* Window.mm in Sources */,
 				3477C3431CC0A6B90028B84B /* DocView.cpp in Sources */,
 				3477C2841CBF086A0028B84B /* Menu.mm in Sources */,
 				3477C2B41CBF96F20028B84B /* LMsg.cpp in Sources */,
 				3477C3311CC04E120028B84B /* 8Bit.cpp in Sources */,
 				3477C2DD1CC048F90028B84B /* FontSystem.cpp in Sources */,
 				3477C3101CC04C790028B84B /* Css.cpp in Sources */,
 				3477C2C91CC046310028B84B /* Unicode.cpp in Sources */,
 				3477C3221CC04DA00028B84B /* Colour.cpp in Sources */,
 				3477C2D31CC048100028B84B /* Containers.cpp in Sources */,
 				3477C2F01CC04BBB0028B84B /* List.cpp in Sources */,
 				3477C3331CC04E120028B84B /* 16Bit.cpp in Sources */,
 				3477C2751CBF07DD0028B84B /* App.mm in Sources */,
 				348CD46A25C63E56001AA32B /* AppCommon.cpp in Sources */,
 				3477C3411CC0A68E0028B84B /* DateTime.cpp in Sources */,
 				34C81A5A25DA0AA10053F93A /* Base64.cpp in Sources */,
 				3477C2C11CBF9A040028B84B /* String.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXSourcesBuildPhase section */
 
 /* Begin XCBuildConfiguration section */
 		3477C26E1CBF020F0028B84B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
 				);
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MODULEMAP_FILE = module.modulemap;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Debug;
 		};
 		3477C26F1CBF020F0028B84B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "c++14";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
 				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_INJECT_BASE_ENTITLEMENTS = NO;
 				CODE_SIGN_STYLE = Manual;
 				COPY_PHASE_STRIP = NO;
 				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
 				GCC_WARN_UNDECLARED_SELECTOR = YES;
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				MODULEMAP_FILE = module.modulemap;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
 			name = Release;
 		};
 		3477C2711CBF020F0028B84B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 2AV9WN2LD8;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				HEADER_SEARCH_PATHS = (
 					../../../include,
 					../../../include/lgi/mac/cocoa,
 					../../../private/mac,
 					../../../private/common,
 				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
 				OTHER_CFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 					"-D_DEBUG",
 				);
 				OTHER_CODE_SIGN_FLAGS = "--timestamp --deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 					"-D_DEBUG",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.memecode.Lgi;
 				PRODUCT_NAME = LgiCocoa;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				WARNING_CFLAGS = "-Wno-nullability-completeness";
 			};
 			name = Debug;
 		};
 		3477C2721CBF020F0028B84B /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ANALYZER_NONNULL = YES_NONAGGRESSIVE;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				COMBINE_HIDPI_IMAGES = YES;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = 2AV9WN2LD8;
 				DYLIB_COMPATIBILITY_VERSION = 1;
 				DYLIB_CURRENT_VERSION = 1;
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				FRAMEWORK_VERSION = A;
 				GCC_C_LANGUAGE_STANDARD = c11;
 				HEADER_SEARCH_PATHS = (
 					../../../include,
 					../../../include/lgi/mac/cocoa,
 					../../../private/mac,
 					../../../private/common,
 				);
 				INFOPLIST_FILE = Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
 				OTHER_CFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 				);
 				OTHER_CODE_SIGN_FLAGS = "--timestamp --deep";
 				OTHER_CPLUSPLUSFLAGS = (
 					"-DMAC",
 					"-DLGI_COCOA=1",
 					"-DLGI_LIBRARY",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.memecode.Lgi;
 				PRODUCT_NAME = LgiCocoa;
 				SDKROOT = macosx;
 				SKIP_INSTALL = YES;
 				STRIP_INSTALLED_PRODUCT = NO;
 				WARNING_CFLAGS = "-Wno-nullability-completeness";
 			};
 			name = Release;
 		};
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
 		3477C2621CBF020F0028B84B /* Build configuration list for PBXProject "LgiCocoa" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3477C26E1CBF020F0028B84B /* Debug */,
 				3477C26F1CBF020F0028B84B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 		3477C2701CBF020F0028B84B /* Build configuration list for PBXNativeTarget "LgiCocoa" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				3477C2711CBF020F0028B84B /* Debug */,
 				3477C2721CBF020F0028B84B /* Release */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
 	};
 	rootObject = 3477C25F1CBF020F0028B84B /* Project object */;
 }
diff --git a/src/mac/cocoa/View.mm b/src/mac/cocoa/View.mm
--- a/src/mac/cocoa/View.mm
+++ b/src/mac/cocoa/View.mm
@@ -1,1028 +1,1022 @@
 /*hdr
 **      FILE:           LView.cpp
 **      AUTHOR:         Matthew Allen
 **      DATE:           23/4/98
 **      DESCRIPTION:    Linux LView Implementation
 **
 **      Copyright (C) 1998-2003, Matthew Allen
 **              fret@memecode.com
 */
 
 #include <stdio.h>
 #include <stdlib.h>
 
 #include "lgi/common/Lgi.h"
 #include "lgi/common/DragAndDrop.h"
 #include "lgi/common/ScrollBar.h"
 #include "lgi/common/Edit.h"
 #include "lgi/common/Css.h"
 #include "lgi/common/Popup.h"
 #include "lgi/common/DisplayString.h"
 #include "ViewPriv.h"
 #include "LCocoaView.h"
 
 #define ADJ_LEFT					1
 #define ADJ_RIGHT					2
 #define ADJ_UP						3
 #define ADJ_DOWN					4
 
 // CursorData is a bitmap in an array of uint32's. This is generated from a graphics file:
 // ./Code/cursors.png
 //
 // The pixel values are turned into C code by a program called i.Mage:
 //	http://www.memecode.com/image.php
 //
 // Load the graphic into i.Mage and then go Edit->CopyAsCode
 // Then paste the text into the CursorData variable at the bottom of this file.
 //
 // This saves a lot of time finding and loading an external resouce, and even having to
 // bundle extra files with your application. Which have a tendancy to get lost along the
 // way etc.
 extern uint32 CursorData[];
 LInlineBmp Cursors =
 {
 	300, 20, 8, CursorData
 };
 
 struct LgiCursorInfo
 {
 public:
 	LRect Pos;
 	LPoint HotSpot;
 }
 CursorMetrics[] =
 {
 	// up arrow
 	{ LRect(0, 0, 8, 15),			LPoint(4, 0) },
 	// cross hair
 	{ LRect(20, 0, 38, 18),			LPoint(29, 9) },
 	// hourglass
 	{ LRect(40, 0, 51, 15),			LPoint(45, 8) },
 	// I beam
 	{ LRect(60, 0, 66, 17),			LPoint(63, 8) },
 	// N-S arrow
 	{ LRect(80, 0, 91, 16),			LPoint(85, 8) },
 	// E-W arrow
 	{ LRect(100, 0, 116, 11),		LPoint(108, 5) },
 	// NW-SE arrow
 	{ LRect(120, 0, 132, 12),		LPoint(126, 6) },
 	// NE-SW arrow
 	{ LRect(140, 0, 152, 12),		LPoint(146, 6) },
 	// 4 way arrow
 	{ LRect(160, 0, 178, 18),		LPoint(169, 9) },
 	// Blank
 	{ LRect(0, 0, 0, 0),			LPoint(0, 0) },
 	// Vertical split
 	{ LRect(180, 0, 197, 16),		LPoint(188, 8) },
 	// Horizontal split
 	{ LRect(200, 0, 216, 17),		LPoint(208, 8) },
 	// Hand
 	{ LRect(220, 0, 233, 13),		LPoint(225, 0) },
 	// No drop
 	{ LRect(240, 0, 258, 18),		LPoint(249, 9) },
 	// Copy drop
 	{ LRect(260, 0, 279, 19),		LPoint(260, 0) },
 	// Move drop
 	{ LRect(280, 0, 299, 19),		LPoint(280, 0) },
 };
 
 ////////////////////////////////////////////////////////////////////////////
 LView *GWindowFromHandle(OsView h)
 {
 	if (!h)
 		return 0;
 	
 	return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////
 bool LIsKeyDown(int Key)
 {
 	LAssert(!"Not impl.");
 	return false;
 }
 
 bool LIsMounted(char *Name)
 {
 	LAssert(!"Not impl.");
 	return false;
 }
 
 bool LMountVolume(char *Name)
 {
 	LAssert(!"Not impl.");
 	return false;
 }
 
-LKey::LKey(int Vkey, uint32_t flags)
-{
-	c16 = vkey = Vkey;
-	Flags = flags;
-	Data = 0;
-	IsChar = false;
-}
+
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 #if 0
 bool LViewPrivate::CursorSet = false;
 LView *LViewPrivate::LastCursor = 0;
 #endif
 
 LViewPrivate::LViewPrivate(LView *view) : View(view)
 {
 	TabStop = false;
 	AttachEvent = false;
 }
 	
 LViewPrivate::~LViewPrivate()
 {
 	DeleteObj(Popup);
 	LAssert(PulseThread == NULL);
 
 	while (EventTargets.Length())
 		delete EventTargets[0];
 }
 
 const char *LView::GetClass()
 {
 	return "LView";
 }
 
 LView *&LView::PopupChild()
 {
 	return d->Popup;
 }
 
 bool LView::_Mouse(LMouse &m, bool Move)
 {
 	#if 0
 	if (Move)
 	{
 		static bool First = true;
 		if (First)
 		{
 			First = false;
 			//_DumpHeirarchy(GetWindow());			
 			//_Dump(0, GetWindow(), HIViewGetRoot(GetWindow()->WindowHandle()));
 		}
 		
 		printf("_Mouse %p,%s %i,%i down=%i move=%i\n",
 			this, GetClass(),
 			m.x, m.y,
 			m.Down(), Move);
 	}
 	#endif
 
 	LWindow *Wnd = GetWindow();
 
 	if (_Capturing)
 	{
 		// Convert root NSView coords to capture view coords
 		LViewI *par;
 		for (auto i = _Capturing; i && i != this; i = par)
 		{
 			par = i->GetParent();
 			LRect cli, p = i->GetPos();
 			if (par)
 				cli = i->GetClient(false);
 
 			m.x -= p.x1 + cli.x1;
 			m.y -= p.y1 + cli.y1;
 		}
 		
 		// if (!m.IsMove()) m.Trace("Capture");
 		
 		if (Move)
 		{
 			LViewI *c = _Capturing;
 			c->OnMouseMove(m);
 		}
 		else
 		{
 			if (!Wnd || Wnd->HandleViewMouse(dynamic_cast<LView*>(_Capturing), m))
 				_Capturing->OnMouseClick(m);
 		}
 	}
 	else
 	{
 		// Convert root NSView coords to _Over coords
 		auto t = WindowFromPoint(m.x, m.y);
 		if (t)
 		{
 			/*
 			GColour col(255, 0, 255);
 			GArray<LRect> rc;
 			GArray<GString> names;
 			auto w = GetWindow();
 			int yy = 200;
 			bool Debug = !stricmp(t->GetClass(), "CtrlEditbox") && w->DebugDC.X() == 0 && !Move;
 			if (Debug && w)
 			{
 				w->DebugDC.Create(w->X(), w->Y(), System32BitColourSpace);
 				w->DebugDC.Colour(0, 32);
 				w->DebugDC.Rectangle();
 				w->DebugDC.Colour(col);
 			}
 			*/
 			
 			for (auto i = t; i && i != this; i = i->GetParent())
 			{
 				auto p = i->GetPos();
 				auto cli = i->GetClient(false);
 				
 				/*
 				if (Debug)
 				{
 					LRect r = p;
 					r.Offset(cli.x1, cli.y1);
 					rc.AddAt(0,r);
 					names.AddAt(0,i->GetClass());
 					printf("%s %s\n", i->GetClass(), p.GetStr());
 				}
 				*/
 
 				m.x -= p.x1 + cli.x1;
 				m.y -= p.y1 + cli.y1;
 			}
 			
 			/*
 			if (Debug)
 			{
 				int x = rc[0].x1, y = rc[0].y1;
 				for (unsigned i=0; i<rc.Length(); i++)
 				{
 					auto &r = rc[i];
 					w->DebugDC.Line(x, y, x+r.x1, y+r.y1);
 					x += r.x1;
 					y += r.y1;
 					
 					GDisplayString ds(SysFont, names[i]);
 					SysFont->Fore(col);
 					SysFont->Transparent(true);
 					ds.Draw(&w->DebugDC, 120-ds.X(), yy);
 					w->DebugDC.Line(120, yy, x, y);
 					yy += 10 + ds.Y();
 				}
 				w->Invalidate();
 			}
 			*/
 			
 			m.Target = t;
 		}
 		
 		// if (!m.IsMove()) m.Trace("NonCapture");
 
 		if (_Over != m.Target)
 		{
 			if (_Over)
 				_Over->OnMouseExit(m);
 			_Over = m.Target;
 			if (_Over)
 				_Over->OnMouseEnter(m);
 		}
 			
 		auto Target = dynamic_cast<LView*>(_Over ? _Over : m.Target);
 		auto Lo = dynamic_cast<LLayout*>(Target);
 		LRect Client = Lo ? Lo->GetClient(false) : Target->LView::GetClient(false);
 
 		if (!Client.Valid() || Client.Overlap(m.x, m.y))
 		{
 			if (Move)
 			{
 				// Do cursor stuff
 				auto cursor = Target->GetCursor(m.x, m.y);
 				auto cc = NSCursor.arrowCursor;
 				if (cursor != LCUR_Normal)
 					cc = LCocoaCursor(cursor);
 				if (cc != NSCursor.currentSystemCursor)
 					[cc set];
 
 				// Move event
 				Target->OnMouseMove(m);
 			}
 			else if (!Wnd || Wnd->HandleViewMouse(Target, m))
 			{
 				// Click event
 				Target->OnMouseClick(m);
 			}
 		}
 		else return false;
 	}
 	
 	return true;
 }
 
 LRect &LView::GetClient(bool ClientSpace)
 {
 	int Edge = (Sunken() || Raised()) ? _BorderSize : 0;
 
 	static LRect c;
 	c = Pos;
 	c.Offset(-c.x1, -c.y1);
 	if (ClientSpace)
 	{
 		c.x2 -= Edge << 1;
 		c.y2 -= Edge << 1;
 	}
 	else
 	{
 		c.Inset(Edge, Edge);
 	}
 	
 	return c;
 }
 
 void LView::Quit(bool DontDelete)
 {
 	if (DontDelete)
 	{
 		Visible(false);
 	}
 	else
 	{
 		Detach();
 		delete this;
 	}
 }
 
 LPoint LView::Flip(LPoint p)
 {
 	auto Parent = GetParent() ? GetParent() : GetWindow();
 	if (Parent)
 	{
 		LRect r = Parent->GetClient(false);
 		p.y = r.y2 - p.y;
 	}
 	return p;
 }
 
 void LView::OnDealloc()
 {
 	#if LGI_VIEW_HASH
 	LockHandler(this, OpDelete);
 	#endif
 	SetPulse();
 	
 	for (auto c: Children)
 	{
 		auto gv = c->GetGView();
 		if (gv) gv->OnDealloc();
 	}
 }
 
 LRect LView::Flip(LRect p)
 {
 	auto Parent = GetParent() ? GetParent() : GetWindow();
 	if (Parent)
 	{
 		LRect r = Parent->GetClient(false);
 		int y2 = r.y2 - p.y1;
 		int y1 = y2 - p.Y() + 1;
 		p.Offset(0, y1-p.y1);
 	}
 	return p;
 }
 
 bool LView::SetPos(LRect &p, bool Repaint)
 {
 	Pos = p;
 	OnPosChange();
 
 	return true;
 }
 
 bool LView::Invalidate(LRect *rc, bool Repaint, bool Frame)
 {
 	if (!InThread())
 		return PostEvent(M_INVALIDATE, (LMessage::Param) (rc ? new LRect(*rc) : NULL), (LMessage::Param) this);
 
 	LRect r;
 	if (rc)
 		r = *rc;
 	else
 		r = GetClient();
 	if (!r.Valid())
 		return false;
 	
 	auto w = GetWindow();
 	LPopup *popup = NULL;
 	LViewI *v;
 	for (v = this; v; v = v->GetParent())
 	{
 		if (!v->Visible())
 			return true;
 		if (v == (LViewI*)w)
 			break;
 		if ((popup = dynamic_cast<LPopup*>(v)))
 			break;
 
 		auto p = v->GetPos();
 		r.Offset(p.x1, p.y1);
 	}
 
 	NSView *nsview = NULL;
 	if (popup)
 	 	nsview = popup->Handle().p.contentView;
 	else if (w)
 		nsview = w->Handle();
 	
 	if (!nsview)
 		return false;
 
 	#if 0
 	[nsview setNeedsDisplayInRect:v->GetGView()->Flip(r)];
 	printf("%s::Inval r=%s\n", GetClass(), r.GetStr());
 	#else
 	nsview.needsDisplay = true;
 	#endif
 	return true;
 }
 
 void LView::SetPulse(int Length)
 {
 	DeleteObj(d->PulseThread);
 	if (Length > 0)
 		d->PulseThread = new LPulseThread(this, Length);
 }
 
 LCursor LView::GetCursor(int x, int y)
 {
 	return LCUR_Normal;
 }
 
 LMessage::Result LView::OnEvent(LMessage *Msg)
 {
 	for (auto target: d->EventTargets)
 	{
 		if (target->Msgs.Length() == 0 ||
 			target->Msgs.Find(Msg->Msg()))
 			target->OnEvent(Msg);
 	}
 
 	switch (Msg->m)
 	{
 		case M_PULSE:
 		{
 			OnPulse();
 			break;
 		}
 		case M_CHANGE:
 		{
 			LViewI *Ctrl;
 			if (GetViewById((int)Msg->A(), Ctrl))
 			{
 				LNotification note((LNotifyType)Msg->B());
 				return OnNotify(Ctrl, note);
 			}
 			break;
 		}
 		case M_COMMAND:
 		{
 			static int count = 0;
 			if (++count == 2)
 				printf("%s:%i - M_COMMAND\n", _FL);
 			return OnCommand((int)Msg->A(), 0, (OsView)Msg->B());
 		}
 		case M_INVALIDATE:
 		{
 			LAutoPtr<LRect> rc((LRect*)Msg->A());
 			Invalidate(rc.Get());
 			break;
 		}
 		case M_THREAD_COMPLETED:
 		{
 			auto Th = (LThread*)Msg->A();
 			if (!Th)
 				break;
 
 			Th->OnComplete();
 			if (Th->GetDeleteOnExit())
 				delete Th;
 
 			return true;
 		}
 		default:
 		{
 			break;
 		}
 	}
 
 	return 0;
 }
 
 bool LView::PointToScreen(LPoint &p)
 {
 	LViewI *c = this;
 
 	// Find offset to window
 	while (	c &&
 			!dynamic_cast<LWindow*>(c) &&
 			!dynamic_cast<LPopup*>(c))
 	{
 		LRect pos = c->GetPos();
 		// printf("%s pos %s\n", c->GetClass(), pos.GetStr());
 		p.x += pos.x1;
 		p.y += pos.y1;
 		c = c->GetParent();
 	}
 	
 	if (c && c->WindowHandle())
 	{
 		NSWindow *w = c->WindowHandle();
 
 		LRect wFrame = w.frame;
 		LRect Screen(0, 0, -1, -1);
 		for (NSScreen *s in [NSScreen screens])
 		{
 			LRect pos = s.frame;
 			if (wFrame.Overlap(&pos))
 			{
 				Screen = pos;
 				break;
 			}
 		}
 		
 		if (!Screen.Valid())
 			return false;
 
 		LRect cli = c->GetClient();
 		p.y = cli.Y() - p.y;
 		NSRect i = {{(double)p.x, (double)p.y}, {0.0, 0.0}};
 		NSRect o = [w convertRectToScreen:i];
 		p.x = (int)o.origin.x;
 		p.y = Screen.Y() - (int)o.origin.y;
 	}
 	else return false;
 	
 	return true;
 }
 
 bool LView::PointToView(LPoint &p)
 {
 	LViewI *c = this;
 	int Ox = 0, Oy = 0;
 
 	// Find offset to window
 	while (c && c != c->GetWindow())
 	{
 		LView *gv = c->GetGView();
 		LRect cli = gv ? gv->LView::GetClient(false) : c->GetClient(false);
 		LRect pos = c->GetPos(); 
 		Ox += pos.x1 + cli.x1;
 		Oy += pos.y1 + cli.y1;
 		c = c->GetParent();
 	}
 	
 	// Apply window position
 	if (c && c->WindowHandle())
 	{
 		NSWindow *w = c->WindowHandle();
 
 		LRect wFrame = w.frame;
 		LRect Screen(0, 0, -1, -1);
 		for (NSScreen *s in [NSScreen screens])
 		{
 			LRect pos = s.frame;
 			if (wFrame.Overlap(&pos))
 			{
 				Screen = pos;
 				break;
 			}
 		}
 		
 		if (!Screen.Valid())
 			return false;
 
 		// Flip into top-down to bottom up:
 		NSRect i = {(double)p.x, (double)(Screen.Y()-p.y), 0.0, 0.0};
 		NSRect o = [w convertRectFromScreen:i];
 		p.x = (int)o.origin.x;
 		p.y = (int)o.origin.y;
 		
 		// Flip back into top down.. in window space
 		#if 1
 		p = c->GetGView()->Flip(p);
 		#else
 		LRect cli = c->GetClient();
 		p.y = cli.Y() - p.y;
 		#endif
 
 		// Now offset into view space.
 		p.x += Ox;
 		p.y += Oy;
 	}
 	else return false;
 	
 	return true;
 }
 
 #define DEBUG_GETMOUSE 0
 
 bool LView::GetMouse(LMouse &m, bool ScreenCoords)
 {
 	LViewI *w = GetWindow();
 	if (!w)
 		return false;
 
 	NSWindow *wh = w->WindowHandle();
 	if (!wh)
 		return false;
 	
 	#if DEBUG_GETMOUSE
 	GStringPipe log;
 	#endif
 
 	NSPoint pt = wh.mouseLocationOutsideOfEventStream;
 	m.x = pt.x;
 	m.y = pt.y;
 	m.Target = this;
 	
 	#if DEBUG_GETMOUSE
 	log.Print("Event=%i,%i", m.x, m.y);
 	#endif
 
 	LPoint p(pt.x, pt.y);
 	p.y = wh.contentView.frame.size.height - p.y;
 	#if DEBUG_GETMOUSE
 	log.Print(" Flipped=%i,%i", p.x, p.y);
 	#endif
 	if (ScreenCoords)
 	{
 		PointToScreen(p);
 		#if DEBUG_GETMOUSE
 		log.Print(" Screen=%i,%i", p.x, p.y);
 		#endif
 	}
 
 	m.x = p.x;
 	m.y = p.y;
 	m.Target = this;
 	
 	auto Btns = [NSEvent pressedMouseButtons];
 	m.Left(Btns & 0x1);
 	m.Right(Btns & 0x2);
 	m.Middle(Btns & 0x4);
 	
 	auto Mods = [NSEvent modifierFlags];
 	m.Ctrl  (Mods & NSEventModifierFlagControl);
 	m.Alt   (Mods & NSEventModifierFlagOption);
 	m.System(Mods & NSEventModifierFlagCommand);
 	m.Shift (Mods & NSEventModifierFlagShift);
 
 	// Find offset to window
 	for (LViewI *c = this; c && c != c->GetWindow(); c = c->GetParent())
 	{
 		LRect pos = c->GetPos();
 		m.x -= pos.x1;
 		m.y -= pos.y1;
 		#if DEBUG_GETMOUSE
 		log.Print(" Offset(%s,%i,%i)=%i,%i", c->GetClass(), pos.x1, pos.y1, m.x, m.y);
 		#endif
 	}
 
 	#if DEBUG_GETMOUSE
 	printf("    GetMouse: %s\n", log.NewGStr().Get());
 	#endif
 	return true;
 }
 
 bool LView::IsAttached()
 {
 	LWindow *w = GetWindow();
 	if (!w)
 		return false;
 	
 	if (w == this)
 		return WindowHandle() != 0;
 	
 	if (!d->AttachEvent)
 		return false;
 	
 	if (GetParent() != NULL)
 		return w->WindowHandle() != 0;
 
 	return false;
 }
 
 void BuildTabStops(LArray<LViewI*> &Stops, LViewI *v)
 {
 	if (v && v->Visible())
 	{
 		if (v->GetTabStop() && v->Enabled())
 			Stops.Add(v);
 
 		for (LViewI *c: v->IterateViews())
 			BuildTabStops(Stops, c);
 	}
 }
 
 void NextTabStop(LViewI *v, int dir)
 {
 	LArray<LViewI*> Stops;
 	BuildTabStops(Stops, v->GetWindow());
 	ssize_t Idx = Stops.IndexOf(v);
 	if (Idx >= 0)
 		Idx += dir;
 	else
 		Idx = 0;
 		
 	if (Idx < 0) Idx = Stops.Length() - 1;
 	else if (Idx >= Stops.Length()) Idx = 0;
 	if (Idx < Stops.Length())
 		Stops[Idx]->Focus(true);
 }
 
 void SetDefaultFocus(LViewI *v)
 {
 	LArray<LViewI*> Stops;
 	BuildTabStops(Stops, v->GetWindow());
 	
 	if (Stops.Length())
 	{
 		int Set = -1;
 		for (int i=0; i<Stops.Length(); i++)
 		{
 			if (Stops[i]->Focus())
 			{
 				Set = i;
 				break;
 			}
 		}
 		
 		if (Set < 0)
 			Set = 0;
 	
 		Stops[Set]->Focus(true);
 	}
 }
 
 int VirtualKeyToLgi(int Virt)
 {
 	switch (Virt)
 	{
 		// various
 		case 122: return LK_F1;
 		case 120: return LK_F2;
 		case 99: return LK_F3;
 		case 118: return LK_F4;
 		case 96: return LK_F5;
 		case 97: return LK_F6;
 		case 98: return LK_F7;
 		case 100: return LK_F8;
 		case 101: return LK_F9;
 		case 109: return LK_F10;
 		case 103: return LK_F11;
 		case 110: return LK_APPS;
 		case 111: return LK_F12;
 		
 		case 123: return LK_LEFT;
 		case 124: return LK_RIGHT;
 		case 125: return LK_DOWN;
 		case 126: return LK_UP;
 		case 114: return LK_INSERT;
 		case 116: return LK_PAGEUP;
 		case 121: return LK_PAGEDOWN;
 
 		case 53: return LK_ESCAPE;
 		case 51: return LK_BACKSPACE;
 		case 117: return LK_DELETE;
 		
 		case 115: return LK_HOME;
 		case 119: return LK_END;
 		
 		// whitespace
 		case 76: return LK_RETURN;
 		case 36: return '\r';
 		case 48: return '\t';
 		case 49: return ' ';
 		
 		// delimiters
 		case 27: return '-';
 		case 24: return '=';
 		case 42: return '\\';
 		case 47: return '.';
 		case 50: return '`';
 		
 		// digits
 		case 18: return '1';
 		case 19: return '2';
 		case 20: return '3';
 		case 21: return '4';
 		case 23: return '5';
 		case 22: return '6';
 		case 26: return '7';
 		case 28: return '8';
 		case 25: return '9';
 		case 29: return '0';
 		
 		// alpha
 		case 0: return 'a';
 		case 11: return 'b';
 		case 8: return 'c';
 		case 2: return 'd';
 		case 14: return 'e';
 		case 3: return 'f';
 		case 5: return 'g';
 		case 4: return 'h';
 		case 34: return 'i';
 		case 38: return 'j';
 		case 40: return 'k';
 		case 37: return 'l';
 		case 46: return 'm';
 		case 45: return 'n';
 		case 31: return 'o';
 		case 35: return 'p';
 		case 12: return 'q';
 		case 15: return 'r';
 		case 1: return 's';
 		case 17: return 't';
 		case 32: return 'u';
 		case 9: return 'v';
 		case 13: return 'w';
 		case 7: return 'x';
 		case 16: return 'y';
 		case 6: return 'z';
 		
 		default:
 			printf("%s:%i - unimplemented virt->lgi code mapping: %d\n", _FL, (unsigned)Virt);
 			break;
 	}
 	
 	return 0;
 }
 
 #if 0
 static int GetIsChar(LKey &k, int mods)
 {
 	return k.IsChar =	(mods & 0x100) == 0 &&
 	(
 		k.c16 >= ' ' ||
 		k.c16 == VK_RETURN ||
 		k.c16 == VK_TAB ||
 		k.c16 == VK_BACKSPACE
 	);
 }
 #endif
 
 
 bool LView::_Attach(LViewI *parent)
 {
 	LAutoPool Pool;
 	if (!parent)
 	{
 		LAssert(0);
 		return false;
 	}
 
 	d->ClassName = GetClass();
 	
 	d->ParentI = parent;
 	d->Parent = d->ParentI ? parent->GetGView() : NULL;
 
 	LAssert(!_InLock);
 	_Window = d->GetParent() ? d->GetParent()->GetWindow() : 0;
 	if (_Window)
 		_Lock = _Window->_Lock;
 
 	auto p = d->GetParent();
 	if (p)
 	{
 		LWindow *w = dynamic_cast<LWindow*>(p);
 		NSView *ph = nil;
 		if (w)
 			ph = w->WindowHandle().p.contentView;
 
 		if (!d->AttachEvent)
 		{
 			d->AttachEvent = true;
 			OnCreate();
 		}
 	}
 	else
 	{
 		LAssert(0);
 	}
 
 	if (!p->Children.HasItem(this))
 	{
 		p->Children.Add(this);
 		OnAttach();
 	}
 
 	return true;
 }
 
 bool LView::Attach(LViewI *parent)
 {
 	if (_Attach(parent))
 	{
 		if (d->Parent && !d->Parent->HasView(this))
 			d->Parent->AddView(this);
 		
 		d->Parent->OnChildrenChanged(this, true);
 		return true;
 	}
 	
 	LgiTrace("%s:%i - Attaching '%s' failed.\n", _FL, GetClass());
 	return false;
 }
 
 void LView::_Delete()
 {
 	LAutoPool Pool;
 	if (_Over == this) _Over = 0;
 	if (_Capturing == this) _Capturing = 0;
 
 	if (LAppInst && LAppInst->AppWnd == this)
 	{
 		LAppInst->AppWnd = NULL;
 	}
 
 	SetPulse();
 	Pos.ZOff(-1, -1);
 
 	LViewI *c;
 	auto it = Children.begin();
 	while ((c = *it))
 	{
 		LViewI *p = c->GetParent();
 		if (p != (LViewI*)this)
 		{
 			printf("Error: LView::_Delete, child not attached correctly: %p(%s) Parent: %p(%s)\n",
 				c, c->Name(),
 				c->GetParent(), c->GetParent() ? c->GetParent()->Name() : "");
 			Children.Delete(it);
 		}
 
 		DeleteObj(c);
 	}
 	
 	Detach();
 }
 
 bool LView::Detach()
 {
 	LAutoPool Pool;
 	bool Status = false;
 
 	// Detach view
 	if (_Window)
 	{
 		LWindow *Wnd = dynamic_cast<LWindow*>(_Window);
 		if (Wnd)
 			Wnd->SetFocus(this, LWindow::ViewDelete);
 		_Window = NULL;
 	}
 
 	if (d->Parent)
 	{
 		// Remove the view from the parent
 		int D = 0;
 		while (d->Parent->HasView(this))
 		{
 			d->Parent->DelView(this);
 			D++;
 		}
 
 		if (D > 1)
 		{
 			printf("%s:%i - Error: View %s(%p) was in %s(%p) list %i times.\n",
 				_FL, GetClass(), this, d->Parent->GetClass(), d->Parent, D);
 		}
 
 		d->Parent->OnChildrenChanged(this, false);
 		d->Parent = NULL;
 	}
 
 	Status = true;
 
 	return Status;
 }
 
 ////////////////////////////////
 uint32 CursorData[] = {
 0x02020202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020102, 0x02020202, 0x02020202, 0x01010101, 0x01010101, 0x01010101, 0x02020202, 0x02020202, 0x02010101, 0x02010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010102, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020102, 0x01020202, 0x02020202, 0x02020202, 0x02020202, 0x01010101, 0x01010101, 0x02020201, 0x02020202, 0x01010101, 0x01010101, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020102, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02010102, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x01010101, 0x02020202, 0x02020202, 0x02020101, 0x02020202, 
 0x02020202, 0x02020202, 0x02020202, 0x02020101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x01000000, 0x02020202, 0x02020202, 0x01000001, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020101, 0x01020202, 0x02020201, 0x02020202, 0x02020202, 0x00000102, 0x00000000, 0x02020201, 0x02020202, 0x00000001, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 
 0x02020202, 0x02020202, 0x00010102, 0x00000000, 0x02020101, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x00010001, 0x00010001, 0x01000001, 0x02020202, 0x02020202, 0x00010102, 0x02020101, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x00010202, 0x00000000, 0x02020201, 0x02020202, 0x00000001, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 
 0x00010202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02010000, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x01000102, 0x00000100, 0x02010000, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x00000000, 0x02020100, 0x02020202, 0x02020202, 0x00010202, 0x02020100, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x02020201, 0x02020202, 0x00000001, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x00000000, 
 0x02020201, 0x02020202, 0x02020202, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x00010101, 0x01000000, 0x02020202, 0x00000001, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x00010202, 0x00000001, 0x02020100, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x00000000, 0x02010000, 0x02020202, 0x02020202, 0x00000102, 0x01010100, 0x01010101, 0x01000000, 0x02020202, 0x02020201, 0x00010202, 0x00000000, 0x02020201, 0x02020202, 
 0x00000001, 0x02010000, 0x02020202, 0x02020201, 0x02020202, 0x02020202, 0x01010102, 0x01010001, 0x02020101, 0x02020202, 0x02020202, 0x01020201, 0x02010000, 0x02020102, 0x02020202, 0x02020202, 0x01010101, 0x01010100, 0x02020201, 0x02020202, 0x02020202, 0x01000001, 0x02020101, 0x02020202, 0x02020202, 0x00010202, 0x01010000, 0x01020202, 0x00000001, 0x02020201, 0x00000001, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x01010101, 0x01000001, 0x01010101, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 
 0x00000000, 0x00000000, 0x02020201, 0x02020101, 0x00000102, 0x00000100, 0x02020201, 0x02020202, 0x01000001, 0x01000000, 0x01020202, 0x02020201, 0x02020202, 0x02020202, 0x02020201, 0x02010001, 0x02010202, 0x02020202, 0x01020202, 0x01020201, 0x02010000, 0x02010102, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x01010000, 0x02020101, 0x02020202, 0x00000102, 0x01000000, 0x02020202, 0x00000102, 0x02020100, 0x00000001, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 
 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x02020201, 0x02010001, 0x00000001, 0x00010201, 0x02020201, 0x02020202, 0x02010001, 0x00000001, 0x00010201, 0x02020201, 0x02020202, 0x01020202, 0x02020201, 0x02010001, 0x01010202, 0x02020202, 0x00010202, 0x01020201, 0x02010000, 0x01000102, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02010102, 0x00000001, 0x00000000, 0x02010000, 0x02020202, 0x00000102, 0x00000001, 0x02020201, 0x00010202, 0x02020100, 0x00000001, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 
 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x01010100, 0x01010101, 0x01000000, 0x02020202, 0x01000001, 0x01000000, 0x01020202, 0x02020201, 0x02020202, 0x02020101, 0x00000102, 0x00000100, 0x02020201, 0x02020202, 0x00010202, 0x02020201, 0x02010001, 0x00010202, 0x02020201, 0x00000102, 0x01010101, 0x01010000, 0x00000101, 0x02020201, 0x01010101, 0x01010101, 0x01010100, 0x01010101, 0x02020201, 0x01000001, 0x00000001, 0x00000000, 0x02010000, 0x02020202, 0x00000001, 0x00000101, 0x02020100, 0x00010202, 0x02010000, 0x00000001, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02020201, 
 0x02020202, 0x02020202, 0x01010102, 0x01010101, 0x01010001, 0x01010101, 0x02020101, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02020100, 0x01020202, 0x02010000, 0x02020202, 0x00000001, 0x02010000, 0x02020202, 0x02020201, 0x02020202, 0x02020201, 0x00010202, 0x00000000, 0x02020201, 0x02020202, 0x00000102, 0x01010101, 0x01010001, 0x00010101, 0x02020100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x02020100, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x02020201, 0x00000001, 0x00000000, 0x00000000, 0x02010000, 0x02020202, 0x01000001, 0x00010202, 0x02010000, 0x01020202, 0x02010000, 0x00000001, 0x00000000, 0x02020100, 0x02020202, 0x02020202, 
 0x00000001, 0x00000000, 0x02020100, 0x02020202, 0x02020202, 0x01010101, 0x01010100, 0x02020201, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x02010000, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x01020202, 0x02020100, 0x02020202, 0x00000001, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x02020201, 0x02020202, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x02010000, 0x00000102, 0x01010101, 0x01010000, 0x00000101, 0x02020201, 0x00000001, 0x00000000, 0x00000000, 0x00000000, 0x02020201, 0x00000102, 0x00000000, 0x00000000, 0x02010000, 0x02020202, 0x01000001, 0x01020202, 
 0x01000000, 0x01020202, 0x02010000, 0x00000001, 0x00000000, 0x02010000, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02010000, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x01010102, 0x01010101, 0x01010001, 0x01010101, 0x02020101, 0x01020202, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020101, 0x01020202, 0x02020201, 0x02020202, 0x00000001, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x00000000, 0x02020201, 0x02020202, 0x00000102, 0x01010101, 0x01010001, 0x00010101, 0x02020100, 0x00010202, 0x01020201, 0x02010000, 0x01000102, 0x02020202, 0x01010101, 0x01010101, 0x01010100, 0x01010101, 
 0x02020201, 0x00010202, 0x00000000, 0x00000000, 0x02010000, 0x02020202, 0x01000001, 0x02020202, 0x00000001, 0x01020201, 0x02010000, 0x00000001, 0x01000000, 0x02010101, 0x02020202, 0x02020202, 0x00000001, 0x01000000, 0x02010101, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x00010202, 0x01000001, 0x02020100, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x01010101, 0x01000001, 0x01010101, 0x02020202, 0x02020202, 0x02020202, 0x02020102, 0x01020202, 0x02020202, 0x02020202, 0x00000001, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x00000000, 0x02020201, 0x02020202, 0x00010202, 0x02020201, 0x02010001, 0x00010202, 0x02020201, 0x01020202, 
 0x01020201, 0x02010000, 0x02010102, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x00000000, 0x02010000, 0x02020202, 0x00000001, 0x02020201, 0x00000102, 0x00010100, 0x02010000, 0x00000001, 0x01000001, 0x01020202, 0x01010101, 0x01010101, 0x00000001, 0x01000001, 0x01020202, 0x01010101, 0x01010101, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x01000102, 0x01000001, 0x02010001, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x00000000, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01010101, 0x01010101, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x01010101, 0x01010101, 
 0x02020201, 0x02020202, 0x01020202, 0x02020201, 0x02010001, 0x01010202, 0x02020202, 0x02020202, 0x01020201, 0x02010000, 0x02020102, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02020100, 0x02020202, 0x00000102, 0x02020201, 0x00010202, 0x00010000, 0x02020100, 0x01000001, 0x01000001, 0x01020202, 0x00000000, 0x01000000, 0x01000001, 0x01000001, 0x01020202, 0x00000000, 0x01000000, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x00010001, 0x00000000, 0x01000100, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x00000000, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 
 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020201, 0x02010001, 0x02010202, 0x02020202, 0x02020202, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x01010101, 0x01010100, 0x02020201, 0x02020202, 0x02020202, 0x00000102, 0x00000000, 0x02020201, 0x02020202, 0x00000102, 0x02020100, 0x01020202, 0x00000000, 0x02020100, 0x02010001, 0x00000102, 0x01020201, 0x01010000, 0x01000001, 0x02010001, 0x00000102, 0x01020201, 0x01010100, 0x01000001, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x01000000, 0x02020202, 0x02020202, 0x00010202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 
 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01010102, 0x01010001, 0x02020101, 0x02020202, 0x02020202, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x00000102, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x01010202, 0x01010101, 0x02020202, 0x02020202, 0x00010202, 0x01010000, 0x01020202, 0x00000001, 0x02020201, 0x02020101, 0x00000102, 0x01020201, 0x00000100, 0x01000100, 0x02020101, 0x00000102, 0x01020201, 0x01000100, 0x01000100, 0x01020202, 0x02020101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x01010101, 0x01010101, 0x01010101, 0x02020202, 
 0x02020202, 0x00010102, 0x02020101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x00000000, 0x02020201, 0x02020202, 0x02020202, 0x01020202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x00010202, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x00010101, 0x01000000, 0x02020202, 0x02020202, 0x00010202, 0x01020100, 0x00000100, 0x01000000, 0x02020202, 0x00010202, 0x01020100, 0x01000100, 0x01000100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 
 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01000001, 0x02010000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010102, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02010101, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x02020100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00000001, 0x00000000, 0x02010000, 0x02020202, 0x02020202, 0x00010202, 0x01020100, 0x00000100, 0x01000100, 0x02020202, 0x00010202, 0x01020100, 
 0x01000100, 0x01000100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010101, 0x02010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02010001, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020201, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x00010102, 0x00000000, 0x02020101, 0x02020202, 
 0x02020202, 0x01020202, 0x01020201, 0x01010000, 0x01000001, 0x02020202, 0x01020202, 0x01020201, 0x01000100, 0x01000100, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020102, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020102, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 
 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x01010101, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x01000000, 0x02020202, 0x02020202, 0x01020202, 0x00000000, 0x01000000, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 
 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x02020202, 0x01020202, 0x01010101, 0x01010101, 0x02020202, 0x02020202, 0x01020202, 0x01010101, 0x01010101, 
 };