Thread: [ZooLib-checkins] SF.net SVN: zoolib:[858] trunk/zoolib/source/cxx (Page 2)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 858
          http://zoolib.svn.sourceforge.net/zoolib/?rev=858&view=rev
Author:   agreen
Date:     2009-07-19 17:46:29 +0000 (Sun, 19 Jul 2009)

Log Message:
-----------
Move to cxx_old.

Added Paths:
-----------
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Asset.cpp
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Asset.h
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Graphics.cpp
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Graphics.h
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Mac_HL.cpp
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Mac_HL.h
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Mac_LL.cpp
    trunk/zoolib/source/cxx_old/zoolib/ZUtil_Mac_LL.h

Removed Paths:
-------------
    trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.cpp
    trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.h
    trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.cpp
    trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.h
    trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_HL.cpp
    trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_HL.h
    trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_LL.cpp
    trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_LL.h

Deleted: trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.cpp
===================================================================

--- trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.cpp	2009-07-19 17:42:52 UTC (rev 857)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.cpp	2009-07-19 17:46:29 UTC (rev 858)
@@ -1,540 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-Copyright (c) 2001 Andrew Green and Learning in Motion, Inc.
-http://www.zoolib.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------------------------- */
-
-#include "zoolib/ZUtil_Asset.h"
-
-#include "zoolib/ZCONFIG_SPI.h"
-
-#include "zoolib/ZAsset_MacOS.h"
-#include "zoolib/ZAsset_POSIX.h"
-#include "zoolib/ZAsset_Std.h"
-#include "zoolib/ZAsset_Win.h"
-#include "zoolib/ZFile_POSIX.h"
-#include "zoolib/ZMacOSX.h"
-#include "zoolib/ZStream_Mac.h"
-#include "zoolib/ZStream_PageBuffered.h"
-#include "zoolib/ZString.h" // For pascal string conversions
-
-#if ZCONFIG_SPI_Enabled(POSIX)
-#	include <sys/types.h> // For lseek
-#	include <fcntl.h> // For open
-#	include <unistd.h> // For lseek
-#endif
-
-#if ZCONFIG_SPI_Enabled(Win)
-#	include "zoolib/ZUnicode.h"
-#	include "zoolib/ZUtil_Win.h"
-#endif
-
-#if ZCONFIG_SPI_Enabled(Carbon)
-#	include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
-#endif
-
-NAMESPACE_ZOOLIB_BEGIN
-
-using std::string;
-using std::vector;
-
-/**
-\namespace ZUtil_Asset
-\brief Functions mainly concerned with instantiating assets from data in the executable
-file or in external files.
-\ingroup group_Asset
-*/
-
-// =================================================================================================
-
-#if ZCONFIG_SPI_Enabled(POSIX)
-
-static const char sMagicText[] = "ZooLib Appended Data v1.0";
-static const size_t sMagicTextSize = sizeof(sMagicText);
-
-static bool sGetAssetTreeInfoFromExecutable(const string& iName, int& oFD, size_t& oStart, size_t& oLength)
-	{
-	ZRef<ZFileLoc_POSIX> theFileLoc = ZFileLoc_POSIX::sGet_App();
-	if (!theFileLoc)
-		return false;
-
-	string thePath = theFileLoc->pGetPath();
-
-	oFD = ::open(thePath.c_str(), O_RDONLY);
-
-	if (oFD < 0)
-		return false;
-
-	try
-		{
-		// We don't want theStream to adopt the file descriptor \a oFD.
-		ZStreamRPos_File_POSIX theStream(oFD, false);
-
-		size_t theSize = theStream.GetSize();
-		const size_t trailerSize = sMagicTextSize + sizeof(int32) + sizeof(int32);
-
-		// Check for there being at least enough room for an empty trailer.
-		if (theSize >= trailerSize)
-			{
-			// There's enough space for our trailer, consisting of the magic text
-			// and the two 32 bit offsets to asset data and the table of contents.
-			theStream.SetPosition(theSize - trailerSize);
-			size_t offsetOfData = theStream.ReadInt32();
-			size_t offsetOfTOC = theStream.ReadInt32();
-			if (theSize >= trailerSize + offsetOfData)
-				{
-				// The data offset is within the file.
-				char checkedText[sMagicTextSize];
-				theStream.Read(checkedText, sMagicTextSize);
-				if (0 == memcmp(checkedText, sMagicText, sMagicTextSize))
-					{
-					// The magic text matches.
-					if (theSize >= trailerSize + offsetOfTOC)
-						{
-						// The table of contents is also within the file.
-						theStream.SetPosition(theSize - trailerSize - offsetOfTOC);
-						size_t countOfChunks = theStream.ReadInt32();
-						for (size_t x = 0; x < countOfChunks; ++x)
-							{
-							oStart = theStream.ReadInt32() + theSize - trailerSize - offsetOfData;
-							oLength = theStream.ReadInt32();
-							string currentName;
-							if (size_t nameLength = theStream.ReadInt32())
-								{
-								currentName.resize(nameLength);
-								theStream.Read(&currentName[0], nameLength);
-								}
-							if (iName == currentName)
-								return true;
-							}
-						}
-					}
-				}
-			}
-		}
-	catch (...)
-		{}
-	::close(oFD);
-	return false;
-	}
-
-#endif // ZCONFIG_SPI_Enabled(POSIX)
-
-// =================================================================================================
-
-#if ZCONFIG_SPI_Enabled(Win)
-
-#if defined(__MINGW32__)
-
-// MinGW screws up its headers -- callback functions for A and W have the same signatures,
-// which is okay if you're only building for one or the other. We build for both, so we
-// provide faked-out A and W definitions.
-
-typedef ENUMRESNAMEPROC ENUMRESNAMEPROCA;
-typedef ENUMRESNAMEPROC ENUMRESNAMEPROCW;
-
-#endif //  defined(__MINGW32__)
-
-static BOOL CALLBACK sEnumResNameCallbackW(HMODULE iHMODULE, const UTF16* iType, UTF16* iName, LONG_PTR iParam)
-	{
-	if (iName[0])
-		reinterpret_cast<vector<string>*>(iParam)->push_back(ZUnicode::sAsUTF8(iName));
-
-	return TRUE;
-	}
-
-static BOOL CALLBACK sEnumResNameCallbackA(HMODULE iHMODULE, const char* iType, char* iName, LONG_PTR iParam)
-	{
-	if (iName[0])
-		reinterpret_cast<vector<string>*>(iParam)->push_back(iName);
-
-	return TRUE;
-	}
-
-#endif // ZCONFIG_SPI_Enabled(Win)
-
-
-// =================================================================================================
-
-/**
-\fn void ZUtil_Asset::sGetAssetTreeNamesFromExecutable(vector<string>&)
-
-\brief Puts the names of all assets in the executable into \a oAssetTreeNames.
-
-As part of the build process multiple zao chunks can be incorporated
-into the executable. On Mac and Windows it's done by creating resources of
-type 'ZAO_' with whatever names you choose.
-
-On POSIX zac, the ZooLib Asset Compiler, physically appends the zao chunks
-to the executable, followed by a table of contents and then a trailer containing
-key offsets and magic text. The file thus looks like this:
-
-\verbatim
-Regular executable data.
-(Normal end of file, everything following is simply 'bolted' onto
-the end of the file, and thus will get lost when strip is used)
-zao chunk 0
-zao chunk 1
-...
-zao chunk n
-(Table of contents)
-	Count of chunks
-		Distance from start of chunk 0 to start of this chunk
-		Number of bytes in chunk
-		Length of chunk name
-		Chunk name
-(Trailer)
-	Distance from trailer start to first chunk
-	Distance from trailer start to table of contents
-	Magic text: "ZooLib Appended Data v1.0"
-\endverbatim
-*/
-void ZUtil_Asset::sGetAssetTreeNamesFromExecutable(vector<string>& oAssetTreeNames)
-	{
-	oAssetTreeNames.clear();
-
-#if ZCONFIG_SPI_Enabled(Carbon)
-
-	short count = ::CountResources('ZAO_');
-	::SetResLoad(false);
-	for (short index = 1; index <= count; ++index)
-		{
-		if (Handle theResourceHandle = ::GetIndResource('ZAO_', index))
-			{
-			short theResourceID;
-			ResType theResourceType;
-			Str255 theResourceName;
-			::GetResInfo(theResourceHandle, &theResourceID, &theResourceType, theResourceName);
-			string resName = ZString::sFromPString(theResourceName);
-			if (resName.size())
-				{
-				vector<string>::iterator theIter = lower_bound(oAssetTreeNames.begin(), oAssetTreeNames.end(), resName);
-				if (theIter == oAssetTreeNames.end() || *theIter != resName)
-					oAssetTreeNames.insert(theIter, resName);
-				}
-			}
-		}
-	::SetResLoad(true);
-
-#elif ZCONFIG_SPI_Enabled(Win)
-
-	if (ZUtil_Win::sUseWAPI())
-		{
-		::EnumResourceNamesW(::GetModuleHandleW(0), L"ZAO_",
-			(ENUMRESNAMEPROCW)sEnumResNameCallbackW, reinterpret_cast<LONG_PTR>(&oAssetTreeNames));
-		}
-	else
-		{
-		::EnumResourceNamesA(::GetModuleHandleA(0), "ZAO_",
-			(ENUMRESNAMEPROCA)sEnumResNameCallbackA, reinterpret_cast<LONG_PTR>(&oAssetTreeNames));
-		}
-
-#elif ZCONFIG_SPI_Enabled(POSIX)
-
-	if (ZRef<ZStreamerRPos> theStreamer = ZFileSpec::sApp().OpenRPos())
-		{
-		const ZStreamRPos& theStream = theStreamer->GetStreamRPos();
-		size_t theSize = theStream.GetSize();
-		size_t trailerSize = sMagicTextSize + sizeof(int32) + sizeof(int32);
-		// Check for there being at least enough room for an empty trailer
-		if (theSize >= trailerSize)
-			{
-			// Look for our trailer
-			theStream.SetPosition(theSize - trailerSize);
-			size_t offsetOfData = theStream.ReadInt32();
-			size_t offsetOfTOC = theStream.ReadInt32();
-			if (theSize >= trailerSize + offsetOfData)
-				{
-				char checkedText[sMagicTextSize];
-				theStream.Read(checkedText, sMagicTextSize);
-				if (0 == memcmp(checkedText, sMagicText, sMagicTextSize))
-					{
-					theStream.SetPosition(theSize - trailerSize - offsetOfTOC);
-					size_t countOfChunks = theStream.ReadInt32();
-					for (size_t x = 0; x < countOfChunks; ++x)
-						{
-						theStream.ReadInt32(); // Skip the data offset
-						theStream.ReadInt32(); // Skip the data length
-						size_t nameLength = theStream.ReadInt32();
-						string currentName;
-						currentName.resize(nameLength);
-						theStream.Read(&currentName[0], nameLength);
-						oAssetTreeNames.push_back(currentName);
-						}
-					}
-				}
-			}
-		}
-
-#endif
-	}
-
-// =================================================================================================
-
-/**
-\fn ZRef<ZAssetTree> ZUtil_Asset::sGetAssetTreeFromExecutable(const string&)
-
-\brief Return a new ZAssetTree instance referencing the zao data
-named \a iAssetTreeName in the executable.
-
-It is important to recognize that each invocation of this method creates
-a \em new instance of ZAssetTree. It may therefore load or map all the data contained in
-the tree.  Your application will probably call this method indirectly by calling
-ZUtil_Asset::sGetAssetRootFromExecutable, but it should do so only once, keeping the asset
-in a global static or in an instance variable of your application object (or equivalent).
-
-\sa ZUtil_Asset::sGetAssetTreeNamesFromExecutable
-*/
-ZRef<ZAssetTree> ZUtil_Asset::sGetAssetTreeFromExecutable(const string& iAssetTreeName)
-	{
-#if ZCONFIG_SPI_Enabled(Carbon)
-
-	Str255 theResourceName;
-	ZString::sToPString(iAssetTreeName, theResourceName, 255);
-
-	if (ZMacOSX::sIsMacOSX())
-		{
-		// This variant sucks the entire resource into memory, which is what
-		// MacOS X does anyway even when SetResLoad is false.
-		if (Handle theResourceHandle = ::GetNamedResource('ZAO_', theResourceName))
-			return new ZAssetTree_MacOS_Resource(theResourceHandle, true);
-		}
-	else
-		{
-		// This variant uses the partial resource API to randomly access the resource
-		// without pulling the entire contents into memory. We also interpose a
-		// ZStreamerRPos_PageBuffered with eight 1K buffers to improve the performance
-		// of small reads.
-		::SetResLoad(false);
-		Handle theResourceHandle = ::GetNamedResource('ZAO_', theResourceName);
-		::SetResLoad(true);
-		if (theResourceHandle)
-			{
-			ZRef<ZStreamerRPos> theStreamer = new ZStreamerRPos_Mac_PartialResource(theResourceHandle, true);
-			theStreamer = new ZStreamerRPos_PageBuffered(8, 1024, theStreamer);
-			return new ZAssetTree_Std_Streamer(theStreamer);
-			}
-		}
-
-#elif ZCONFIG_SPI_Enabled(Win)
-
-	HINSTANCE theHINSTANCE;
-	if (ZUtil_Win::sUseWAPI())
-		theHINSTANCE = ::GetModuleHandleW(nullptr);
-	else
-		theHINSTANCE = ::GetModuleHandleA(nullptr);
-
-	return new ZAssetTree_Win_MultiResource(theHINSTANCE, "ZAO_", iAssetTreeName);
-
-#elif ZCONFIG_SPI_Enabled(POSIX)
-
-	int theFD;
-	size_t theStart, theLength;
-	if (sGetAssetTreeInfoFromExecutable(iAssetTreeName, theFD, theStart, theLength))
-		return new ZAssetTree_POSIX_MemoryMapped(theFD, true, theStart, theLength);
-
-#elif ZCONFIG_SPI_Enabled(BeOS)
-
-	// AG 2000-01-28. I know, I know, this is not thread safe.
-	static BResources* sBResources = nullptr;
-	if (!sBResources)
-		{
-		app_info info;
-		if (B_OK == be_roster->GetRunningAppInfo(be_app->Team(), &info))
-			{
-			BFile theBFile(&info.ref, O_RDONLY);
-			if (B_OK == theBFile.InitCheck())
-				sBResources = new BResources(&theBFile);
-			}
-		}
-
-	if (sBResources)
-		{
-		size_t theSize;
-		if (const void* theResourceData = sBResources->LoadResource((type_code)'ZAO_', iAssetTreeName.c_str(), &theSize))
-			return new ZAssetTree_Std_Memory_StaticData(theResourceData, theSize);
-		}
-
-#endif
-
-	return ZRef<ZAssetTree>();
-	}
-
-
-/**
-\fn ZAsset ZUtil_Asset::sGetAssetRootFromExecutable(const string&)
-
-\brief Return an asset representing the root asset in the tree in the
-executable file named \a iAssetTreeName.
-
-\sa ZUtil_Asset::sGetAssetTreeFromExecutable.
-*/
-ZAsset ZUtil_Asset::sGetAssetRootFromExecutable(const string& iAssetTreeName)
-	{
-	if (ZRef<ZAssetTree> theAssetTree = sGetAssetTreeFromExecutable(iAssetTreeName))
-		return theAssetTree->GetRoot();
-	return ZAsset();
-	}
-
-
-/**
-\fn ZRef<ZAssetTree> ZUtil_Asset::sGetAssetTreeFromFileSpec(const ZFileSpec&)
-
-\brief Return a new ZAssetTree instance referencing the zao data in the
-file referenced by \a iFileSpec.
-
-It is important to recognize that each invocation of this method creates
-a \em new instance of ZAssetTree. It may therefore load or map all the data contained in
-the tree.  Your application will probably call this method indirectly by calling
-ZUtil_Asset::sGetAssetRootFromFileSpec, but it should do so only once, keeping the asset
-in a global static or in an instance variable of your application object (or equivalent).
-
-\sa ZUtil_Asset::sGetAssetTreeNamesFromExecutable
-*/
-ZRef<ZAssetTree> ZUtil_Asset::sGetAssetTreeFromFileSpec(const ZFileSpec& iFileSpec)
-	{
-	ZRef<ZAssetTree> theAssetTree;
-
-#if ZCONFIG_SPI_Enabled(Carbon)
-
-	try
-		{
-		if (ZRef<ZStreamerRPos> theStreamer = iFileSpec.OpenRPos())
-			theAssetTree = new ZAssetTree_Std_Streamer(new ZStreamerRPos_PageBuffered(8, 1024, theStreamer));
-		}
-	catch (...)
-		{}
-
-#elif ZCONFIG_SPI_Enabled(Win)
-
-	try
-		{
-		string thePath = iFileSpec.AsString_Native();
-		HANDLE theFileHANDLE;
-		if (ZUtil_Win::sUseWAPI())
-			{
-			theFileHANDLE = ::CreateFileW(ZUnicode::sAsUTF16(thePath).c_str(), // the path
-											GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-											nullptr, // No security attributes
-											OPEN_EXISTING, // Open the file only if it exists
-											FILE_ATTRIBUTE_NORMAL, // No special attributes
-											nullptr);// No template file
-			}
-		else
-			{
-			theFileHANDLE = ::CreateFileA(thePath.c_str(), // the path
-											GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
-											nullptr, // No security attributes
-											OPEN_EXISTING, // Open the file only if it exists
-											FILE_ATTRIBUTE_NORMAL, // No special attributes
-											nullptr);// No template file
-			}
-
-		if (theFileHANDLE != INVALID_HANDLE_VALUE)
-			{
-			DWORD sizeHigh;	
-			DWORD sizeLow = ::GetFileSize(theFileHANDLE, &sizeHigh);
-			theAssetTree = new ZAssetTree_Win_MemoryMapped(theFileHANDLE, true, 0, sizeLow);
-			}
-		}
-	catch (...)
-		{}
-
-#elif ZCONFIG_SPI_Enabled(POSIX)
-
-	try
-		{
-		int theFD = ::open(iFileSpec.AsString_Native().c_str(), O_RDONLY);
-		if (theFD >= 0)
-			{
-			int theLength = ::lseek(theFD, 0, SEEK_END);
-			theAssetTree = new ZAssetTree_POSIX_MemoryMapped(theFD, true, 0, theLength);
-			}
-		}
-	catch (...)
-		{}
-
-#endif
-
-	if (!theAssetTree)
-		{
-		// We failed to get the asset tree instantiated, either because we just fell through
-		// to here directly (BeOS), or because an exception occurred.
-		if (ZRef<ZStreamerRPos> theStreamer = iFileSpec.OpenRPos())
-			{
-			try
-				{
-				theAssetTree = new ZAssetTree_Std_Streamer(theStreamer);
-				}
-			catch (...)
-				{}
-			}
-		}
-
-	return theAssetTree;
-	}
-
-
-/**
-\fn ZAsset ZUtil_Asset::sGetAssetRootFromFileSpec(const ZFileSpec&)
-
-\brief Return an asset representing the root asset in the tree
-in the file referenced by \a iFileSpec.
-
-\sa ZUtil_Asset::sGetAssetTreeFromFileSpec
-*/
-ZAsset ZUtil_Asset::sGetAssetRootFromFileSpec(const ZFileSpec& iFileSpec)
-	{
-	if (ZRef<ZAssetTree> theAssetTree = sGetAssetTreeFromFileSpec(iFileSpec))
-		return theAssetTree->GetRoot();
-	return ZAsset();
-	}
-
-ZAsset ZUtil_Asset::sCreateOverlay(const vector<ZAsset>& iAssets, bool iLowestToHighest)
-	{
-	if (iAssets.size() == 0)
-		return ZAsset();
-
-	if (iAssets.size() == 1)
-		return iAssets.front();
-
-	// ZAssetRep_Overlay requires that we give it a list of asset reps, ordered from
-	// highest priority to lowest. If \param iLowestToHighest is true then we have to
-	// build the vector in reverse order.
-
-	vector<ZRef<ZAssetRep> > assetReps;
-	if (iLowestToHighest)
-		{
-		for (vector<ZAsset>::const_reverse_iterator i = iAssets.rbegin(); i != iAssets.rend(); ++i)
-			{
-			if (ZRef<ZAssetRep> theRep = (*i).GetRep())
-				assetReps.push_back(theRep);
-			}
-		}
-	else
-		{
-		for (vector<ZAsset>::const_iterator i = iAssets.begin(); i != iAssets.end(); ++i)
-			{
-			if (ZRef<ZAssetRep> theRep = (*i).GetRep())
-				assetReps.push_back(theRep);
-			}
-		}
-	
-	return ZAsset(new ZAssetRep_Overlay(assetReps));
-	}
-
-NAMESPACE_ZOOLIB_END

