*** empty log message ***

14 files changed, 991 insertions, 29 deletions

diff --git a/mak.vc9/cd.sln b/mak.vc9/cd.sln
index d3a7047..165a240 100644
--- a/mak.vc9/cd.sln
+++ b/mak.vc9/cd.sln
@@ -2,6 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdwin", "cd.vcproj", "{01818D2C-65AF-4D5C-9452-4DFF401C6461}"
 	ProjectSection(ProjectDependencies) = postProject
+		{01818D2C-1234-4D5C-ABCD-4DFF401C6461} = {01818D2C-1234-4D5C-ABCD-4DFF401C6461}
 		{01818D2C-65AF-AFDC-4356-1234401C6461} = {01818D2C-65AF-AFDC-4356-1234401C6461}
 	EndProjectSection
 EndProject
@@ -71,7 +72,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtest", "cdtest.vcproj", "{A7E49FB8-700A-45EC-9174-FB1C2C7E83C9}"
 	ProjectSection(ProjectDependencies) = postProject
 		{01818D2C-65AF-4D5C-9452-4DFF401C6461} = {01818D2C-65AF-4D5C-9452-4DFF401C6461}
-		{51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {51A96255-7EAB-4F36-A6E5-1BAF6245FA18}
 		{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
 	EndProjectSection
 EndProject
@@ -95,6 +95,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdsimplegdk", "cdsimplegdk.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdcore", "cdcore.vcproj", "{01818D2C-1234-4D5C-ABCD-4DFF401C6461}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtestgdk", "cdtestgdk.vcproj", "{A7E49FB8-0000-45EC-1234-ABCDC7E83C00}"
+	ProjectSection(ProjectDependencies) = postProject
+		{01818D2C-AAAA-4D5C-ABCD-1234401C6461} = {01818D2C-AAAA-4D5C-ABCD-1234401C6461}
+		{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cdtestplus", "cdtestplus.vcproj", "{A7E49FB8-5467-45EC-2211-FFAB7E83C100}"
+	ProjectSection(ProjectDependencies) = postProject
+		{51A96255-7EAB-4F36-A6E5-1BAF6245FA18} = {51A96255-7EAB-4F36-A6E5-1BAF6245FA18}
+		{8441F69D-7135-43B2-974F-45C6123C8467} = {8441F69D-7135-43B2-974F-45C6123C8467}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -134,6 +146,10 @@ Global
 		{82BC36B1-DDDD-41D4-ABCD-A12312378CE6}.Debug|Win32.Build.0 = Debug|Win32
 		{01818D2C-1234-4D5C-ABCD-4DFF401C6461}.Debug|Win32.ActiveCfg = Debug|Win32
 		{01818D2C-1234-4D5C-ABCD-4DFF401C6461}.Debug|Win32.Build.0 = Debug|Win32
+		{A7E49FB8-0000-45EC-1234-ABCDC7E83C00}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A7E49FB8-0000-45EC-1234-ABCDC7E83C00}.Debug|Win32.Build.0 = Debug|Win32
+		{A7E49FB8-5467-45EC-2211-FFAB7E83C100}.Debug|Win32.ActiveCfg = Debug|Win32
+		{A7E49FB8-5467-45EC-2211-FFAB7E83C100}.Debug|Win32.Build.0 = Debug|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -148,6 +164,8 @@ Global
 		{A7E49FB8-700A-45EC-9174-FB1C2C7E83C9} = {162715BD-4DB3-4007-8B50-725C0BD11878}
 		{82BC36B1-9F7A-41D4-A24F-DBE012378CE6} = {162715BD-4DB3-4007-8B50-725C0BD11878}
 		{82BC36B1-DDDD-41D4-ABCD-A12312378CE6} = {162715BD-4DB3-4007-8B50-725C0BD11878}
+		{A7E49FB8-0000-45EC-1234-ABCDC7E83C00} = {162715BD-4DB3-4007-8B50-725C0BD11878}
+		{A7E49FB8-5467-45EC-2211-FFAB7E83C100} = {162715BD-4DB3-4007-8B50-725C0BD11878}
 	EndGlobalSection
 	GlobalSection(DevPartner Solution Properties) = postSolution
 	EndGlobalSection
diff --git a/mak.vc9/cdcore.vcproj b/mak.vc9/cdcore.vcproj
new file mode 100644
index 0000000..ad3ac36
--- /dev/null
+++ b/mak.vc9/cdcore.vcproj
@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdcore"
+	ProjectGUID="{01818D2C-1234-4D5C-ABCD-4DFF401C6461}"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\lib"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+			ConfigurationType="4"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include,..\src,..\src\drv,..\src\freetype2,..\src\intcgm,..\src\iup,..\src\sim"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CD_NO_OLD_INTERFACE;FT2_BUILD_LIBRARY;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLibrarianTool"
+				OutputFile="$(OutDir)/$(ProjectName).lib"
+				SuppressStartupBanner="true"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="INTCGM"
+			>
+			<File
+				RelativePath="..\src\intcgm\bparse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\circle.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\ellipse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm1.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm4.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\intcgm6.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\sism.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\intcgm\tparse.c"
+				>
+			</File>
+			<Filter
+				Name="INC"
+				>
+				<File
+					RelativePath="..\src\intcgm\bparse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\circle.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\ellipse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm2.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm4.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\intcgm6.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\list.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\sism.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\tparse.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\intcgm\types.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="SIM"
+			>
+			<File
+				RelativePath="..\src\sim\cd_truetype.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\cdfontex.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_linepolyfill.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_other.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_primitives.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\sim_text.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\sim\truetype.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="DRV"
+			>
+			<File
+				RelativePath="..\src\drv\cdcgm.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cddebug.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cddgn.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cddxf.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdirgb.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdmf.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdpicture.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cdps.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\svg\cdsvg.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\drv\cgm.c"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						WarningLevel="4"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath="..\src\drv\cgm.h"
+				>
+			</File>
+			<Filter
+				Name="SVG"
+				>
+				<File
+					RelativePath="..\src\svg\base64.c"
+					>
+				</File>
+				<File
+					RelativePath="..\src\svg\base64.h"
+					>
+				</File>
+				<File
+					RelativePath="..\src\svg\lodepng.c"
+					>
+				</File>
+				<File
+					RelativePath="..\src\svg\lodepng.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="include"
+			>
+			<File
+				RelativePath="..\include\cd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cd_old.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cd_private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdcgm.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdclipbd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddbuf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddebug.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddgn.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cddxf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdemf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdimage.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdirgb.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdmf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdmf_private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdnative.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdprint.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdps.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\cdwmf.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\wd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\wd_old.h"
+				>
+			</File>
+		</Filter>
+		<File
+			RelativePath="..\src\cd.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd.def"
+			>
+		</File>
+		<File
+			RelativePath="..\src\cd_active.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_attributes.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_bitmap.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_image.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_primitives.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_text.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_util.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\cd_vectortext.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\rgb2map.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\wd.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+		<File
+			RelativePath="..\src\wdhdcpy.c"
+			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+					WarningLevel="4"
+				/>
+			</FileConfiguration>
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdsimple.vcproj b/mak.vc9/cdsimple.vcproj
index 64edbe8..0afcf41 100644
--- a/mak.vc9/cdsimple.vcproj
+++ b/mak.vc9/cdsimple.vcproj
@@ -44,7 +44,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include,..\..\iup\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;__CD__;simple;_CRT_SECURE_NO_DEPRECATE;USE_CONTEXTPLUS"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
 				PrecompiledHeaderFile=".\..\obj\cdsimple/cdsimple.pch"
diff --git a/mak.vc9/cdtestgdk.vcproj b/mak.vc9/cdtestgdk.vcproj
new file mode 100644
index 0000000..e9bd027
--- /dev/null
+++ b/mak.vc9/cdtestgdk.vcproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdtestgdk"
+	ProjectGUID="{A7E49FB8-0000-45EC-1234-ABCDC7E83C00}"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include,..\..\iup\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CDTEST_WIN32;_CRT_SECURE_NO_DEPRECATE"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="freetype6.lib comctl32.lib cd.lib iupcd.lib cdcontextplus.lib iup.lib gdiplus.lib cdpdf.lib pdflib.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\lib,..\..\iup\lib"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\test\cdtest\cdtest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\cdtest.led"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\cdtest.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\cdtest_led.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\colorbar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\drivers.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\rubber.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\test\cdtest\cdtest.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/mak.vc9/cdtestplus.vcproj b/mak.vc9/cdtestplus.vcproj
new file mode 100644
index 0000000..dc3a9ad
--- /dev/null
+++ b/mak.vc9/cdtestplus.vcproj
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9,00"
+	Name="cdtestplus"
+	ProjectGUID="{A7E49FB8-5467-45EC-2211-FFAB7E83C100}"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\obj\Debug\$(ProjectName)"
+			ConfigurationType="1"
+			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="false"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="true"
+				SuppressStartupBanner="true"
+				TargetEnvironment="1"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include,..\..\iup\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CDTEST_WIN32;_CRT_SECURE_NO_DEPRECATE;USE_CONTEXTPLUS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				AssemblerListingLocation=""
+				ObjectFile="$(IntDir)\"
+				ProgramDataBaseFileName="$(IntDir)\vc90.pdb"
+				WarningLevel="4"
+				SuppressStartupBanner="true"
+				DebugInformationFormat="1"
+				CompileAs="0"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1046"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalOptions="/MACHINE:I386"
+				AdditionalDependencies="freetype6.lib comctl32.lib cd.lib iupcd.lib cdcontextplus.lib iup.lib gdiplus.lib cdpdf.lib pdflib.lib"
+				OutputFile="$(OutDir)\$(ProjectName).exe"
+				LinkIncremental="1"
+				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\lib,..\..\iup\lib"
+				GenerateManifest="false"
+				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
+				SubSystem="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
+			<File
+				RelativePath="..\test\cdtest\cdtest.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\cdtest.led"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\cdtest.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\cdtest_led.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\colorbar.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\drivers.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\list.c"
+				>
+			</File>
+			<File
+				RelativePath="..\test\cdtest\rubber.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl"
+			>
+			<File
+				RelativePath="..\test\cdtest\cdtest.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/src/Makefile b/src/Makefile
index f01667c..d2f5e0d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,12 +1,14 @@
 
-.PHONY: do_all cd_freetype cd cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5
-#do_all: cd_freetype cd cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5
-do_all: cd_freetype cd cd_pdflib cdpdf cdcontextplus cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5
+.PHONY: do_all cd_freetype cd cdgdk cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5
+#do_all: cd_freetype cd cdgdk cd_pdflib cdpdf cdcontextplus cdlua3 cdluapdf3 cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5
+do_all: cd_freetype cd cdgdk cd_pdflib cdpdf cdcontextplus cdlua5 cdluapdf5 cdluacontextplus5 cdluaim5
 
 cd_freetype:
 	@$(MAKE) --no-print-directory -f tecmake_compact.mak MF=cd_freetype
 cd:
 	@$(MAKE) --no-print-directory -f tecmake_compact.mak 
+cdgdk:
+	@$(MAKE) --no-print-directory -f tecmake_compact.mak USE_GDK=Yes
 cd_pdflib:
 	@$(MAKE) --no-print-directory -f tecmake_compact.mak MF=cd_pdflib
 cdpdf:
diff --git a/src/config.mak b/src/config.mak
index 725b87d..a2296cb 100644
--- a/src/config.mak
+++ b/src/config.mak
@@ -12,15 +12,18 @@ SRCINTCGM = circle.c ellipse.c intcgm1.c \
   sism.c tparse.c bparse.c 
 SRCINTCGM  := $(addprefix intcgm/, $(SRCINTCGM))
 
-SRCWIN32 = cdwclp.c cdwemf.c cdwimg.c cdwin.c cdwnative.c cdwprn.c cdwwmf.c wmf_emf.c cdwdbuf.c cdwdib.c
-SRCWIN32  := $(addprefix win32/, $(SRCWIN32))
-
 SRCSIM := cdfontex.c sim.c cd_truetype.c sim_other.c sim_primitives.c sim_text.c sim_linepolyfill.c
 SRCSIM  := $(addprefix sim/, $(SRCSIM))
 
+SRCWIN32 = cdwclp.c cdwemf.c cdwimg.c cdwin.c cdwnative.c cdwprn.c cdwwmf.c wmf_emf.c cdwdbuf.c cdwdib.c
+SRCWIN32  := $(addprefix win32/, $(SRCWIN32))
+
 SRCX11 = cdx11.c cdxclp.c cdximg.c cdxnative.c cdxdbuf.c xvertex.c
 SRCX11  := $(addprefix x11/, $(SRCX11))
 
+SRCGDK = cdgdk.c cdgdkclp.c cdgdkdbuf.c cdgdkimg.c cdgdknative.c
+SRCGDK  := $(addprefix gdk/, $(SRCGDK))
+
 SRCDRV = cddgn.c cdcgm.c cgm.c cddxf.c cdirgb.c cdmf.c cdps.c cdpicture.c cddebug.c
 SRCDRV  := $(addprefix drv/, $(SRCDRV))
 
@@ -33,11 +36,22 @@ SRCCOMM = cd.c wd.c wdhdcpy.c rgb2map.c cd_vectortext.c cd_active.c \
 SRC = $(SRCCOMM) $(SRCSVG) $(SRCINTCGM) $(SRCDRV) $(SRCSIM)
 
 ifneq ($(findstring Win, $(TEC_SYSNAME)), )
-  SRC += $(SRCWIN32)
+  ifdef USE_GDK
+    SRC += $(SRCGDK)
+    LIBNAME = cdgdk
+  else
+    SRC += $(SRCWIN32)
+  endif
   LIBS = freetype6
 else
-  SRC += $(SRCNULL) $(SRCX11)
-  USE_X11 = Yes
+  ifdef USE_GDK
+    SRC += $(SRCGDK)
+    LIBNAME = cdgdk
+  else
+    SRC += $(SRCX11)
+    USE_X11 = Yes
+  endif
+  SRC += $(SRCNULL)
   LIBS = freetype
 endif
 
diff --git a/src/make_uname b/src/make_uname
index 6de18ef..8c2f35e 100644
--- a/src/make_uname
+++ b/src/make_uname
@@ -2,6 +2,7 @@
 
 tecmake $1 MF=cd_freetype $2 $3 $4 $5 $6 $7 $8
 tecmake $1 $2 $3 $4 $5 $6 $7 $8
+tecmake $1 USE_GDK=Yes $2 $3 $4 $5 $6 $7 $8
 tecmake $1 MF=cd_pdflib $2 $3 $4 $5 $6 $7 $8
 tecmake $1 MF=cdpdf $2 $3 $4 $5 $6 $7 $8
 #tecmake $1 MF=cdlua3 $2 $3 $4 $5 $6 $7 $8
diff --git a/src/make_uname.bat b/src/make_uname.bat
index 70c3510..7ac2147 100644
--- a/src/make_uname.bat
+++ b/src/make_uname.bat
@@ -6,6 +6,7 @@ if "%1"=="vc-all" goto all-vc
 
 call tecmake %1 "MF=cd_freetype" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 %2 %3 %4 %5 %6 %7 %8
+call tecmake %1 "USE_GDK=Yes" %1 %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=cd_pdflib" %2 %3 %4 %5 %6 %7 %8
 call tecmake %1 "MF=cdpdf" %2 %3 %4 %5 %6 %7 %8
 REM call tecmake %1 "MF=cdlua3" %2 %3 %4 %5 %6 %7 %8
diff --git a/test/cdtest/cdtest.c b/test/cdtest/cdtest.c
index f5aa9f4..1e6375b 100644
--- a/test/cdtest/cdtest.c
+++ b/test/cdtest/cdtest.c
@@ -38,12 +38,11 @@ tPixelPos pixel_pos;
 tMarkPos mark_pos;
 tArcPos arc_pos;
 
-//#define USE_GDIPLUS
 
-#ifdef USE_GDIPLUS
-static const int use_gdiplus = 1;
+#ifdef USE_CONTEXTPLUS
+static const int use_contextplus = 1;
 #else
-static const int use_gdiplus = 0;
+static const int use_contextplus = 0;
 #endif
 
 static const int antialias = 1;
@@ -228,7 +227,7 @@ void CDTestInit(void)
 {
   memset(&ctgc, 0, sizeof(ctgc));
 
-  if (use_gdiplus) 
+  if (use_contextplus) 
   {
 #ifdef USE_GDIPLUS
     cdInitContextPlus();
@@ -245,11 +244,11 @@ void CDTestInit(void)
   ColorBarInit(IupGetHandle("dlgMain"), IupGetHandle("cnvColorBar"), &ctgc.foreground, &ctgc.background);
     
   /* cria o canvas do CD associado ao canvas do IUP */
-  if (use_gdiplus) cdUseContextPlus(1); 
+  if (use_contextplus) cdUseContextPlus(1); 
   ctgc.iup_canvas = cdCreateCanvas(CD_IUP, IupGetHandle("cnvMain"));
   if (!antialias) cdCanvasSetAttribute(ctgc.iup_canvas, "ANTIALIAS", "0");
   cdActivate(ctgc.iup_canvas);
-  if (use_gdiplus) cdUseContextPlus(0); 
+  if (use_contextplus) cdUseContextPlus(0); 
 
   /* associa os call-backs */
   setcallbacks();
@@ -352,11 +351,11 @@ void CDTestInit(void)
   IupMap(IupGetHandle("dlgPICCanvas"));
 
   /* cria o canvas WD */
-  if (use_gdiplus) cdUseContextPlus(1); 
+  if (use_contextplus) cdUseContextPlus(1); 
   ctgc.wd_canvas = cdCreateCanvas(CD_IUP, IupGetHandle("cnvWDCanvas"));
   ctgc.pic_canvas = cdCreateCanvas(CD_IUP, IupGetHandle("cnvPICCanvas"));
   ctgc.picture = cdCreateCanvas(CD_PICTURE, "");
-  if (use_gdiplus) cdUseContextPlus(0); 
+  if (use_contextplus) cdUseContextPlus(0); 
 
   /* CDTEST default values */
   cdActivate(ctgc.picture);
@@ -989,10 +988,10 @@ int fImageBuffer(Ihandle *self, int v)
       /* prosegue como se nao houvesse o buffer anterior */
     case NO_BUFFER:
       /* cria o canvas do buffer */
-      if (use_gdiplus) cdUseContextPlus(1); 
+      if (use_contextplus) cdUseContextPlus(1); 
       ctgc.buffer_canvas = cdCreateCanvas(CD_DBUFFER, ctgc.iup_canvas);
       if (!antialias) cdCanvasSetAttribute(ctgc.buffer_canvas, "ANTIALIAS", "0");
-      if (use_gdiplus) cdUseContextPlus(0); 
+      if (use_contextplus) cdUseContextPlus(0); 
       /* se nao consegui criar o canvas... */
       if (!ctgc.buffer_canvas) {
         /* desabilita o double-buffering */
diff --git a/test/cdtest/config.mak b/test/cdtest/config.mak
index fc1fb4a..201e44b 100644
--- a/test/cdtest/config.mak
+++ b/test/cdtest/config.mak
@@ -1,5 +1,13 @@
 APPNAME = cdtest
 
+ifdef USE_GDK
+  APPNAME = cdtestgdk
+endif
+ifdef USE_CONTEXTPLUS
+  APPNAME = cdtestplus
+  DEFINES = USE_CONTEXTPLUS
+endif
+
 SRC = cdtest.c cdtest_led.c colorbar.c drivers.c list.c rubber.c
 
 ifeq "$(TEC_SYSNAME)" "Win32"
diff --git a/test/simple/config.mak b/test/simple/config.mak
index 9598d84..a929c97 100644
--- a/test/simple/config.mak
+++ b/test/simple/config.mak
@@ -1,5 +1,11 @@
 APPNAME = simple
 
+ifdef USE_GDK
+  APPNAME = simplegdk
+else
+  DEFINES = USE_CONTEXTPLUS
+endif
+
 SRC = simple.c simple_led.c iupmain.c
             
 #DBG = Yes
diff --git a/test/simple/iupmain.c b/test/simple/iupmain.c
index 2f2efc1..daf058a 100644
--- a/test/simple/iupmain.c
+++ b/test/simple/iupmain.c
@@ -15,20 +15,15 @@ int main(int argc, char** argv)
 {
   IupOpen(&argc, &argv);                        
 
-#ifndef USE_GDK
+#ifdef USE_CONTEXTPLUS
   cdInitContextPlus();
 #endif
 
   simple_loadled();
 
-#ifdef USE_GDK
-  IupSetAttribute(IupGetHandle("SimpleCanvas"), "CD_GDK", "YES");
-#endif
-
   IupSetAttribute(IupGetHandle("SimpleDialog"), "PLACEMENT", "MAXIMIZED");
   IupShow(IupGetHandle("SimpleDialog"));
 
-
   SimpleCreateCanvas((char*)IupGetHandle("SimpleCanvas"));
 
   IupSetFunction("cmdExit", (Icallback) cmdExit);
diff --git a/test/simple/simple.c b/test/simple/simple.c
index 889185f..d04b96c 100644
--- a/test/simple/simple.c
+++ b/test/simple/simple.c
@@ -150,7 +150,7 @@ int SimpleTransform(void)
 
 int SimpleContextPlus(void)
 {
-#ifndef USE_GDK
+#ifdef USE_CONTEXTPLUS
   gdpiplus = !gdpiplus;
   SimpleKillCanvas();
   SimpleCreateCanvasWindow();