Upgrading im to 3.6

4 files changed, 57 insertions, 8 deletions

diff --git a/im/mak.vc9/im.sln b/im/mak.vc9/im.sln
index 2a2d791..06da12a 100755
--- a/im/mak.vc9/im.sln
+++ b/im/mak.vc9/im.sln
@@ -61,6 +61,8 @@ Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
 		Debug|x64 = Debug|x64
+		DebugGTK|Win32 = DebugGTK|Win32
+		DebugGTK|x64 = DebugGTK|x64
 		Release|Win32 = Release|Win32
 		Release|x64 = Release|x64
 	EndGlobalSection
@@ -68,89 +70,132 @@ Global
 		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.Debug|Win32.ActiveCfg = Debug|Win32
 		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.Debug|Win32.Build.0 = Debug|Win32
 		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.Debug|x64.ActiveCfg = Debug|x64
+		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.DebugGTK|Win32.ActiveCfg = Debug|x64
+		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.DebugGTK|x64.ActiveCfg = Debug|x64
+		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.DebugGTK|x64.Build.0 = Debug|x64
 		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.Release|Win32.ActiveCfg = Debug|Win32
 		{5A761929-07C3-48BD-8E4A-B37EC5C72C42}.Release|x64.ActiveCfg = Debug|x64
 		{CB863607-6B6C-0000-0000-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000000000}.Debug|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-0000-000000000000}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-0000-000000000000}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB863607-6B6C-0000-0000-000000000000}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000000000}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000000000}.Release|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000000000}.Release|x64.ActiveCfg = Debug|Win32
 		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.Debug|Win32.Build.0 = Debug|Win32
 		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB868607-6B6C-4CDF-9B6D-27AA925AE473}.Release|x64.ActiveCfg = Debug|Win32
 		{CB96E607-6B6C-0000-0000-000000000000}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB96E607-6B6C-0000-0000-000000000000}.Debug|Win32.Build.0 = Debug|Win32
 		{CB96E607-6B6C-0000-0000-000000000000}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB96E607-6B6C-0000-0000-000000000000}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB96E607-6B6C-0000-0000-000000000000}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB96E607-6B6C-0000-0000-000000000000}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB96E607-6B6C-0000-0000-000000000000}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB96E607-6B6C-0000-0000-000000000000}.Release|x64.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.Debug|Win32.Build.0 = Debug|Win32
 		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-4ADF-9B6D-27AA925AE493}.Release|x64.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.Debug|Win32.Build.0 = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA925AE463}.Release|x64.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.Debug|Win32.Build.0 = Debug|Win32
 		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB80E607-6B6C-345F-9B6D-27AA9123E493}.Release|x64.ActiveCfg = Debug|Win32
 		{43564684-75A9-41FE-847B-BF8514C14571}.Debug|Win32.ActiveCfg = Debug|Win32
 		{43564684-75A9-41FE-847B-BF8514C14571}.Debug|Win32.Build.0 = Debug|Win32
 		{43564684-75A9-41FE-847B-BF8514C14571}.Debug|x64.ActiveCfg = Debug|Win32
+		{43564684-75A9-41FE-847B-BF8514C14571}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{43564684-75A9-41FE-847B-BF8514C14571}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{43564684-75A9-41FE-847B-BF8514C14571}.Release|Win32.ActiveCfg = Debug|Win32
 		{43564684-75A9-41FE-847B-BF8514C14571}.Release|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000001234}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000001234}.Debug|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000001234}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-0000-000000001234}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-0000-000000001234}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000001234}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000001234}.Release|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-0000-000000001234}.Release|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-678900001234}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-678900001234}.Debug|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-0000-678900001234}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-0000-678900001234}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-0000-678900001234}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-678900001234}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-0000-678900001234}.Release|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-0000-678900001234}.Release|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-1234-000000001234}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-1234-000000001234}.Debug|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-1234-000000001234}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-1234-000000001234}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-1234-000000001234}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-1234-000000001234}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-1234-000000001234}.Release|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-1234-000000001234}.Release|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-7689-000000001234}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-7689-000000001234}.Debug|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-7689-000000001234}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-7689-000000001234}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB863607-6B6C-0000-7689-000000001234}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-7689-000000001234}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB863607-6B6C-0000-7689-000000001234}.Release|Win32.Build.0 = Debug|Win32
 		{CB863607-6B6C-0000-7689-000000001234}.Release|x64.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Debug|Win32.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Debug|Win32.Build.0 = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Debug|x64.ActiveCfg = Debug|Win32