Deleted: trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.h	2009-07-19 17:42:52 UTC (rev 857)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Asset.h	2009-07-19 17:46:29 UTC (rev 858)
@@ -1,49 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-Copyright (c) 2001 Andrew Green and Learning in Motion, Inc.
-http://www.zoolib.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------------------------- */
-
-#ifndef __ZUtil_Asset__
-#define __ZUtil_Asset__ 1
-#include "zconfig.h"
-
-#include "zoolib/ZAsset.h"
-#include "zoolib/ZFile.h"
-
-#include <string>
-#include <vector>
-
-NAMESPACE_ZOOLIB_BEGIN
-
-namespace ZUtil_Asset {
-
-void sGetAssetTreeNamesFromExecutable(std::vector<std::string>& oAssetTreeNames);
-
-ZRef<ZAssetTree> sGetAssetTreeFromExecutable(const std::string& iAssetTreeName);
-ZAsset sGetAssetRootFromExecutable(const std::string& iAssetTreeName);
-
-ZRef<ZAssetTree> sGetAssetTreeFromFileSpec(const ZFileSpec& iFileSpec);
-ZAsset sGetAssetRootFromFileSpec(const ZFileSpec& iFileSpec);
-
-ZAsset sCreateOverlay(const std::vector<ZAsset>& iAssets, bool iLowestToHighest);
-
-} // namespace ZUtil_Asset
-
-NAMESPACE_ZOOLIB_END
-
-#endif // __ZUtil_Asset__