+		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Release|Win32.ActiveCfg = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Release|Win32.Build.0 = Debug|Win32
 		{CB86E507-6B6C-4FDF-9B6D-27AA123AE463}.Release|x64.ActiveCfg = Debug|Win32
 		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.Debug|Win32.Build.0 = Debug|Win32
 		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.Debug|x64.ActiveCfg = Debug|Win32
+		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.Release|Win32.ActiveCfg = Debug|Win32
 		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.Release|Win32.Build.0 = Debug|Win32
 		{909637FA-8229-45A9-9F42-53D8ED5F91C5}.Release|x64.ActiveCfg = Debug|Win32
 		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.Debug|Win32.ActiveCfg = Debug|Win32
 		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.Debug|Win32.Build.0 = Debug|Win32
 		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.Debug|x64.ActiveCfg = Debug|Win32
+		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.Release|Win32.ActiveCfg = Debug|Win32
 		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.Release|Win32.Build.0 = Debug|Win32
 		{328002C9-0726-4BB5-AD09-1BA1DC96F912}.Release|x64.ActiveCfg = Debug|Win32
 		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.Debug|Win32.ActiveCfg = Debug|Win32
 		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.Debug|Win32.Build.0 = Debug|Win32
 		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.Debug|x64.ActiveCfg = Debug|Win32
+		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.DebugGTK|Win32.ActiveCfg = Debug|Win32
+		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.DebugGTK|Win32.Build.0 = Debug|Win32
+		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.DebugGTK|x64.ActiveCfg = Debug|Win32
 		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.Release|Win32.ActiveCfg = Debug|Win32
 		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.Release|Win32.Build.0 = Debug|Win32
 		{99675DC2-A7EE-4BC8-B7E7-CD437D4FAC3B}.Release|x64.ActiveCfg = Debug|Win32
diff --git a/im/mak.vc9/im_copy.vcproj b/im/mak.vc9/im_copy.vcproj
index d9bc064..c538ec6 100755
--- a/im/mak.vc9/im_copy.vcproj
+++ b/im/mak.vc9/im_copy.vcproj
@@ -69,6 +69,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="D:\LNG\WMFSDK9\lib;../lib"
+				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"
diff --git a/im/mak.vc9/im_info.vcproj b/im/mak.vc9/im_info.vcproj
index 7cdd700..398e56b 100755
--- a/im/mak.vc9/im_info.vcproj
+++ b/im/mak.vc9/im_info.vcproj
@@ -69,6 +69,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="D:\LNG\WMFSDK9\lib;../lib"
+				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"
@@ -100,16 +101,17 @@
 	<References>
 	</References>
 	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+		<File
+			RelativePath="..\test\im_info.cpp"
 			>
-			<File
-				RelativePath="..\test\im_info.cpp"
+			<FileConfiguration
+				Name="Debug|Win32"
 				>
-			</File>
-		</Filter>
+				<Tool
+					Name="VCCLCompilerTool"
+				/>
+			</FileConfiguration>
+		</File>
 	</Files>
 	<Globals>
 	</Globals>
diff --git a/im/mak.vc9/im_view.vcproj b/im/mak.vc9/im_view.vcproj
index e7642c7..6ae9671 100755
--- a/im/mak.vc9/im_view.vcproj
+++ b/im/mak.vc9/im_view.vcproj
@@ -69,6 +69,7 @@
 				OutputFile="$(OutDir)\$(ProjectName).exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="../lib;../../iup/lib;../../cd/lib"
+				GenerateManifest="false"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(TargetDir)$(TargetName).pdb"
 				SubSystem="1"