Deleted: trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.cpp	2009-07-19 17:42:52 UTC (rev 857)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.cpp	2009-07-19 17:46:29 UTC (rev 858)
@@ -1,334 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-Copyright (c) 2000 Andrew Green and Learning in Motion, Inc.
-http://www.zoolib.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------------------------- */
-
-#include "zoolib/ZMacFixup.h"
-
-#include "zoolib/ZUtil_Graphics.h"
-#include "zoolib/ZCONFIG_SPI.h"
-
-#include "zoolib/ZDebug.h"
-#include "zoolib/ZDC.h"
-#include "zoolib/ZDC_QD.h"
-
-#if ZCONFIG_SPI_Enabled(MacClassic) || ZCONFIG_SPI_Enabled(Carbon)
-#	include ZMACINCLUDE3(Carbon,HIToolbox,Drag.h) // For GetDragHiliteColor
-#	include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMGetHiliteRGB
-#endif
-
-using std::vector;
-
-NAMESPACE_ZOOLIB_BEGIN
-
-// ==================================================
-
-void ZUtil_Graphics::sCalculateRgnDifferences(const ZDCRgn& inOldRgn, const ZDCRgn& inNewRgn,
-	ZDCRgn* outOldRgnToPaint, ZDCRgn* outNewRgnToPaint, ZDCRgn* outDiffRgnToPaint)
-	{
-	if (outOldRgnToPaint)
-		*outOldRgnToPaint = (inOldRgn - inNewRgn);
-	if (outNewRgnToPaint)
-		*outNewRgnToPaint = (inNewRgn - inOldRgn);
-	if (outDiffRgnToPaint)
-		*outDiffRgnToPaint = (inNewRgn & inOldRgn);
-	}
-
-void ZUtil_Graphics::sCalculatePatternDifference(const ZDCPattern& inOldPattern,
-	const ZDCPattern& inNewPattern, ZDCPattern* outDiffPattern, bool* outPatternChanged)
-	{
-	ZDCPattern temp;
-	ZDCPattern* diffPattern = outDiffPattern;
-	if (!diffPattern)
-		diffPattern = &temp;
-
-	bool patternChanged = false;
-
-	for (short x = 0; x < 8; x++)
-		{
-		diffPattern->pat[x] = inOldPattern.pat[x] ^ inNewPattern.pat[x];
-		if (diffPattern->pat[x] != 0)
-			patternChanged = true;
-		}
-
-	if (outPatternChanged)
-		*outPatternChanged= patternChanged;
-	}
-
-// ==================================================
-
-void ZUtil_Graphics::sMarchAnts(ZDCPattern& ioPattern)
-	{
-	uint8 line0 = ioPattern.pat[0];
-	ioPattern.pat[0] = ioPattern.pat[1];
-	ioPattern.pat[1] = ioPattern.pat[2];
-	ioPattern.pat[2] = ioPattern.pat[3];
-	ioPattern.pat[3] = ioPattern.pat[4];
-	ioPattern.pat[4] = ioPattern.pat[5];
-	ioPattern.pat[5] = ioPattern.pat[6];
-	ioPattern.pat[6] = ioPattern.pat[7];
-	ioPattern.pat[7] = line0;
-	}
-
-// ==================================================
-
-void ZUtil_Graphics::sDrawDragDropHilite(const ZDC& inDC, const ZDCRgn& inRgn)
-	{
-	ZDC localDC(inDC);
-	ZDCRgn realRgn = inRgn - inRgn.Inset(3, 3);
-
-	#if (ZCONFIG_SPI_Enabled(MacClassic) || ZCONFIG_SPI_Enabled(Carbon)) && ZCONFIG_SPI_Enabled(QuickDraw)
-
-		if (localDC.GetDepth() >= 4)
-			{
-			RGBColor theDragHiliteColor;
-			ZDCSetupForQD theSetupForQD(localDC, true);
-			ZPoint qdOffset = theSetupForQD.GetOffset();
-			::GetDragHiliteColor((WindowPtr)theSetupForQD.GetGrafPtr(), &theDragHiliteColor);
-			RGBColor oldHiliteColor;
-			LMGetHiliteRGB(&oldHiliteColor);
-			::HiliteColor(&theDragHiliteColor);
-			::PenMode(hilite);
-			::PaintRgn((realRgn + qdOffset).GetRgnHandle());
-			::HiliteColor(&oldHiliteColor);
-			}
-		else
-			{
-			localDC.SetInk(ZDCInk::sGray);
-			localDC.SetMode(ZDC::modeXor);
-			localDC.Fill(realRgn);
-			}
-
-	#else
-
-		localDC.SetInk(ZDCInk::sGray);
-		localDC.SetMode(ZDC::modeXor);
-		localDC.Fill(realRgn);
-
-	#endif
-	}
-
-// ==================================================
-
-ZDCRgn ZUtil_Graphics::sCalculateRgnStrokedByLine(ZCoord inStartH, ZCoord inStartV,
-	ZCoord inEndH, ZCoord inEndV, ZCoord inPenWidth)
-	{ return ZDCRgn::sLine(inStartH, inStartV, inEndH, inEndV, inPenWidth); }
-
-ZDCRgn ZUtil_Graphics::sCalculateRgnStrokedByLine(ZPoint inStart, ZPoint inEnd, ZCoord inPenWidth)
-	{ return ZDCRgn::sLine(inStart.h, inStart.v, inEnd.h, inEnd.v, inPenWidth); }
-
-// ==================================================
-
-void ZUtil_Graphics::sBresenham(ZPoint inStartPoint, ZPoint inEndPoint,
-	BresenhamProc inProc, void* inRefcon)
-	{
-	ZCoord x1 = inStartPoint.h;
-	ZCoord x2 = inEndPoint.h;
-	ZCoord y1 = inStartPoint.v;
-	ZCoord y2 = inEndPoint.v;
-
-
-	ZCoord dx = x2 - x1; 
-	ZCoord ax = abs(int(dx)) << 1;
-	ZCoord sx = dx < 0 ? -1 : dx > 0 ? 1 : 0;
-	ZCoord dy = y2 - y1; 
-	ZCoord ay = abs(int(dy)) << 1;
-	ZCoord sy = dy < 0 ? -1 : dy > 0 ? 1 : 0;
-	ZCoord x = x1;
-	ZCoord y = y1;
-
-	if (ax >= ay)
-		{
-		// x dominant
-		ZCoord d = ay - (ax >> 1);
-		while (x != x2)
-			{
-			inProc(ZPoint(x, y), inRefcon);
-			if (d >= 0)
-				{
-				y += sy;
-				d -= ax;
-				}
-			x += sx;
-			d += ay;
-			}
-		}
-	else
-		{
-		// y dominant
-		ZCoord d = ax - (ay >> 1);
-		while (y != y2)
-			{
-			inProc(ZPoint(x, y), inRefcon);
-			if (d >= 0)
-				{
-				x += sx;
-				d -= ay;
-				}
-			y += sy;
-			d += ax;
-			}
-		}
-	}
-
-// ==================================================
-
-ZDCRgn ZUtil_Graphics::sCalculateRgnStrokedByFatLine(const ZDCRgn& inPenRgn,
-	ZPoint inStartPoint, ZPoint inEndPoint)
-	{
-	// rvb sept 21 1999: broke down penRgn into rects and then drew line between start and finish
-	// This is now almost constant for the length of the line so the line does not take
-	// longer to draw as it gets longer. It is linear in the number of rectangles that 
-	// make up the penRgn. Should implement a callback for decompose but there will normally be
-	// only 25 rects returned max (one for each vertical line in a penRegion if continuous)
-
-	// AG 1999-10-30. One final change -- build a region formed from all the polys and fill that.
-	// It avoids the original problem, that of unioning the pen region with the composite region
-	// once for each point on the line, and now also avoids tiling one poly for each rect in the
-	// pen region.
-	int quadrant;
-	if (inStartPoint.v > inEndPoint.v)
-		{
-		if (inStartPoint.h < inEndPoint.h)
-			quadrant = 1;
-		else
-			quadrant = 2;
-		}
-	else
-		{
-		if (inStartPoint.h < inEndPoint.h)
-			quadrant = 4;
-		else
-			quadrant = 3;
-		}
-
-	vector<ZRect> rects;
-	inPenRgn.Decompose(rects);
-
-	ZDCRgnAccumulator theAccumulator;
-	ZPoint thePoints[6];
-	for (size_t x = 0; x < rects.size(); ++x)
-		{
-		if (quadrant == 1)
-			{
-			thePoints[0] = rects[x].TopLeft() + inStartPoint;
-			thePoints[1] = rects[x].TopLeft() + inEndPoint;
-			thePoints[2] = rects[x].TopRight() + inEndPoint;
-			thePoints[3] = rects[x].BottomRight() + inEndPoint;
-			thePoints[4] = rects[x].BottomRight() + inStartPoint;
-			thePoints[5] = rects[x].BottomLeft() + inStartPoint;
-			}
-		else if (quadrant == 2)
-			{
-			thePoints[0] = rects[x].TopRight() + inStartPoint;
-			thePoints[1] = rects[x].TopRight() + inEndPoint;
-			thePoints[2] = rects[x].TopLeft() + inEndPoint;
-			thePoints[3] = rects[x].BottomLeft() + inEndPoint;
-			thePoints[4] = rects[x].BottomLeft() + inStartPoint;
-			thePoints[5] = rects[x].BottomRight() + inStartPoint;
-			}
-		else if (quadrant == 3)
-			{
-			thePoints[0] = rects[x].TopLeft() + inStartPoint;
-			thePoints[1] = rects[x].TopLeft() + inEndPoint;
-			thePoints[2] = rects[x].BottomLeft()	+ inEndPoint;
-			thePoints[3] = rects[x].BottomRight() +inEndPoint;
-			thePoints[4] = rects[x].BottomRight() + inStartPoint;
-			thePoints[5] = rects[x].TopRight() + inStartPoint;
-			}
-		else
-			{
-			thePoints[0] = rects[x].TopRight() + inStartPoint;
-			thePoints[1] = rects[x].TopRight() + inEndPoint;
-			thePoints[2] = rects[x].BottomRight() + inEndPoint;
-			thePoints[3] = rects[x].BottomLeft() + inEndPoint;
-			thePoints[4] = rects[x].BottomLeft() + inStartPoint;
-			thePoints[5] = rects[x].TopLeft() + inStartPoint;
-			}
-		ZDCRgn theRgn = ZDCRgn::sPoly(thePoints, 6);
-		theAccumulator.Add(theRgn);
-		}
-	return theAccumulator.GetResult();
-	}
-
-void ZUtil_Graphics::sDrawFatLine(const ZDC& inDC, const ZDCRgn& inPenRgn,
-	ZPoint inStartPoint, ZPoint inEndPoint)
-	{
-	ZDC localDC(inDC);
-	if (inPenRgn.IsSimpleRect() && inPenRgn.Bounds().Width() == inPenRgn.Bounds().Height())
-		{
-		// If the pen is square, we can use ZDC::Line
-		ZRect penBounds = inPenRgn.Bounds();
-		localDC.SetPenWidth(penBounds.Width());
-		localDC.Line(inStartPoint + penBounds.TopLeft(), inEndPoint + penBounds.TopLeft());
-		}
-	else
-		{
-		localDC.Fill(sCalculateRgnStrokedByFatLine(inPenRgn, inStartPoint, inEndPoint));
-		}
-	}
-
-// ==================================================
-
-// Handles are numbered 0 - 8, TL TM TR, ML MM MR, BL BM BR. (Top left, top middle etc.).
-// Handle 4, which is in the center, gets skipped.
-ZRect ZUtil_Graphics::sCalcHandleBounds9(const ZRect& inBounds,
-	ZCoord inHandleSize, size_t inHandleIndex)
-	{
-	ZRect handleBounds = ZRect::sZero;
-	if (inHandleIndex < 9 && inHandleIndex != 4)
-		{
-		// Find the horizontal portion
-		switch (inHandleIndex % 3)
-			{
-			case 0:
-				handleBounds.left = inBounds.left - inHandleSize;
-				handleBounds.right = inBounds.left;
-				break;
-			case 1:
-				handleBounds.left = inBounds.left + inBounds.Width() / 2 - (inHandleSize / 2);
-				handleBounds.right = handleBounds.left + inHandleSize;
-				break;
-			case 2:
-				handleBounds.left = inBounds.right;
-				handleBounds.right = handleBounds.left + inHandleSize;
-				break;
-			}
-		// Find the vertical portion
-		switch (inHandleIndex / 3)
-			{
-			case 0:
-				handleBounds.top = inBounds.top - inHandleSize;
-				handleBounds.bottom = inBounds.top;
-				break;
-			case 1:
-				handleBounds.top = inBounds.top + inBounds.Height() / 2 - (inHandleSize / 2);
-				handleBounds.bottom = handleBounds.top + inHandleSize;
-				break;
-			case 2:
-				handleBounds.top = inBounds.bottom;
-				handleBounds.bottom = handleBounds.top + inHandleSize;
-				break;
-			}
-		}
-	return handleBounds;
-	}
-
-// ==================================================
-
-NAMESPACE_ZOOLIB_END

Deleted: trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.h	2009-07-19 17:42:52 UTC (rev 857)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Graphics.h	2009-07-19 17:46:29 UTC (rev 858)
@@ -1,68 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-Copyright (c) 2000 Andrew Green and Learning in Motion, Inc.
-http://www.zoolib.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------------------------- */
-
-#ifndef __ZUtil_Graphics__
-#define __ZUtil_Graphics__ 1
-#include "zconfig.h"
-
-#include "zoolib/ZGeom.h"
-#include "zoolib/ZDCRgn.h"
-
-NAMESPACE_ZOOLIB_BEGIN
-
-class ZDC;
-class ZDCPattern;
-class ZDCPixmap;
-
-class ZStreamNP;
-
-namespace ZUtil_Graphics {
-
-void sCalculateRgnDifferences(const ZDCRgn& inOldRgn, const ZDCRgn& inNewRgn,
-	ZDCRgn* outOldRgnToPaint, ZDCRgn* outNewRgnToPaint, ZDCRgn* outDiffRgnToPaint);
-
-void sCalculatePatternDifference(const ZDCPattern& inOldPattern, const ZDCPattern& inNewPattern,
-	ZDCPattern* outDiffPattern, bool* outPatternChanged);
-
-void sMarchAnts(ZDCPattern& ioPattern);
-
-void sDrawDragDropHilite(const ZDC& inDC, const ZDCRgn& inRgn);
-
-ZDCRgn sCalculateRgnStrokedByLine(ZCoord inStartH, ZCoord inStartV,
-	ZCoord inEndH, ZCoord inEndV, ZCoord inPenWidth);
-
-ZDCRgn sCalculateRgnStrokedByLine(ZPoint inStart, ZPoint inEnd, ZCoord inPenWidth);
-
-typedef void (*BresenhamProc)(ZPoint inPoint, void* inRefcon);
-void sBresenham(ZPoint inStartPoint, ZPoint inEndPoint, BresenhamProc inProc, void* inRefcon);
-
-ZDCRgn sCalculateRgnStrokedByFatLine(const ZDCRgn& inPenRgn,
-	ZPoint inStartPoint, ZPoint inEndPoint);
-
-void sDrawFatLine(const ZDC& inDC, const ZDCRgn& inPenRgn,
-	ZPoint inStartPoint, ZPoint inEndPoint);
-
-ZRect sCalcHandleBounds9(const ZRect& inBounds, ZCoord inHandleSize, size_t inHandleIndex);
-
-} // namespace ZUtil_Graphics
-
-NAMESPACE_ZOOLIB_END
-
-#endif // __ZUtil_Graphics__

Deleted: trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_HL.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_HL.cpp	2009-07-19 17:42:52 UTC (rev 857)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Mac_HL.cpp	2009-07-19 17:46:29 UTC (rev 858)
@@ -1,853 +0,0 @@
-/* -------------------------------------------------------------------------------------------------
-Copyright (c) 2000 Andrew Green and Learning in Motion, Inc.
-http://www.zoolib.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES
-OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-------------------------------------------------------------------------------------------------- */
-
-#include "zoolib/ZMacFixup.h"
-
-#include "zoolib/ZUtil_Mac_HL.h"
-
-#if ZCONFIG_SPI_Enabled(Carbon)
-
-#include "zoolib/ZDC_QD.h"
-#include "zoolib/ZMacOSX.h"
-#include "zoolib/ZMemory.h" // For ZBlockMove and ZBlockSet
-#include "zoolib/ZUtil_Mac_LL.h"
-
-#include ZMACINCLUDE3(CoreServices,CarbonCore,Gestalt.h)
-#include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
-#include ZMACINCLUDE3(Carbon,HIToolbox,AEInteraction.h)
-
-#include <stdexcept>
-
-using std::max;
-using std::runtime_error;
-using std::string;
-
-NAMESPACE_ZOOLIB_BEGIN
-
-// =================================================================================================
-
-void ZUtil_Mac_HL::sPixmapsFromCIconHandle(CIconHandle inHandle, ZDCPixmap* outColorPixmap, ZDCPixmap* outMonoPixmap, ZDCPixmap* outMaskPixmap)
-	{
-	ZAssert(inHandle);
-
-	ZUtil_Mac_LL::HandleLocker locker1((Handle)inHandle);
-	// Do the color pixmap first
-	if (outColorPixmap)
-		{
-		ZUtil_Mac_LL::HandleLocker locker2((Handle)inHandle[0]->iconData);
-		*outColorPixmap = ZDCPixmap(new ZDCPixmapRep_QD(&inHandle[0]->iconPMap, *inHandle[0]->iconData, inHandle[0]->iconPMap.bounds));
-		}
-	if (outMonoPixmap)
-		{
-		long theHeight = inHandle[0]->iconMask.bounds.bottom - inHandle[0]->iconMask.bounds.top;
-		long theRowBytes = inHandle[0]->iconMask.rowBytes;
-		*outMonoPixmap = ZDCPixmap(new ZDCPixmapRep_QD(&inHandle[0]->iconBMap, &inHandle[0]->iconMaskData[(theRowBytes*theHeight)/2], inHandle[0]->iconBMap.bounds, false));
-		}
-	// Note that we invert the pixmap -- this is because we use white as the indication that something is opaque
-	if (outMaskPixmap)
-		*outMaskPixmap = ZDCPixmap(new ZDCPixmapRep_QD(&inHandle[0]->iconMask, &inHandle[0]->iconMaskData, inHandle[0]->iconMask.bounds, true));
-	}
-
-CIconHandle ZUtil_Mac_HL::sCIconHandleFromPixmapCombo(const ZDCPixmapCombo& inPixmapCombo)
-	{ return sCIconHandleFromPixmaps(inPixmapCombo.GetColor(), inPixmapCombo.GetMono(), inPixmapCombo.GetMask()); }
-
-static void sInvert(void* iAddress, size_t iCount)
-	{
-	uint8* theAddress = static_cast<uint8*>(iAddress);
-	while (iCount--)
-		{
-		*theAddress = *theAddress ^ 0xFF;
-		++theAddress;
-		}
-	}
-
-CIconHandle ZUtil_Mac_HL::sCIconHandleFromPixmaps(const ZDCPixmap& inColorPixmap, const ZDCPixmap& inMonoPixmap, const ZDCPixmap& inMaskPixmap)
-	{
-	// We insist on a valid color or mono pixmap and a valid mask
-	ZAssert((inColorPixmap || inMonoPixmap) && inMaskPixmap);
-
-	// We conform to the size of the color pixmap
-	ZPoint theSize = ZPoint::sZero;
-	if (inColorPixmap)
-		theSize = inColorPixmap.Size();
-	else
-		theSize = inMonoPixmap.Size();
-
-	size_t monoRowBytes = ((1 * theSize.h + 31) / 32) * 4;
-
-	CIconHandle theCIconHandle = (CIconHandle)::NewHandleClear(sizeof(CIcon) - sizeof(short) + 2 * monoRowBytes * theSize.v);
-	ZUtil_Mac_LL::HandleLocker locker1((Handle)theCIconHandle);
-
-	ZUtil_Mac_LL::sSetupPixMapColor(theSize, 32, theCIconHandle[0]->iconPMap);
-
-	ZDCPixmapNS::RasterDesc theRasterDesc;
-	theRasterDesc.fPixvalDesc.fDepth = 32;
-	theRasterDesc.fPixvalDesc.fBigEndian = true;
-	theRasterDesc.fRowBytes = theCIconHandle[0]->iconPMap.rowBytes & 0x3FFF;
-	theRasterDesc.fRowCount = theSize.v;
-	theRasterDesc.fFlipped = false;
-
-	// Figure out how much space we need for the color pixmap's data
-	theCIconHandle[0]->iconData = ::NewHandleClear(theRasterDesc.fRowBytes * theSize.v);
-	ZUtil_Mac_LL::HandleLocker locker2(theCIconHandle[0]->iconData);
-
-	ZDCPixmapNS::PixelDesc thePixelDesc(0x00FF0000, 0x0000FF00, 0x000000FF, 0);
-	if (inColorPixmap)
-		inColorPixmap.CopyTo(ZPoint(0, 0), theCIconHandle[0]->iconData[0], theRasterDesc, thePixelDesc, ZRect(theSize));
-	else
-		inMonoPixmap.CopyTo(ZPoint(0, 0), theCIconHandle[0]->iconData[0], theRasterDesc, thePixelDesc, ZRect(theSize));
-	// Hmm, we're supposed to invert the color pixmap.
-
-	// We have the color portion set up. Now grab the B & W version, either from inMonoPixmap or from inColorPixmap
-	theRasterDesc.fPixvalDesc.fDepth = 1;
-	theRasterDesc.fPixvalDesc.fBigEndian = true;
-	theRasterDesc.fRowBytes = monoRowBytes;
-	theRasterDesc.fRowCount = theSize.v;
-	theRasterDesc.fFlipped = false;
-	thePixelDesc = ZDCPixmapNS::PixelDesc(1, 0);
-
-	theCIconHandle[0]->iconBMap.baseAddr = nullptr;
-	theCIconHandle[0]->iconBMap.rowBytes = monoRowBytes;
-	theCIconHandle[0]->iconBMap.bounds.left = 0;
-	theCIconHandle[0]->iconBMap.bounds.top = 0;
-	theCIconHandle[0]->iconBMap.bounds.right = theSize.h;
-	theCIconHandle[0]->iconBMap.bounds.bottom = theSize.v;
-
-	void* tempAddress = ((char*)&theCIconHandle[0]->iconMaskData) + monoRowBytes * theSize.v;
-	if (inMonoPixmap)
-		inMonoPixmap.CopyTo(ZPoint(0, 0), tempAddress, theRasterDesc, thePixelDesc, ZRect(theSize));
-	else
-		inColorPixmap.CopyTo(ZPoint(0, 0), tempAddress, theRasterDesc, thePixelDesc, ZRect(theSize));
-
-	theCIconHandle[0]->iconMask.baseAddr = nullptr;
-	theCIconHandle[0]->iconMask.rowBytes = monoRowBytes;
-	theCIconHandle[0]->iconMask.bounds.left = 0;
-	theCIconHandle[0]->iconMask.bounds.top = 0;
-	theCIconHandle[0]->iconMask.bounds.right = theSize.h;
-	theCIconHandle[0]->iconMask.bounds.bottom = theSize.v;
-
-	inMaskPixmap.CopyTo(ZPoint(0, 0), theCIconHandle[0]->iconMaskData, theRasterDesc, thePixelDesc, ZRect(theSize));
-
-	theCIconHandle[0]->iconMask.baseAddr = nullptr;
-
-	return theCIconHandle;
-	}
-
-IconFamilyHandle ZUtil_Mac_HL::sNewIconFamily()
-	{
-	IconFamilyHandle theIconFamilyHandle = (IconFamilyHandle)::NewHandle(sizeof(IconFamilyResource) - sizeof(IconFamilyElement));
-	if (theIconFamilyHandle)
-		{
-		theIconFamilyHandle[0]->resourceType = kIconFamilyType;
-		int32 theSize = ::GetHandleSize(reinterpret_cast<Handle>(theIconFamilyHandle));
-		theIconFamilyHandle[0]->resourceSize = theSize;
-		}
-	return theIconFamilyHandle;
-	}
-
-void ZUtil_Mac_HL::sDisposeIconFamily(IconFamilyHandle inIconFamilyHandle)
-	{
-	if (inIconFamilyHandle)
-		::DisposeHandle(reinterpret_cast<Handle>(inIconFamilyHandle));
-	}
-
-namespace ZUtil_Mac_HL {
-
-static struct _SizeKindResMapping
-	{
-	IconSize fIconSize;
-	IconKind fIconKind;
-	uint32 fResType;
-	}
-sSizeKindResMapping[] = 
-	{
-	{ eMini, eData1, kMini1BitMask },
-	{ eMini, eData4, kMini4BitData },
-	{ eMini, eData8, kMini8BitData },
-	{ eMini, eMask1, kMini1BitMask },
-
-	{ eSmall, eData1, kSmall1BitMask },
-	{ eSmall, eData4, kSmall4BitData },
-	{ eSmall, eData8, kSmall8BitData },
-	{ eSmall, eData32, kSmall32BitData },
-	{ eSmall, eMask1, kSmall1BitMask },
-	{ eSmall, eMask8, kSmall8BitMask },
-
-	{ eLarge, eData1, kLarge1BitMask },
-	{ eLarge, eData4, kLarge4BitData },
-	{ eLarge, eData8, kLarge8BitData },
-	{ eLarge, eData32, kLarge32BitData },
-	{ eLarge, eMask1, kLarge1BitMask },
-	{ eLarge, eMask8, kLarge8BitMask },
-
-	{ eHuge, eData1, kHuge1BitMask },
-	{ eHuge, eData4, kHuge4BitData },
-	{ eHuge, eData8, kHuge8BitData },
-	{ eHuge, eData32, kHuge32BitData },
-	{ eHuge, eMask1, kHuge1BitMask },
-	{ eHuge, eMask8, kHuge8BitMask }
-	};
-
-static struct _KindDepthCTableMapping
-	{
-	IconKind fIconKind;
-	int16 fDepth;
-	int16 fCTableID;
-	bool fHasMask;
-	bool fIsMask;
-	bool fNeeds8BitDeepMasks;
-	bool fNeeds32BitIcons;
-	}
-sKindDepthCTableMapping[] = 
-	{
-	{ eData1, 1, 33, true, false, false, false },
-	{ eData4, 4, 68, false, false, false, false },
-	{ eData8, 8, 72, false, false, false, false },
-	{ eData32, 32, 0, false, false, false, true },
-	{ eMask1, 1, 33, true, true, false, false },
-	{ eMask8, 8, 40, false, true, true, false }
-	};
-
-static struct _SizePixelMapping
-	{
-	IconSize fIconSize;
-	ZCoord fPixels;
-	bool fNeeds48PixelIcons;
-	}
-sSizePixelMapping[] = 
-	{
-	{ eMini, 12, false },
-	{ eSmall, 16, false },
-	{ eLarge, 32, false },
-	{ eHuge, 48, true }
-	};
-
-} // namespace ZUtil_Mac_HL
-
-static bool sGestalt_IconUtilitiesHas48PixelIcons()
-	{
-	long response;
-	OSErr err = ::Gestalt(gestaltIconUtilitiesAttr, &response);
-	if (err == noErr)
-		return 0 != (response & (1 << gestaltIconUtilitiesHas48PixelIcons));
-	return false;
-	}
-
-static bool sGestalt_IconUtilitiesHas32BitIcons()
-	{
-	// AG 2000-07-22. Guess what, the window manager on iMacs (not sure which
-	// OS version) doesn't like deep icons either, so this is switched off for now,
-	// same as deep masks below. Fixed bug #152.
-#if 1 // ##
-	long response;
-	OSErr err = ::Gestalt(gestaltIconUtilitiesAttr, &response);
-	if (err == noErr)
-		return 0 != (response & (1 << gestaltIconUtilitiesHas32BitIcons));
-#endif // 0
-	return false;
-	}
-
-static bool sGestalt_IconUtilitiesHas8BitDeepMasks()
-	{
-	// AG 2000-04-01. Window Manager seems to have problems with 8 bit masks, as in
-	// they don't work. So I'm switching this off for now.
-#if 1 // ##
-	long response;
-	OSErr err = ::Gestalt(gestaltIconUtilitiesAttr, &response);
-	if (err == noErr)
-		return 0 != (response & (1 << gestaltIconUtilitiesHas8BitDeepMasks));
-#endif // 0
-	return false;
-	}
-
-void ZUtil_Mac_HL::sAddPixmapToIconFamily(const ZDCPixmap& inPixmap, IconKind inAsIconKind, IconFamilyHandle inIconFamilyHandle)
-	{
-// Figure out a bunch of stuff
-	ZPoint sourceSize = inPixmap.Size();
-	ZCoord sourceWidthHeight = max(sourceSize.h, sourceSize.v);
-
-	bool has48PixelIcons = sGestalt_IconUtilitiesHas48PixelIcons();
-
-	ZCoord theCroppedWidthHeight = 48;
-	IconSize theIconSize = eHuge;
-	if (!has48PixelIcons)
-		{
-		theCroppedWidthHeight = 32;
-		theIconSize = eLarge;
-		}
-
-	for (int x = 0; x < countof(sSizePixelMapping); ++x)
-		{
-		if (sSizePixelMapping[x].fPixels >= sourceWidthHeight
-			&& (!sSizePixelMapping[x].fNeeds48PixelIcons || has48PixelIcons))
-			{
-			theIconSize = sSizePixelMapping[x].fIconSize;
-			theCroppedWidthHeight = sSizePixelMapping[x].fPixels;
-			break;
-			}
-		}
-
-	int16 destDepth = 32;
-	int16 destCTableID = 0;
-	bool hasMask = false;
-	bool isMask = false;
-	for (int x = 0; x < countof(sKindDepthCTableMapping); ++x)
-		{
-		if (sKindDepthCTableMapping[x].fIconKind == inAsIconKind)
-			{
-			destDepth = sKindDepthCTableMapping[x].fDepth;
-			destCTableID = sKindDepthCTableMapping[x].fCTableID;
-			hasMask = sKindDepthCTableMapping[x].fHasMask;
-			isMask = sKindDepthCTableMapping[x].fIsMask;
-			break;
-			}
-		}
-
-	bool needsInvert = false;
-	ZDCPixmapNS::PixelDesc destPixelDesc;
-	switch (destDepth)
-		{
-		case 1:
-			{
-			needsInvert = !isMask;
-			destPixelDesc = ZDCPixmapNS::PixelDesc(1, 0);
-			break;
-			}
-		case 2:
-		case 4:
-		case 8:
-			{
-			destPixelDesc = ZUtil_Mac_LL::sGetIndexedPixelDesc(destCTableID);
-			break;
-			}
-		case 16:
-			{
-			destPixelDesc = ZDCPixmapNS::PixelDesc(0x7C00, 0x03E0, 0x001F, 0x0000);
-			break;
-			}
-		case 24:
-			{
-			destPixelDesc = ZDCPixmapNS::PixelDesc(0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000);
-			break;
-			}
-		default:
-		case 32:
-			{
-			destPixelDesc = ZDCPixmapNS::PixelDesc(0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000);
-			break;
-			}
-		}
-
-	uint32 theResType = 0;
-	for (int x = 0; x < countof(sSizeKindResMapping); ++x)
-		{
-		if (sSizeKindResMapping[x].fIconSize == theIconSize
-			&& sSizeKindResMapping[x].fIconKind == inAsIconKind)
-			{
-			theResType = sSizeKindResMapping[x].fResType;
-			break;
-			}
-		}
-
-	// Note that we *do not* force four byte alignment -- small icons are two bytes wide only,
-	// the others will naturally have four byte alignment because of depth or size.
-	int16 destRowBytes = ((destDepth * theCroppedWidthHeight) + 7) / 8;
-
-	// Let's see if we already have data (in case we're adding a mask)
-	Handle theDataHandle = ::NewHandle(0);
-	::GetIconFamilyData(inIconFamilyHandle, theResType, theDataHandle);
-	int32 theHandleSize = ::GetHandleSize(theDataHandle);
-
-	if (theHandleSize == 0)
-		{
-		// There's no extant data in inIconFamilyHandle, so we need to allocate it.
-		if (hasMask)
-			{
-			::SetHandleSize(theDataHandle, 2 * destRowBytes * theCroppedWidthHeight);
-			ZBlockSet(*theDataHandle, 2 * destRowBytes * theCroppedWidthHeight, 0);
-			}
-		else
-			{
-			::SetHandleSize(theDataHandle, destRowBytes * theCroppedWidthHeight);
-			ZBlockSet(*theDataHandle, destRowBytes * theCroppedWidthHeight, 0);
-			}
-		}
-
-	ZUtil_Mac_LL::HandleLocker theDataHandleLocker(theDataHandle);
-
-	ZDCPixmapNS::RasterDesc destRasterDesc;
-	destRasterDesc.fPixvalDesc.fDepth = destDepth;
-	destRasterDesc.fPixvalDesc.fBigEndian = true;
-	destRasterDesc.fRowBytes = destRowBytes;
-	destRasterDesc.fRowCount = theCroppedWidthHeight;
-	destRasterDesc.fFlipped = false;
-
-	Ptr destAddress = theDataHandle[0];
-	if (hasMask && isMask)
-		destAddress += destRowBytes * theCroppedWidthHeight;
-
-	inPixmap.CopyTo(ZPoint(0, 0),
-					destAddress,
-					destRasterDesc,
-					destPixelDesc,
-					ZRect(theCroppedWidthHeight, theCroppedWidthHeight));
-
-	if (needsInvert)
-		sInvert(destAddress, destRowBytes * theCroppedWidthHeight);
-
-	::SetIconFamilyData(inIconFamilyHandle, theResType, theDataHandle);
-	theDataHandleLocker.Orphan();
-	::DisposeHandle(theDataHandle);
-	}
-
-ZDCPixmap ZUtil_Mac_HL::sPixmapFromIconFamily(IconFamilyHandle inIconFamilyHandle, IconSize inIconSize, IconKind inIconKind)
-	{
-	ZDCPixmap theDCPixmap;
-
-// Figure out what resource we're looking for
-	uint32 theResType = 0;
-	for (int x = 0; x < countof(sSizeKindResMapping); ++x)
-		{
-		if (sSizeKindResMapping[x].fIconSize == inIconSize && sSizeKindResMapping[x].fIconKind == inIconKind)
-			{
-			theResType = sSizeKindResMapping[x].fResType;
-			break;
-			}
-		}
-
-	if (theResType == 0)
-		return theDCPixmap;
-
-	Handle theIconDataHandle = ::NewHandle(0);
-	::GetIconFamilyData(inIconFamilyHandle, theResType, theIconDataHandle);
-	if (::GetHandleSize(theIconDataHandle) != 0)
-		{
-		try
-			{
-			theDCPixmap = ZUtil_Mac_HL::sPixmapFromIconDataHandle(theIconDataHandle, inIconSize, inIconKind);
-			}
-		catch (...)
-			{
-			::DisposeHandle(theIconDataHandle);
-			throw;
-			}
-		}
-
-	::DisposeHandle(theIconDataHandle);
-	return theDCPixmap;
-	}
-
-ZDCPixmap ZUtil_Mac_HL::sPixmapFromIconSuite(IconSuiteRef inIconSuite, IconSize inIconSize, IconKind inIconKind)
-	{
-	ZDCPixmap theDCPixmap;
-
-// Figure out what resource we're looking for
-	uint32 theResType = 0;
-	for (int x = 0; x < countof(sSizeKindResMapping); ++x)
-		{
-		if (sSizeKindResMapping[x].fIconSize == inIconSize && sSizeKindResMapping[x].fIconKind == inIconKind)
-			{
-			theResType = sSizeKindResMapping[x].fResType;
-			break;
-			}
-		}
-
-	if (theResType == 0)
-		return theDCPixmap;
-
-	Handle theIconDataHandle = nullptr;
-	if (noErr == ::GetIconFromSuite(&theIconDataHandle, inIconSuite, theResType))
-		theDCPixmap = sPixmapFromIconDataHandle(theIconDataHandle, inIconSize, inIconKind);
-
-	return theDCPixmap;
-	}
-
-ZDCPixmap ZUtil_Mac_HL::sPixmapFromIconDataHandle(Handle inIconDataHandle, IconSize inIconSize, IconKind inIconKind)
-	{
-// Got the data, now to unmunge it.
-	ZCoord theWidthHeight = 0;
-	for (int x = 0; x < countof(sSizePixelMapping); ++x)
-		{
-		if (sSizePixelMapping[x].fIconSize == inIconSize)
-			{
-			theWidthHeight = sSizePixelMapping[x].fPixels;
-			break;
-			}
-		}
-
-	int16 theDepth = 0;
-	int16 theCTableID = 0;
-	bool hasMask = false;
-	bool isMask = false;
-	for (int x = 0; x < countof(sKindDepthCTableMapping); ++x)
-		{
-		if (sKindDepthCTableMapping[x].fIconKind == inIconKind)
-			{
-			theDepth = sKindDepthCTableMapping[x].fDepth;
-			theCTableID = sKindDepthCTableMapping[x].fCTableID;
-			hasMask = sKindDepthCTableMapping[x].fHasMask;
-			isMask = sKindDepthCTableMapping[x].fIsMask;
-			break;
-			}
-		}
-
-	int32 theRowBytes = ((theWidthHeight * theDepth + 31) / 32) * 4;
-	bool needsInvert = false;
-	ZDCPixmapNS::PixelDesc thePixelDesc;
-	switch (theDepth)
-		{
-		case 1:
-			{
-			theRowBytes = (theWidthHeight + 7 ) / 8;
-			needsInvert = !isMask;
-			thePixelDesc = ZDCPixmapNS::PixelDesc(1, 0);
-			break;
-			}
-		case 2:
-		case 4:
-		case 8:
-			{
-			thePixelDesc = ZUtil_Mac_LL::sGetIndexedPixelDesc(theCTableID);
-			break;
-			}
-		case 16:
-			{
-			thePixelDesc = ZDCPixmapNS::PixelDesc(0x7C00, 0x03E0, 0x001F, 0x0000);
-			break;
-			}
-		case 24:
-			{
-			thePixelDesc = ZDCPixmapNS::PixelDesc(0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000);
-			break;
-			}
-		default:
-		case 32:
-			{
-			thePixelDesc = ZDCPixmapNS::PixelDesc(0x00FF0000, 0x0000FF00, 0x000000FF, 0x00000000);
-			break;
-			}
-		}
-
-	ZDCPixmapNS::RasterDesc theRasterDesc;
-	theRasterDesc.fPixvalDesc.fDepth = theDepth;
-	theRasterDesc.fPixvalDesc.fBigEndian = true;
-	theRasterDesc.fRowBytes = theRowBytes;
-	theRasterDesc.fRowCount = theWidthHeight;
-	theRasterDesc.fFlipped = false;
-
-	ZDCPixmap theDCPixmap(new ZDCPixmapRep(new ZDCPixmapRaster_Simple(theRasterDesc), ZRect(theWidthHeight, theWidthHeight), thePixelDesc));
-
-	ZUtil_Mac_LL::HandleLocker locker(inIconDataHandle);
-
-	theDCPixmap.CopyFrom(ZPoint(0, 0),
-						inIconDataHandle[0] + (hasMask && isMask ? (theRowBytes * theWidthHeight) : 0),
-						theRasterDesc,
-						thePixelDesc,
-						ZRect(theWidthHeight, theWidthHeight));
-	if (needsInvert)
-		{
-		// This step could be avoided if we had separate source and destination
-		// PixelDescs, and could let the blit take care of the transform.
-		sInvert(theDCPixmap.GetBaseAddress(), theRowBytes * theWidthHeight);
-		}
-
-	return theDCPixmap;
-	}
-
-IconRef ZUtil_Mac_HL::sIconRefFromPixmaps(const ZDCPixmap& inColorPixmap, const ZDCPixmap& inMonoPixmap, const ZDCPixmap& inMaskPixmap)
-	{
-#if ZCONFIG(Processor, PPC)
-	// AG 99-01-11. AAArrrrgggghhhhhh. There I was thinking that the new Icon Services stuff was a sweet addition to our
-	// MacOS capabilities. Wrong! With the current headers and import library there appears to be no way to fabricate an arbitrary
-	// IconRef -- we can *register* a new icon, but it has to have a creator and type attached to it, which is not what we want.
-
-	// AG 99-05-19. I've since talked with a couple of people, and the recommendation from Apple is to use a fake creator/type combo,
-	// and manage the lifetime of the registration explicitly.
-
-	ZAssertStop(1, (inColorPixmap || inMonoPixmap) && inMaskPixmap);
-	IconFamilyHandle theIconFamilyHandle = sNewIconFamily();
-
-	if (inColorPixmap)
-		sAddPixmapToIconFamily(inColorPixmap, eData8, theIconFamilyHandle);
-
-//##	if (inColorPixmap)
-//##		sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
-
-	if (inMonoPixmap)
-		sAddPixmapToIconFamily(inMonoPixmap, eData1, theIconFamilyHandle);
-
-	if (inMaskPixmap)
-		sAddPixmapToIconFamily(inMaskPixmap, eMask1, theIconFamilyHandle);
-
-	IconRef theIconRef = nullptr;
-
-	static uint32 fakeType = rand();
-	if (noErr == ::RegisterIconRefFromIconFamily('ZLIB', ++fakeType, theIconFamilyHandle, &theIconRef))
-		{
-		// Acquire another reference to the iconRef
-		::AcquireIconRef(theIconRef);
-		// And unregister the iconRef -- it should mean that when the IconRef's refcount hits
-		// zero it will simply disappear from the system. I have checked for leaks and none seem to be occurring.
-		::UnregisterIconRef('ZLIB', fakeType);
-
-		UInt16 ownerCount;
-        ::GetIconRefOwners(theIconRef, &ownerCount);
-        if (ownerCount == 2)
-			{
-			// According to Laurence Harris some versions of the OS do not decrement
-			// the refcount when UnregisterIconRef is called, so we do it manually.
-            ::ReleaseIconRef(theIconRef);
-			}
-		}
-	sDisposeIconFamily(theIconFamilyHandle);
-
-	return theIconRef;
-#else // ZCONFIG(Processor, PPC)
-	return nullptr;
-#endif // ZCONFIG(Processor, PPC)
-	}
-
-// =================================================================================================
-
-static pascal Boolean sAppleEventIdleProc(EventRecord* inEventRecord, long* outSleepTime, RgnHandle* outMouseRgn)
-	{
-	#if ZCONFIG(Thread_API, Mac)
-		ZThreadTM_Yield();
-	#endif
-
-/*	if (ZApp::sGet())
-		{
-		ZDCRgn theDCRgn;
-//##		ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
-		::MacCopyRgn(theDCRgn, *outMouseRgn);
-		}*/
-	return false;
-	}
-
-static AEIdleUPP sAEIdleUPP = NewAEIdleUPP(sAppleEventIdleProc);
-
-bool ZUtil_Mac_HL::sInteractWithUser()
-	{
-	OSErr result = ::AEInteractWithUser(kNoTimeOut, nullptr, sAEIdleUPP);
-	if (result == noErr)
-		return true;
-	return false;
-	}
-
-void ZUtil_Mac_HL::sPreDialog()
-	{
-	ZUtil_Mac_HL::sInteractWithUser();
-
-	#if ZCONFIG_SPI_Enabled(MacClassic)
-		ZOSApp_Mac::sGet()->PreDialog();
-		ZOSApp_Mac::sGet()->UpdateAllWindows();
-	#endif
-	}
-
-void ZUtil_Mac_HL::sPostDialog()
-	{
-	#if ZCONFIG_SPI_Enabled(MacClassic)
-		ZOSApp_Mac::sGet()->PostDialog();
-	#endif
-	}
-
-static ModalFilterUPP sModalFilterUPP = NewModalFilterUPP(ZUtil_Mac_HL::sModalFilter);
-pascal Boolean ZUtil_Mac_HL::sModalFilter(DialogPtr theDialog, EventRecord* inOutEventRecord, short* inOutItemHit)
-	{
-//##	if (ZApp::sGet())
-//##		return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
-	return false;
-	}
-
-string ZUtil_Mac_HL::sGetVersionString()
-	{
-// Returns the version number as described in the .shortVersion field of the version resource
-	string version;
-
-	if (Handle theHandle = ::Get1Resource('vers', 1))
-		{
-		ZUtil_Mac_LL::HandleLocker theLocker(theHandle);
-		StringPtr versStr = ((VersRecHndl)theHandle)[0]->shortVersion;
-		version = string((char*)&versStr[1], (size_t)versStr[0]);
-		}
-
-	return version;
-	}
-
-NAMESPACE_ZOOLIB_END
-
-#endif // ZCONFIG_SPI_Enabled(Carbon)
-
-// =================================================================================================
-
-#if ZCONFIG_SPI_Enabled(QuickDraw)
-
-#include "zoolib/ZDC_QD.h"
-#include "zoolib/ZStream.h"
-
-#include ZMACINCLUDE3(CoreServices,CarbonCore,MacMemory.h)
-#include ZMACINCLUDE3(ApplicationServices,QD,QDOffscreen.h)
-
-NAMESPACE_ZOOLIB_BEGIN
-
-namespace ZANONYMOUS {
-struct PixmapFromStreamPICTInfo
-	{
-	PixmapFromStreamPICTInfo* fPrev;
-	PixmapFromStreamPICTInfo* fNext;
-	GWorldPtr fGWorldPtr;
-	const ZStreamR* fStream;
-	bool fStreamOkay;
-	};
-} // anonymous namespace
-
-static PixmapFromStreamPICTInfo* sPixmapFromStreamPICTInfo_Head = nullptr;
-static ZMutex sPixmapFromStreamPICT_Mutex;
-
-static DEFINE_API(void) sPixmapFromStreamPICT_GetPicProc(void* dataPtr, short byteCount)
-	{
-	PixmapFromStreamPICTInfo* current = nullptr;
-	try
-		{
-		CGrafPtr currentPort;
-		GDHandle currentGDHandle;
-		::GetGWorld(&currentPort, &currentGDHandle);
-		sPixmapFromStreamPICT_Mutex.Acquire();
-		current = sPixmapFromStreamPICTInfo_Head;
-		while (current && current->fGWorldPtr != currentPort)
-			current = current->fNext;
-		sPixmapFromStreamPICT_Mutex.Release();
-
-		ZAssertStop(0, current != nullptr);
-
-		current->fStream->Read(dataPtr, byteCount);
-		}
-	catch (...)
-		{
-#if ACCESSOR_CALLS_ARE_FUNCTIONS
-		SetQDError(noMemForPictPlaybackErr);
-#else
-		*((QDErr*)(0x0D6E)) = noMemForPictPlaybackErr; //## might be a problem under Windows. -ec 01.12.21
-									// AG 2002-07-08. Except that ACCESSOR_CALLS_ARE_FUNCTIONS is true when building for windows.
-#endif
-		if (current)
-			current->fStreamOkay = false;
-		}
-	}
-
-static QDGetPicUPP sPixmapFromStreamPICT_GetPicProcUPP = NewQDGetPicUPP(sPixmapFromStreamPICT_GetPicProc);
-
-ZDCPixmap ZUtil_Mac_HL::sPixmapFromStreamPICT(const ZStreamR& inStream)
-	{
-	ZDCPixmap thePixmap;
-	PicHandle thePicHandle = nullptr;
-	try
-		{
-		// Create the dummy PicHandle
-		thePicHandle = (PicHandle)::NewHandleClear(sizeof(Picture));
-		::HLock((Handle)thePicHandle);
-
-		// Read the header
-		inStream.Read(*thePicHandle, sizeof(Picture));
-		::HUnlock((Handle)thePicHandle);
-
-		// Get the picture's bounds
-		ZRect theBounds = thePicHandle[0]->picFrame;
-		theBounds -= theBounds.TopLeft();
-
-		// Instantiate an offscreen por...
 
[truncated message content]

Thread: [ZooLib-checkins] SF.net SVN: zoolib:[858] trunk/zoolib/source/cxx (Page 2)

zoolib-checkins