[gtkmm/gtkmm-3-0] Fix up Visual Studio projects (GTKMM-3.0.x)



commit 910eb331e6a943016148d934116855def1e01bb8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Mon Aug 15 16:03:46 2011 +0800

    Fix up Visual Studio projects (GTKMM-3.0.x)
    
    -Set EOL of *.sln files to CR/LF (Windows) so that they will work properly.
    -Update GDKMM/GTKMM DLL/LIB names to *-3_0-* from *-2_4-*
    -Updated source file listings for GDKMM and GTKMM so that sources will
     compile and link correctly, and have them link to GTK+3/GDK3 libraries
    -Update GDKMM projects as they need to link to GIOMM too.
    -Update the demo projects to link to CairoMM also, as that is also required.
    -Update the VS2010 demo project to link to Visual C++ 2010-compiled versions
     of the GLibMM, ATKMM and PangoMM (*-vc90-*.lib -> *-vc100-*.lib)

 MSVC_Net2005/demos/gtk-demo/gtk-demo.vcproj  |   16 +-
 MSVC_Net2005/gdkmm/gdkmm.vcproj              |   90 +++--------
 MSVC_Net2005/gtkmm.sln                       |    4 +-
 MSVC_Net2005/gtkmm/gtkmm.vcproj              |  234 +++++++++++++------------
 MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj  |   16 +-
 MSVC_Net2008/gdkmm/gdkmm.vcproj              |   90 +++--------
 MSVC_Net2008/gtkmm.sln                       |    4 +-
 MSVC_Net2008/gtkmm/gtkmm.vcproj              |  236 ++++++++++++++------------
 MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj |    8 +-
 MSVC_Net2010/gdkmm/gdkmm.vcxproj             |   48 ++---
 MSVC_Net2010/gdkmm/gdkmm.vcxproj.filters     |   48 ++----
 MSVC_Net2010/gtkmm.sln                       |    4 +-
 MSVC_Net2010/gtkmm/gtkmm.vcxproj             |   92 +++++-----
 MSVC_Net2010/gtkmm/gtkmm.vcxproj.filters     |  155 +++++++++--------
 14 files changed, 478 insertions(+), 567 deletions(-)
---
diff --git a/MSVC_Net2005/demos/gtk-demo/gtk-demo.vcproj b/MSVC_Net2005/demos/gtk-demo/gtk-demo.vcproj
index 98badf5..51c7738 100755
--- a/MSVC_Net2005/demos/gtk-demo/gtk-demo.vcproj
+++ b/MSVC_Net2005/demos/gtk-demo/gtk-demo.vcproj
@@ -68,8 +68,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib cairomm-vc80-d-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/gtk-demo.pdb"
@@ -148,8 +148,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc80-2_0.lib glibmm-vc80-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc80-2_0.lib glibmm-vc80-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib cairomm-vc80-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -233,8 +233,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib cairomm-vc80-d-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/gtk-demo.pdb"
@@ -314,8 +314,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc80-2_0.lib glibmm-vc80-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc80-2_0.lib glibmm-vc80-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib cairomm-vc80-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/MSVC_Net2005/gdkmm/gdkmm.vcproj b/MSVC_Net2005/gdkmm/gdkmm.vcproj
index bb63ceb..3d9e745 100755
--- a/MSVC_Net2005/gdkmm/gdkmm.vcproj
+++ b/MSVC_Net2005/gdkmm/gdkmm.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="gdkmm-2.4"
+	Name="gdkmm-3.0"
 	ProjectGUID="{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
 	Keyword="Win32Proj"
 	>
@@ -69,8 +69,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib"
-				OutputFile="$(OutDir)/gdkmm-vc80-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib sigc-vc80-d-2_0.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib"
+				OutputFile="$(OutDir)/gdkmm-vc80-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 			/>
@@ -148,8 +148,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib"
-				OutputFile="$(OutDir)\gdkmm-vc80-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib"
+				OutputFile="$(OutDir)\gdkmm-vc80-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 			/>
 			<Tool
@@ -230,8 +230,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib sigc-vc80-d-2_0.lib glibmm-vc80-d-2_4.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib"
-				OutputFile="$(OutDir)/gdkmm-vc80-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib sigc-vc80-d-2_0.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib"
+				OutputFile="$(OutDir)/gdkmm-vc80-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 				TargetMachine="17"
@@ -311,8 +311,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib"
-				OutputFile="$(OutDir)\gdkmm-vc80-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib"
+				OutputFile="$(OutDir)\gdkmm-vc80-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				TargetMachine="17"
 			/>
@@ -351,10 +351,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\gdk\gdkmm\bitmap.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\blank.cpp"
 				>
 			</File>
@@ -363,15 +359,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\colormap.cc"
+				RelativePath="..\..\gdk\gdkmm\cursor.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\cursor.cc"
+				RelativePath="..\..\gdk\gdkmm\device.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\device.cc"
+				RelativePath="..\..\gdk\gdkmm\devicemanager.cc"
 				>
 			</File>
 			<File
@@ -387,26 +383,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\drawable.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\event.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\gc.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\general.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\image.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\pixbuf.cc"
 				>
 			</File>
@@ -427,27 +411,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\pixmap.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\rectangle.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\region.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gdk\gdkmm\rgb.cc"
+				RelativePath="..\..\gdk\gdkmm\rgba.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\rgbcmap.cc"
+				RelativePath="..\..\gdk\gdkmm\screen.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\screen.cc"
+				RelativePath="..\..\gdk\gdkmm\timecoord.cc"
 				>
 			</File>
 			<File
@@ -473,23 +449,19 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\gdk\gdkmm\bitmap.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\color.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\colormap.h"
+				RelativePath="..\..\gdk\gdkmm\cursor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\cursor.h"
+				RelativePath="..\..\gdk\gdkmm\device.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\device.h"
+				RelativePath="..\..\gdk\gdkmm\devicemanager.h"
 				>
 			</File>
 			<File
@@ -505,26 +477,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\drawable.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\event.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\gc.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\general.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\image.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\list.h"
 				>
 			</File>
@@ -549,7 +509,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\pixmap.h"
+				RelativePath="..\..\gdk\gdkmm\rgba.h"
 				>
 			</File>
 			<File
@@ -557,19 +517,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\region.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gdk\gdkmm\rgb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gdk\gdkmm\rgbcmap.h"
+				RelativePath="..\..\gdk\gdkmm\screen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\screen.h"
+				RelativePath="..\..\gdk\gdkmm\timecoord.h"
 				>
 			</File>
 			<File
diff --git a/MSVC_Net2005/gtkmm.sln b/MSVC_Net2005/gtkmm.sln
index e0392a7..8fe7748 100755
--- a/MSVC_Net2005/gtkmm.sln
+++ b/MSVC_Net2005/gtkmm.sln
@@ -1,11 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-2.4", "gdkmm\gdkmm.vcproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-3.0", "gdkmm\gdkmm.vcproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-2.4", "gtkmm\gtkmm.vcproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-3.0", "gtkmm\gtkmm.vcproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
 	ProjectSection(ProjectDependencies) = postProject
 		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}
 		{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}
diff --git a/MSVC_Net2005/gtkmm/gtkmm.vcproj b/MSVC_Net2005/gtkmm/gtkmm.vcproj
index 9fbaf7d..593a584 100755
--- a/MSVC_Net2005/gtkmm/gtkmm.vcproj
+++ b/MSVC_Net2005/gtkmm/gtkmm.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="gtkmm-2.4"
+	Name="gtkmm-3.0"
 	ProjectGUID="{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
 	Keyword="Win32Proj"
 	>
@@ -70,8 +70,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib sigc-vc80-d-2_0.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib"
-				OutputFile="$(OutDir)/gtkmm-vc80-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib sigc-vc80-d-2_0.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib"
+				OutputFile="$(OutDir)/gtkmm-vc80-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 			/>
@@ -150,8 +150,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib"
-				OutputFile="$(OutDir)\gtkmm-vc80-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib"
+				OutputFile="$(OutDir)\gtkmm-vc80-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 			/>
 			<Tool
@@ -233,8 +233,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib sigc-vc80-d-2_0.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib"
-				OutputFile="$(OutDir)/gtkmm-vc80-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc80-d-2_4.lib glibmm-vc80-d-2_4.lib sigc-vc80-d-2_0.lib cairomm-vc80-d-1_0.lib pangomm-vc80-d-1_4.lib atkmm-vc80-d-1_6.lib"
+				OutputFile="$(OutDir)/gtkmm-vc80-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 				TargetMachine="17"
@@ -315,8 +315,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib"
-				OutputFile="$(OutDir)\gtkmm-vc80-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc80-2_4.lib glibmm-vc80-2_4.lib sigc-vc80-2_0.lib cairomm-vc80-1_0.lib pangomm-vc80-1_4.lib atkmm-vc80-1_6.lib"
+				OutputFile="$(OutDir)\gtkmm-vc80-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				TargetMachine="17"
 			/>
@@ -393,6 +393,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\appchooser.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserbutton.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserdialog.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserwidget.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\arrow.cc"
 				>
 			</File>
@@ -409,10 +425,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\border.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\box.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\buildable.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\builder.cc"
 				>
 			</File>
@@ -429,6 +453,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\cellarea.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareabox.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareacontext.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\celleditable.cc"
 				>
 			</File>
@@ -501,22 +537,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\combo.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\combobox.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\comboboxentry.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gtk\gtkmm\comboboxentrytext.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\comboboxtext.cc"
 				>
 			</File>
@@ -525,7 +549,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\curve.cc"
+				RelativePath="..\..\gtk\gtkmm\cssprovider.cc"
 				>
 			</File>
 			<File
@@ -585,10 +609,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\fileselection.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\fixed.cc"
 				>
 			</File>
@@ -605,6 +625,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\grid.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\handlebox.cc"
 				>
 			</File>
@@ -645,18 +669,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\inputdialog.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\invisible.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\item.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\label.cc"
 				>
 			</File>
@@ -685,10 +701,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\menu_elems.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\menubar.cc"
 				>
 			</File>
@@ -713,19 +725,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\notebook.cc"
+				RelativePath="..\..\gtk\gtkmm\numerableicon.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\object.cc"
+				RelativePath="..\..\gtk\gtkmm\notebook.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\offscreenwindow.cc"
+				RelativePath="..\..\gtk\gtkmm\object.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\optionmenu.cc"
+				RelativePath="..\..\gtk\gtkmm\offscreenwindow.cc"
 				>
 			</File>
 			<File
@@ -745,10 +757,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\plug.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\printcontext.cc"
 				>
 			</File>
@@ -793,10 +801,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\rc.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\recentaction.cc"
 				>
 			</File>
@@ -829,15 +833,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\ruler.cc"
+				RelativePath="..\..\gtk\gtkmm\scale.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scale.cc"
+				RelativePath="..\..\gtk\gtkmm\scalebutton.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scalebutton.cc"
+				RelativePath="..\..\gtk\gtkmm\scrollable.cc"
 				>
 			</File>
 			<File
@@ -877,10 +881,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\socket.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\spinbutton.cc"
 				>
 			</File>
@@ -909,7 +909,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\style.cc"
+				RelativePath="..\..\gtk\gtkmm\stylecontext.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\styleprovider.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\switch.cc"
 				>
 			</File>
 			<File
@@ -1001,10 +1009,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\tooltips.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\treedragdest.cc"
 				>
 			</File>
@@ -1081,6 +1085,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\widgetpath.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\window.cc"
 				>
 			</File>
@@ -1135,6 +1143,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\appchooser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserbutton.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserdialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserwidget.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\arrow.h"
 				>
 			</File>
@@ -1175,6 +1199,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\cellarea.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareabox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareacontext.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\calendar.h"
 				>
 			</File>
@@ -1251,10 +1287,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\combo.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\combobox.h"
 				>
 			</File>
@@ -1263,10 +1295,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\comboboxentrytext.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\comboboxtext.h"
 				>
 			</File>
@@ -1275,7 +1303,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\curve.h"
+				RelativePath="..\..\gtk\gtkmm\cssprovider.h"
 				>
 			</File>
 			<File
@@ -1335,10 +1363,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\fileselection.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\fixed.h"
 				>
 			</File>
@@ -1355,6 +1379,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\grid.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\handlebox.h"
 				>
 			</File>
@@ -1395,18 +1423,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\inputdialog.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\invisible.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\item.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\label.h"
 				>
 			</File>
@@ -1435,10 +1455,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\menu_elems.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\menubar.h"
 				>
 			</File>
@@ -1463,19 +1479,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\notebook.h"
+				RelativePath="..\..\gtk\gtkmm\numerableicon.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\object.h"
+				RelativePath="..\..\gtk\gtkmm\notebook.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\offscreenwindow.h"
+				RelativePath="..\..\gtk\gtkmm\object.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\optionmenu.h"
+				RelativePath="..\..\gtk\gtkmm\offscreenwindow.h"
 				>
 			</File>
 			<File
@@ -1495,10 +1511,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\plug.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\printcontext.h"
 				>
 			</File>
@@ -1543,10 +1555,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\rc.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\recentaction.h"
 				>
 			</File>
@@ -1579,15 +1587,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\ruler.h"
+				RelativePath="..\..\gtk\gtkmm\scale.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scale.h"
+				RelativePath="..\..\gtk\gtkmm\scalebutton.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scalebutton.h"
+				RelativePath="..\..\gtk\gtkmm\scrollable.h"
 				>
 			</File>
 			<File
@@ -1627,10 +1635,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\socket.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\spinbutton.h"
 				>
 			</File>
@@ -1659,7 +1663,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\style.h"
+				RelativePath="..\..\gtk\gtkmm\stylecontext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\styleprovider.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\switch.h"
 				>
 			</File>
 			<File
@@ -1751,10 +1763,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\tooltips.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\treedragdest.h"
 				>
 			</File>
@@ -1831,6 +1839,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\widgetpath.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\window.h"
 				>
 			</File>
diff --git a/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj b/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj
index 7295aae..f67e958 100644
--- a/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj
+++ b/MSVC_Net2008/demos/gtk-demo/gtk-demo.vcproj
@@ -69,8 +69,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib gdk-win32-3.0.lib glib-2.0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib cairomm-vc90-d-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/gtk-demo.pdb"
@@ -148,8 +148,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc90-2_0.lib glibmm-vc90-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc90-2_0.lib glibmm-vc90-2_4.lib gdk-win32-3.0.lib glib-2.0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib cairomm-vc90-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -232,8 +232,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib gdk-win32-3.0.lib glib-2.0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib cairomm-vc90-d-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/gtk-demo.pdb"
@@ -312,8 +312,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="sigc-vc90-2_0.lib glibmm-vc90-2_4.lib gdk-win32-2.0.lib glib-2.0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib"
-				OutputFile="$(OutDir)/gtk-demo.exe"
+				AdditionalDependencies="sigc-vc90-2_0.lib glibmm-vc90-2_4.lib gdk-win32-3.0.lib glib-2.0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib cairomm-vc90-1_0.lib"
+				OutputFile="$(OutDir)/gtk3-demo.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
diff --git a/MSVC_Net2008/gdkmm/gdkmm.vcproj b/MSVC_Net2008/gdkmm/gdkmm.vcproj
index ecac9c1..69e9aa9 100644
--- a/MSVC_Net2008/gdkmm/gdkmm.vcproj
+++ b/MSVC_Net2008/gdkmm/gdkmm.vcproj
@@ -2,7 +2,7 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gdkmm-2.4"
+	Name="gdkmm-3.0"
 	ProjectGUID="{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
@@ -70,8 +70,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib"
-				OutputFile="$(OutDir)/gdkmm-vc90-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib sigc-vc90-d-2_0.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib"
+				OutputFile="$(OutDir)/gdkmm-vc90-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@@ -148,8 +148,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib"
-				OutputFile="$(OutDir)\gdkmm-vc90-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib"
+				OutputFile="$(OutDir)\gdkmm-vc90-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -229,8 +229,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib sigc-vc90-d-2_0.lib glibmm-vc90-d-2_4.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib"
-				OutputFile="$(OutDir)/gdkmm-vc90-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib sigc-vc90-d-2_0.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib"
+				OutputFile="$(OutDir)/gdkmm-vc90-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@@ -309,8 +309,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gdk_pixbuf-2.0.lib gtk-win32-2.0.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib"
-				OutputFile="$(OutDir)\gdkmm-vc90-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gdk_pixbuf-2.0.lib gtk-win32-3.0.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib"
+				OutputFile="$(OutDir)\gdkmm-vc90-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -348,10 +348,6 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			>
 			<File
-				RelativePath="..\..\gdk\gdkmm\bitmap.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\blank.cpp"
 				>
 			</File>
@@ -360,15 +356,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\colormap.cc"
+				RelativePath="..\..\gdk\gdkmm\cursor.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\cursor.cc"
+				RelativePath="..\..\gdk\gdkmm\device.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\device.cc"
+				RelativePath="..\..\gdk\gdkmm\devicemanager.cc"
 				>
 			</File>
 			<File
@@ -384,26 +380,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\drawable.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\event.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\gc.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\general.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\image.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\pixbuf.cc"
 				>
 			</File>
@@ -424,27 +408,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\pixmap.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\rectangle.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\region.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gdk\gdkmm\rgb.cc"
+				RelativePath="..\..\gdk\gdkmm\rgba.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\rgbcmap.cc"
+				RelativePath="..\..\gdk\gdkmm\screen.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\screen.cc"
+				RelativePath="..\..\gdk\gdkmm\timecoord.cc"
 				>
 			</File>
 			<File
@@ -470,23 +446,19 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\..\gdk\gdkmm\bitmap.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\color.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\colormap.h"
+				RelativePath="..\..\gdk\gdkmm\cursor.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\cursor.h"
+				RelativePath="..\..\gdk\gdkmm\device.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\device.h"
+				RelativePath="..\..\gdk\gdkmm\devicemanager.h"
 				>
 			</File>
 			<File
@@ -502,26 +474,14 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\drawable.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\event.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\gc.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\general.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\image.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gdk\gdkmm\list.h"
 				>
 			</File>
@@ -546,7 +506,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\pixmap.h"
+				RelativePath="..\..\gdk\gdkmm\rgba.h"
 				>
 			</File>
 			<File
@@ -554,19 +514,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\region.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gdk\gdkmm\rgb.h"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gdk\gdkmm\rgbcmap.h"
+				RelativePath="..\..\gdk\gdkmm\screen.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gdk\gdkmm\screen.h"
+				RelativePath="..\..\gdk\gdkmm\timecoord.h"
 				>
 			</File>
 			<File
diff --git a/MSVC_Net2008/gtkmm.sln b/MSVC_Net2008/gtkmm.sln
index d249e1e..3298cc2 100644
--- a/MSVC_Net2008/gtkmm.sln
+++ b/MSVC_Net2008/gtkmm.sln
@@ -1,11 +1,11 @@
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-2.4", "gdkmm\gdkmm.vcproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-3.0", "gdkmm\gdkmm.vcproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
 	ProjectSection(ProjectDependencies) = postProject
 		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-2.4", "gtkmm\gtkmm.vcproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-3.0", "gtkmm\gtkmm.vcproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
 	ProjectSection(ProjectDependencies) = postProject
 		{07324745-C9BE-4D65-B08A-9C88188C0C28} = {07324745-C9BE-4D65-B08A-9C88188C0C28}
 		{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E} = {976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}
diff --git a/MSVC_Net2008/gtkmm/gtkmm.vcproj b/MSVC_Net2008/gtkmm/gtkmm.vcproj
index ae7b4fe..75d625d 100644
--- a/MSVC_Net2008/gtkmm/gtkmm.vcproj
+++ b/MSVC_Net2008/gtkmm/gtkmm.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject
 	ProjectType="Visual C++"
 	Version="9.00"
-	Name="gtkmm-2.4"
+	Name="gtkmm-3.0"
 	ProjectGUID="{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
-	RootNamespace="gtkmm-2.4"
+	RootNamespace="gtkmm-3.0"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="131072"
 	>
@@ -72,8 +72,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib sigc-vc90-d-2_0.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib"
-				OutputFile="$(OutDir)/gtkmm-vc90-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib sigc-vc90-d-2_0.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib"
+				OutputFile="$(OutDir)/gtkmm-vc90-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@@ -151,8 +151,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib"
-				OutputFile="$(OutDir)\gtkmm-vc90-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib"
+				OutputFile="$(OutDir)\gtkmm-vc90-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -233,8 +233,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib sigc-vc90-d-2_0.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib"
-				OutputFile="$(OutDir)/gtkmm-vc90-d-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc90-d-2_4.lib glibmm-vc90-d-2_4.lib sigc-vc90-d-2_0.lib cairomm-vc90-d-1_0.lib pangomm-vc90-d-1_4.lib atkmm-vc90-d-1_6.lib"
+				OutputFile="$(OutDir)/gtkmm-vc90-d-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				GenerateDebugInformation="true"
 				RandomizedBaseAddress="1"
@@ -314,8 +314,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-2.0.lib gtk-win32-2.0.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib"
-				OutputFile="$(OutDir)\gtkmm-vc90-2_4.dll"
+				AdditionalDependencies="glib-2.0.lib gobject-2.0.lib gdk-win32-3.0.lib gtk-win32-3.0.lib giomm-vc90-2_4.lib glibmm-vc90-2_4.lib sigc-vc90-2_0.lib cairomm-vc90-1_0.lib pangomm-vc90-1_4.lib atkmm-vc90-1_6.lib"
+				OutputFile="$(OutDir)\gtkmm-vc90-3_0.dll"
 				ModuleDefinitionFile="$(PlatformName)\$(ConfigurationName)\$(InputName).def"
 				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
@@ -391,6 +391,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\appchooser.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserbutton.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserdialog.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserwidget.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\arrow.cc"
 				>
 			</File>
@@ -407,10 +423,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\border.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\box.cc"
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\buildable.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\builder.cc"
 				>
 			</File>
@@ -427,6 +451,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\cellarea.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareabox.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareacontext.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\celleditable.cc"
 				>
 			</File>
@@ -499,22 +535,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\combo.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\combobox.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\comboboxentry.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\gtk\gtkmm\comboboxentrytext.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\comboboxtext.cc"
 				>
 			</File>
@@ -523,7 +547,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\curve.cc"
+				RelativePath="..\..\gtk\gtkmm\cssprovider.cc"
 				>
 			</File>
 			<File
@@ -583,10 +607,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\fileselection.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\fixed.cc"
 				>
 			</File>
@@ -603,6 +623,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\grid.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\handlebox.cc"
 				>
 			</File>
@@ -643,18 +667,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\inputdialog.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\invisible.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\item.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\label.cc"
 				>
 			</File>
@@ -683,10 +699,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\menu_elems.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\menubar.cc"
 				>
 			</File>
@@ -711,19 +723,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\notebook.cc"
+				RelativePath="..\..\gtk\gtkmm\numerableicon.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\object.cc"
+				RelativePath="..\..\gtk\gtkmm\notebook.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\offscreenwindow.cc"
+				RelativePath="..\..\gtk\gtkmm\object.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\optionmenu.cc"
+				RelativePath="..\..\gtk\gtkmm\offscreenwindow.cc"
 				>
 			</File>
 			<File
@@ -743,10 +755,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\plug.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\printcontext.cc"
 				>
 			</File>
@@ -791,10 +799,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\rc.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\recentaction.cc"
 				>
 			</File>
@@ -827,15 +831,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\ruler.cc"
+				RelativePath="..\..\gtk\gtkmm\scale.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scale.cc"
+				RelativePath="..\..\gtk\gtkmm\scalebutton.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scalebutton.cc"
+				RelativePath="..\..\gtk\gtkmm\scrollable.cc"
 				>
 			</File>
 			<File
@@ -875,10 +879,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\socket.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\spinbutton.cc"
 				>
 			</File>
@@ -907,7 +907,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\style.cc"
+				RelativePath="..\..\gtk\gtkmm\stylecontext.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\styleprovider.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\switch.cc"
 				>
 			</File>
 			<File
@@ -999,10 +1007,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\tooltips.cc"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\treedragdest.cc"
 				>
 			</File>
@@ -1079,6 +1083,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\widgetpath.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\window.cc"
 				>
 			</File>
@@ -1133,6 +1141,22 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\appchooser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserbutton.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserdialog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\appchooserwidget.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\arrow.h"
 				>
 			</File>
@@ -1173,6 +1197,18 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\cellarea.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareabox.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\cellareacontext.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\calendar.h"
 				>
 			</File>
@@ -1249,10 +1285,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\combo.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\combobox.h"
 				>
 			</File>
@@ -1261,10 +1293,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\comboboxentrytext.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\comboboxtext.h"
 				>
 			</File>
@@ -1273,7 +1301,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\curve.h"
+				RelativePath="..\..\gtk\gtkmm\cssprovider.h"
 				>
 			</File>
 			<File
@@ -1333,10 +1361,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\fileselection.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\fixed.h"
 				>
 			</File>
@@ -1353,6 +1377,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\grid.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\handlebox.h"
 				>
 			</File>
@@ -1393,18 +1421,10 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\inputdialog.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\invisible.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\item.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\label.h"
 				>
 			</File>
@@ -1433,10 +1453,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\menu_elems.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\menubar.h"
 				>
 			</File>
@@ -1461,19 +1477,19 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\notebook.h"
+				RelativePath="..\..\gtk\gtkmm\numerableicon.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\object.h"
+				RelativePath="..\..\gtk\gtkmm\notebook.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\offscreenwindow.h"
+				RelativePath="..\..\gtk\gtkmm\object.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\optionmenu.h"
+				RelativePath="..\..\gtk\gtkmm\offscreenwindow.h"
 				>
 			</File>
 			<File
@@ -1493,10 +1509,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\plug.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\printcontext.h"
 				>
 			</File>
@@ -1541,10 +1553,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\rc.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\recentaction.h"
 				>
 			</File>
@@ -1577,15 +1585,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\ruler.h"
+				RelativePath="..\..\gtk\gtkmm\scale.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scale.h"
+				RelativePath="..\..\gtk\gtkmm\scalebutton.h"
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\scalebutton.h"
+				RelativePath="..\..\gtk\gtkmm\scrollable.h"
 				>
 			</File>
 			<File
@@ -1625,10 +1633,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\socket.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\spinbutton.h"
 				>
 			</File>
@@ -1657,7 +1661,15 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\style.h"
+				RelativePath="..\..\gtk\gtkmm\stylecontext.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\styleprovider.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\gtk\gtkmm\switch.h"
 				>
 			</File>
 			<File
@@ -1749,10 +1761,6 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\gtk\gtkmm\tooltips.h"
-				>
-			</File>
-			<File
 				RelativePath="..\..\gtk\gtkmm\treedragdest.h"
 				>
 			</File>
@@ -1829,6 +1837,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\gtk\gtkmm\widgetpath.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\gtk\gtkmm\window.h"
 				>
 			</File>
diff --git a/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj b/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj
index 47d1269..c6fb088 100644
--- a/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj
+++ b/MSVC_Net2010/demos/gtk-demo/gtk-demo.vcxproj
@@ -97,7 +97,7 @@
       <DisableSpecificWarnings>4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>sigc-vc90-d-2_0.lib;glibmm-vc90-d-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc90-d-1_4.lib;atkmm-vc90-d-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sigc-vc100-d-2_0.lib;glibmm-vc100-d-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc100-d-1_4.lib;atkmm-vc100-d-1_6.lib;cairomm-vc100-d-1_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)gtk-demo.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)gtk-demo.pdb</ProgramDatabaseFile>
@@ -122,7 +122,7 @@
       <DisableSpecificWarnings>4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>sigc-vc90-2_0.lib;glibmm-vc90-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc90-1_4.lib;atkmm-vc90-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sigc-vc100-2_0.lib;glibmm-vc100-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc100-1_4.lib;atkmm-vc100-1_6.lib;cairomm-vc100-1_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)gtk-demo.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
@@ -154,7 +154,7 @@
       <DisableSpecificWarnings>4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>sigc-vc90-d-2_0.lib;glibmm-vc90-d-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc90-d-1_4.lib;atkmm-vc90-d-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sigc-vc100-d-2_0.lib;glibmm-vc100-d-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc100-d-1_4.lib;atkmm-vc100-d-1_6.lib;cairomm-vc100-d-1_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)gtk-demo.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>$(OutDir)gtk-demo.pdb</ProgramDatabaseFile>
@@ -182,7 +182,7 @@
       <DisableSpecificWarnings>4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>sigc-vc90-2_0.lib;glibmm-vc90-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc90-1_4.lib;atkmm-vc90-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>sigc-vc100-2_0.lib;glibmm-vc100-2_4.lib;gdk-win32-2.0.lib;glib-2.0.lib;pangomm-vc100-1_4.lib;atkmm-vc100-1_6.lib;cairomm-vc100-1_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)gtk-demo.exe</OutputFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
diff --git a/MSVC_Net2010/gdkmm/gdkmm.vcxproj b/MSVC_Net2010/gdkmm/gdkmm.vcxproj
index fc03296..76c4785 100644
--- a/MSVC_Net2010/gdkmm/gdkmm.vcxproj
+++ b/MSVC_Net2010/gdkmm/gdkmm.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>gdkmm-2.4</ProjectName>
+    <ProjectName>gdkmm-3.0</ProjectName>
     <ProjectGuid>{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
@@ -74,10 +74,10 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreLinkEventUseInBuild>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gdkmm-vc100-d-2_4</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gdkmm-vc100-d-2_4</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gdkmm-vc100-2_4</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gdkmm-vc100-2_4</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gdkmm-vc100-d-3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gdkmm-vc100-d-3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gdkmm-vc100-3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gdkmm-vc100-3_0</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -99,8 +99,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-2.0.lib;sigc-vc100-d-2_0.lib;glibmm-vc100-d-2_4.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gdkmm-vc100-d-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-3.0.lib;giomm-vc100-d-2_4.lib;glibmm-vc100-d-2_4.lib;sigc-vc100-d-2_0.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gdkmm-vc100-d-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -125,8 +125,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-2.0.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gdkmm-vc100-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-3.0.lib;giomm-vc100-2_4.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gdkmm-vc100-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -156,8 +156,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-2.0.lib;sigc-vc100-d-2_0.lib;glibmm-vc100-d-2_4.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gdkmm-vc100-d-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-3.0.lib;giomm-vc100-d-2_4.lib;glibmm-vc100-d-2_4.lib;sigc-vc100-d-2_0.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gdkmm-vc100-d-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -186,8 +186,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-2.0.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gdkmm-vc100-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gdk_pixbuf-2.0.lib;gtk-win32-3.0.lib;giomm-vc100-2_4.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gdkmm-vc100-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -196,61 +196,51 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gdk\gdkmm\bitmap.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\color.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\colormap.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\cursor.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\device.cc" />
+	<ClCompile Include="..\..\gdk\gdkmm\devicemanager.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\display.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\displaymanager.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\dragcontext.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\drawable.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\event.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\gc.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\general.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\image.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\pixbuf.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\pixbufanimation.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\pixbufanimationiter.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\pixbufformat.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\pixbufloader.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\pixmap.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\rectangle.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\region.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\rgb.cc" />
-    <ClCompile Include="..\..\gdk\gdkmm\rgbcmap.cc" />
+    <ClCompile Include="..\..\gdk\gdkmm\rgba.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\screen.cc" />
+	<ClCompile Include="..\..\gdk\gdkmm\timecoord.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\types.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\visual.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\window.cc" />
     <ClCompile Include="..\..\gdk\gdkmm\wrap_init.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\gdk\gdkmm\bitmap.h" />
     <ClInclude Include="..\..\gdk\gdkmm\color.h" />
     <ClInclude Include="..\..\gdk\gdkmm\colormap.h" />
     <ClInclude Include="..\..\gdk\gdkmm\cursor.h" />
     <ClInclude Include="..\..\gdk\gdkmm\device.h" />
+	<ClInclude Include="..\..\gdk\gdkmm\devicemanager.h" />
     <ClInclude Include="..\..\gdk\gdkmm\display.h" />
     <ClInclude Include="..\..\gdk\gdkmm\displaymanager.h" />
     <ClInclude Include="..\..\gdk\gdkmm\dragcontext.h" />
-    <ClInclude Include="..\..\gdk\gdkmm\drawable.h" />
     <ClInclude Include="..\..\gdk\gdkmm\event.h" />
-    <ClInclude Include="..\..\gdk\gdkmm\gc.h" />
     <ClInclude Include="..\..\gdk\gdkmm\general.h" />
-    <ClInclude Include="..\..\gdk\gdkmm\image.h" />
     <ClInclude Include="..\..\gdk\gdkmm\list.h" />
     <ClInclude Include="..\..\gdk\gdkmm\pixbuf.h" />
     <ClInclude Include="..\..\gdk\gdkmm\pixbufanimation.h" />
     <ClInclude Include="..\..\gdk\gdkmm\pixbufanimationiter.h" />
     <ClInclude Include="..\..\gdk\gdkmm\pixbufformat.h" />
     <ClInclude Include="..\..\gdk\gdkmm\pixbufloader.h" />
-    <ClInclude Include="..\..\gdk\gdkmm\pixmap.h" />
     <ClInclude Include="..\..\gdk\gdkmm\rectangle.h" />
     <ClInclude Include="..\..\gdk\gdkmm\region.h" />
-    <ClInclude Include="..\..\gdk\gdkmm\rgb.h" />
-    <ClInclude Include="..\..\gdk\gdkmm\rgbcmap.h" />
+    <ClInclude Include="..\..\gdk\gdkmm\rgba.h" />
     <ClInclude Include="..\..\gdk\gdkmm\screen.h" />
+	<ClInclude Include="..\..\gdk\gdkmm\timecoord.h" />
     <ClInclude Include="..\..\gdk\gdkmm\types.h" />
     <ClInclude Include="..\..\gdk\gdkmm\visual.h" />
     <ClInclude Include="..\..\gdk\gdkmm\window.h" />
diff --git a/MSVC_Net2010/gdkmm/gdkmm.vcxproj.filters b/MSVC_Net2010/gdkmm/gdkmm.vcxproj.filters
index f1a4063..684a401 100644
--- a/MSVC_Net2010/gdkmm/gdkmm.vcxproj.filters
+++ b/MSVC_Net2010/gdkmm/gdkmm.vcxproj.filters
@@ -15,9 +15,6 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\gdk\gdkmm\bitmap.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\color.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -30,6 +27,9 @@
     <ClCompile Include="..\..\gdk\gdkmm\device.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+	<ClCompile Include="..\..\gdk\gdkmm\devicemanager.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\display.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -39,21 +39,12 @@
     <ClCompile Include="..\..\gdk\gdkmm\dragcontext.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\drawable.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\event.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\gc.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\general.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\image.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\pixbuf.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -69,22 +60,16 @@
     <ClCompile Include="..\..\gdk\gdkmm\pixbufloader.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\pixmap.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\rectangle.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\region.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\rgb.cc">
+    <ClCompile Include="..\..\gdk\gdkmm\rgba.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\rgbcmap.cc">
+    <ClCompile Include="..\..\gdk\gdkmm\screen.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gdk\gdkmm\screen.cc">
+	<ClCompile Include="..\..\gdk\gdkmm\timecoord.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gdk\gdkmm\types.cc">
@@ -101,9 +86,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\gdk\gdkmm\bitmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\color.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -116,6 +98,9 @@
     <ClInclude Include="..\..\gdk\gdkmm\device.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+	<ClInclude Include="..\..\gdk\gdkmm\devicemanager.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\display.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -125,9 +110,6 @@
     <ClInclude Include="..\..\gdk\gdkmm\dragcontext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gdk\gdkmm\drawable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\event.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -137,9 +119,6 @@
     <ClInclude Include="..\..\gdk\gdkmm\general.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gdk\gdkmm\image.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\list.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -158,22 +137,19 @@
     <ClInclude Include="..\..\gdk\gdkmm\pixbufloader.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gdk\gdkmm\pixmap.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\rectangle.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\region.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gdk\gdkmm\rgb.h">
+    <ClInclude Include="..\..\gdk\gdkmm\rgba.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gdk\gdkmm\rgbcmap.h">
+    <ClInclude Include="..\..\gdk\gdkmm\screen.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gdk\gdkmm\screen.h">
+	<ClInclude Include="..\..\gdk\gdkmm\timecoord.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gdk\gdkmm\types.h">
diff --git a/MSVC_Net2010/gtkmm.sln b/MSVC_Net2010/gtkmm.sln
index 6cc2fad..9f11ec9 100644
--- a/MSVC_Net2010/gtkmm.sln
+++ b/MSVC_Net2010/gtkmm.sln
@@ -1,8 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-2.4", "gdkmm\gdkmm.vcxproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm-3.0", "gdkmm\gdkmm.vcxproj", "{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-2.4", "gtkmm\gtkmm.vcxproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm-3.0", "gtkmm\gtkmm.vcxproj", "{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gendef", "gendef\gendef.vcxproj", "{07324745-C9BE-4D65-B08A-9C88188C0C28}"
 EndProject
diff --git a/MSVC_Net2010/gtkmm/gtkmm.vcxproj b/MSVC_Net2010/gtkmm/gtkmm.vcxproj
index 16eb2e3..30634e7 100644
--- a/MSVC_Net2010/gtkmm/gtkmm.vcxproj
+++ b/MSVC_Net2010/gtkmm/gtkmm.vcxproj
@@ -19,9 +19,9 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectName>gtkmm-2.4</ProjectName>
+    <ProjectName>gtkmm-3.0</ProjectName>
     <ProjectGuid>{907B8D15-7E12-4136-A7E6-B6ED5E055D39}</ProjectGuid>
-    <RootNamespace>gtkmm-2.4</RootNamespace>
+    <RootNamespace>gtkmm-3.0</RootNamespace>
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -75,10 +75,10 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir>
     <PreLinkEventUseInBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</PreLinkEventUseInBuild>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gtkmm-vc100-d-2_4</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gtkmm-vc100-d-2_4</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gtkmm-vc100-2_4</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gtkmm-vc100-2_4</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">gtkmm-vc100-d-3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">gtkmm-vc100-d-3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">gtkmm-vc100-3_0</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">gtkmm-vc100-3_0</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -101,8 +101,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;giomm-vc100-d-2_4.lib;glibmm-vc100-d-2_4.lib;sigc-vc100-d-2_0.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;atkmm-vc100-d-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gtkmm-vc100-d-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gtk-win32-3.0.lib;giomm-vc100-d-2_4.lib;glibmm-vc100-d-2_4.lib;sigc-vc100-d-2_0.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;atkmm-vc100-d-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gtkmm-vc100-d-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -128,8 +128,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;giomm-vc100-2_4.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;atkmm-vc100-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gtkmm-vc100-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gtk-win32-3.0.lib;giomm-vc100-2_4.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;atkmm-vc100-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gtkmm-vc100-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -160,8 +160,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;giomm-vc100-d-2_4.lib;glibmm-vc100-d-2_4.lib;sigc-vc100-d-2_0.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;atkmm-vc100-d-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gtkmm-vc100-d-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gtk-win32-3.0.lib;giomm-vc100-d-2_4.lib;glibmm-vc100-d-2_4.lib;sigc-vc100-d-2_0.lib;cairomm-vc100-d-1_0.lib;pangomm-vc100-d-1_4.lib;atkmm-vc100-d-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gtkmm-vc100-d-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -191,8 +191,8 @@
       <Command>$(SolutionDir)gendef\$(Platform)\$(Configuration)\gendef $(Platform)\$(Configuration)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
     </PreLinkEvent>
     <Link>
-      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-2.0.lib;gtk-win32-2.0.lib;giomm-vc100-2_4.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;atkmm-vc100-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>$(OutDir)gtkmm-vc100-2_4.dll</OutputFile>
+      <AdditionalDependencies>glib-2.0.lib;gobject-2.0.lib;gdk-win32-3.0.lib;gtk-win32-3.0.lib;giomm-vc100-2_4.lib;glibmm-vc100-2_4.lib;sigc-vc100-2_0.lib;cairomm-vc100-1_0.lib;pangomm-vc100-1_4.lib;atkmm-vc100-1_6.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>$(OutDir)gtkmm-vc100-3_0.dll</OutputFile>
       <ModuleDefinitionFile>$(Platform)\$(Configuration)\$(ProjectName).def</ModuleDefinitionFile>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
       <DataExecutionPrevention>
@@ -211,15 +211,24 @@
     <ClCompile Include="..\..\gtk\gtkmm\activatable.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\adjustment.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\alignment.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\appchooser.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\appchooserbutton.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\appchooserdialog.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\appchooserwidget.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\arrow.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\aspectframe.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\assistant.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\bin.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\border.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\box.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\buildable.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\builder.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\button.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\buttonbox.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\calendar.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\cellarea.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\cellareabox.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\cellareacontext.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\celleditable.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\celllayout.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\cellrenderer.cc" />
@@ -238,13 +247,10 @@
     <ClCompile Include="..\..\gtk\gtkmm\clipboard.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\colorbutton.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\colorselection.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\combo.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\combobox.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\comboboxentry.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\comboboxentrytext.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\comboboxtext.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\container.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\curve.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\cssprovider.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\dialog.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\drawingarea.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\editable.cc" />
@@ -259,11 +265,11 @@
     <ClCompile Include="..\..\gtk\gtkmm\filechooserdialog.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\filechooserwidget.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\filefilter.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\fileselection.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\fixed.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\fontbutton.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\fontselection.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\frame.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\grid.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\handlebox.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\iconfactory.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\iconinfo.cc" />
@@ -274,9 +280,7 @@
     <ClCompile Include="..\..\gtk\gtkmm\image.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\imagemenuitem.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\infobar.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\inputdialog.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\invisible.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\item.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\label.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\layout.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\linkbutton.cc" />
@@ -284,7 +288,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\listviewtext.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\main.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\menu.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\menu_elems.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\menubar.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\menuitem.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\menushell.cc" />
@@ -292,14 +295,13 @@
     <ClCompile Include="..\..\gtk\gtkmm\messagedialog.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\misc.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\notebook.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\numerableicon.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\object.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\offscreenwindow.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\optionmenu.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\orientable.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\pagesetup.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\paned.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\papersize.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\plug.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\printcontext.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\printoperation.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\printoperationpreview.cc" />
@@ -311,7 +313,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\radiomenuitem.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\radiotoolbutton.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\range.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\rc.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\recentaction.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\recentchooser.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\recentchooserdialog.cc" />
@@ -320,9 +321,9 @@
     <ClCompile Include="..\..\gtk\gtkmm\recentfilter.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\recentinfo.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\recentmanager.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\ruler.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\scale.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\scalebutton.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\scrollable.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\scrollbar.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\scrolledwindow.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\selectiondata.cc" />
@@ -332,7 +333,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\separatortoolitem.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\settings.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\sizegroup.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\socket.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\spinbutton.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\spinner.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\statusbar.cc" />
@@ -340,7 +340,9 @@
     <ClCompile Include="..\..\gtk\gtkmm\stock.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\stockid.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\stockitem.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\style.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\stylecontext.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\styleprovider.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\switch.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\table.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\targetentry.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\targetlist.cc" />
@@ -363,7 +365,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\toolpalette.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\toolshell.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\tooltip.cc" />
-    <ClCompile Include="..\..\gtk\gtkmm\tooltips.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\treedragdest.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\treedragsource.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\treeiter.cc" />
@@ -383,6 +384,7 @@
     <ClCompile Include="..\..\gtk\gtkmm\viewport.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\volumebutton.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\widget.cc" />
+    <ClCompile Include="..\..\gtk\gtkmm\widgetpath.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\window.cc" />
     <ClCompile Include="..\..\gtk\gtkmm\wrap_init.cc" />
   </ItemGroup>
@@ -397,6 +399,10 @@
     <ClInclude Include="..\..\gtk\gtkmm\activatable.h" />
     <ClInclude Include="..\..\gtk\gtkmm\adjustment.h" />
     <ClInclude Include="..\..\gtk\gtkmm\alignment.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\appchooser.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\appchooserbutton.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\appchooserdialog.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\appchooserwidget.h" />
     <ClInclude Include="..\..\gtk\gtkmm\arrow.h" />
     <ClInclude Include="..\..\gtk\gtkmm\aspectframe.h" />
     <ClInclude Include="..\..\gtk\gtkmm\assistant.h" />
@@ -408,6 +414,9 @@
     <ClInclude Include="..\..\gtk\gtkmm\button.h" />
     <ClInclude Include="..\..\gtk\gtkmm\buttonbox.h" />
     <ClInclude Include="..\..\gtk\gtkmm\calendar.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\cellarea.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\cellareabox.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\cellareacontext.h" />
     <ClInclude Include="..\..\gtk\gtkmm\celleditable.h" />
     <ClInclude Include="..\..\gtk\gtkmm\celllayout.h" />
     <ClInclude Include="..\..\gtk\gtkmm\cellrenderer.h" />
@@ -426,13 +435,10 @@
     <ClInclude Include="..\..\gtk\gtkmm\clipboard.h" />
     <ClInclude Include="..\..\gtk\gtkmm\colorbutton.h" />
     <ClInclude Include="..\..\gtk\gtkmm\colorselection.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\combo.h" />
     <ClInclude Include="..\..\gtk\gtkmm\combobox.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\comboboxentry.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\comboboxentrytext.h" />
     <ClInclude Include="..\..\gtk\gtkmm\comboboxtext.h" />
     <ClInclude Include="..\..\gtk\gtkmm\container.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\curve.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\cssprovider.h" />
     <ClInclude Include="..\..\gtk\gtkmm\dialog.h" />
     <ClInclude Include="..\..\gtk\gtkmm\drawingarea.h" />
     <ClInclude Include="..\..\gtk\gtkmm\editable.h" />
@@ -447,11 +453,11 @@
     <ClInclude Include="..\..\gtk\gtkmm\filechooserdialog.h" />
     <ClInclude Include="..\..\gtk\gtkmm\filechooserwidget.h" />
     <ClInclude Include="..\..\gtk\gtkmm\filefilter.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\fileselection.h" />
     <ClInclude Include="..\..\gtk\gtkmm\fixed.h" />
     <ClInclude Include="..\..\gtk\gtkmm\fontbutton.h" />
     <ClInclude Include="..\..\gtk\gtkmm\fontselection.h" />
     <ClInclude Include="..\..\gtk\gtkmm\frame.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\grid.h" />
     <ClInclude Include="..\..\gtk\gtkmm\handlebox.h" />
     <ClInclude Include="..\..\gtk\gtkmm\iconfactory.h" />
     <ClInclude Include="..\..\gtk\gtkmm\iconinfo.h" />
@@ -462,9 +468,7 @@
     <ClInclude Include="..\..\gtk\gtkmm\image.h" />
     <ClInclude Include="..\..\gtk\gtkmm\imagemenuitem.h" />
     <ClInclude Include="..\..\gtk\gtkmm\infobar.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\inputdialog.h" />
     <ClInclude Include="..\..\gtk\gtkmm\invisible.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\item.h" />
     <ClInclude Include="..\..\gtk\gtkmm\label.h" />
     <ClInclude Include="..\..\gtk\gtkmm\layout.h" />
     <ClInclude Include="..\..\gtk\gtkmm\linkbutton.h" />
@@ -472,22 +476,20 @@
     <ClInclude Include="..\..\gtk\gtkmm\listviewtext.h" />
     <ClInclude Include="..\..\gtk\gtkmm\main.h" />
     <ClInclude Include="..\..\gtk\gtkmm\menu.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\menu_elems.h" />
     <ClInclude Include="..\..\gtk\gtkmm\menubar.h" />
     <ClInclude Include="..\..\gtk\gtkmm\menuitem.h" />
     <ClInclude Include="..\..\gtk\gtkmm\menushell.h" />
     <ClInclude Include="..\..\gtk\gtkmm\menutoolbutton.h" />
     <ClInclude Include="..\..\gtk\gtkmm\messagedialog.h" />
     <ClInclude Include="..\..\gtk\gtkmm\misc.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\notebook.h" />
+	<ClInclude Include="..\..\gtk\gtkmm\notebook.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\numerableicon.h" />
     <ClInclude Include="..\..\gtk\gtkmm\object.h" />
     <ClInclude Include="..\..\gtk\gtkmm\offscreenwindow.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\optionmenu.h" />
     <ClInclude Include="..\..\gtk\gtkmm\orientable.h" />
     <ClInclude Include="..\..\gtk\gtkmm\pagesetup.h" />
     <ClInclude Include="..\..\gtk\gtkmm\paned.h" />
     <ClInclude Include="..\..\gtk\gtkmm\papersize.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\plug.h" />
     <ClInclude Include="..\..\gtk\gtkmm\printcontext.h" />
     <ClInclude Include="..\..\gtk\gtkmm\printoperation.h" />
     <ClInclude Include="..\..\gtk\gtkmm\printoperationpreview.h" />
@@ -499,7 +501,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\radiomenuitem.h" />
     <ClInclude Include="..\..\gtk\gtkmm\radiotoolbutton.h" />
     <ClInclude Include="..\..\gtk\gtkmm\range.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\rc.h" />
     <ClInclude Include="..\..\gtk\gtkmm\recentaction.h" />
     <ClInclude Include="..\..\gtk\gtkmm\recentchooser.h" />
     <ClInclude Include="..\..\gtk\gtkmm\recentchooserdialog.h" />
@@ -508,9 +509,9 @@
     <ClInclude Include="..\..\gtk\gtkmm\recentfilter.h" />
     <ClInclude Include="..\..\gtk\gtkmm\recentinfo.h" />
     <ClInclude Include="..\..\gtk\gtkmm\recentmanager.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\ruler.h" />
     <ClInclude Include="..\..\gtk\gtkmm\scale.h" />
     <ClInclude Include="..\..\gtk\gtkmm\scalebutton.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\scrollable.h" />
     <ClInclude Include="..\..\gtk\gtkmm\scrollbar.h" />
     <ClInclude Include="..\..\gtk\gtkmm\scrolledwindow.h" />
     <ClInclude Include="..\..\gtk\gtkmm\selectiondata.h" />
@@ -520,7 +521,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\separatortoolitem.h" />
     <ClInclude Include="..\..\gtk\gtkmm\settings.h" />
     <ClInclude Include="..\..\gtk\gtkmm\sizegroup.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\socket.h" />
     <ClInclude Include="..\..\gtk\gtkmm\spinbutton.h" />
     <ClInclude Include="..\..\gtk\gtkmm\spinner.h" />
     <ClInclude Include="..\..\gtk\gtkmm\statusbar.h" />
@@ -528,7 +528,9 @@
     <ClInclude Include="..\..\gtk\gtkmm\stock.h" />
     <ClInclude Include="..\..\gtk\gtkmm\stockid.h" />
     <ClInclude Include="..\..\gtk\gtkmm\stockitem.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\style.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\stylecontext.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\styleprovider.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\switch.h" />
     <ClInclude Include="..\..\gtk\gtkmm\table.h" />
     <ClInclude Include="..\..\gtk\gtkmm\targetentry.h" />
     <ClInclude Include="..\..\gtk\gtkmm\targetlist.h" />
@@ -551,7 +553,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\toolpalette.h" />
     <ClInclude Include="..\..\gtk\gtkmm\toolshell.h" />
     <ClInclude Include="..\..\gtk\gtkmm\tooltip.h" />
-    <ClInclude Include="..\..\gtk\gtkmm\tooltips.h" />
     <ClInclude Include="..\..\gtk\gtkmm\treedragdest.h" />
     <ClInclude Include="..\..\gtk\gtkmm\treedragsource.h" />
     <ClInclude Include="..\..\gtk\gtkmm\treeiter.h" />
@@ -571,6 +572,7 @@
     <ClInclude Include="..\..\gtk\gtkmm\viewport.h" />
     <ClInclude Include="..\..\gtk\gtkmm\volumebutton.h" />
     <ClInclude Include="..\..\gtk\gtkmm\widget.h" />
+    <ClInclude Include="..\..\gtk\gtkmm\widgetpath.h" />
     <ClInclude Include="..\..\gtk\gtkmm\window.h" />
     <ClInclude Include="..\..\gtk\gtkmm\wrap_init.h" />
   </ItemGroup>
diff --git a/MSVC_Net2010/gtkmm/gtkmm.vcxproj.filters b/MSVC_Net2010/gtkmm/gtkmm.vcxproj.filters
index 75883ad..fa2fd88 100644
--- a/MSVC_Net2010/gtkmm/gtkmm.vcxproj.filters
+++ b/MSVC_Net2010/gtkmm/gtkmm.vcxproj.filters
@@ -44,6 +44,18 @@
     <ClCompile Include="..\..\gtk\gtkmm\alignment.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\appchooser.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\appchooserbutton.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\appchooserdialog.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\appchooserwidget.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\arrow.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -56,9 +68,15 @@
     <ClCompile Include="..\..\gtk\gtkmm\bin.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\border.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\box.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\buildable.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>	
     <ClCompile Include="..\..\gtk\gtkmm\builder.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -71,6 +89,15 @@
     <ClCompile Include="..\..\gtk\gtkmm\calendar.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\cellarea.cc" >
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\cellareabox.cc" >
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\cellareacontext.cc" >
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\celleditable.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -125,25 +152,16 @@
     <ClCompile Include="..\..\gtk\gtkmm\colorselection.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\combo.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\combobox.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\comboboxentry.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\comboboxentrytext.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\comboboxtext.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\container.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\curve.cc">
+    <ClCompile Include="..\..\gtk\gtkmm\cssprovider.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\dialog.cc">
@@ -188,9 +206,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\filefilter.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\fileselection.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\fixed.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -203,6 +218,9 @@
     <ClCompile Include="..\..\gtk\gtkmm\frame.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+	<ClCompile Include="..\..\gtk\gtkmm\grid.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\handlebox.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -287,13 +305,13 @@
     <ClCompile Include="..\..\gtk\gtkmm\notebook.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\object.cc">
+	<ClCompile Include="..\..\gtk\gtkmm\numerableicon.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\offscreenwindow.cc">
+    <ClCompile Include="..\..\gtk\gtkmm\object.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\optionmenu.cc">
+    <ClCompile Include="..\..\gtk\gtkmm\offscreenwindow.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\orientable.cc">
@@ -308,9 +326,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\papersize.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\plug.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\printcontext.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -344,9 +359,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\range.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\rc.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\recentaction.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -371,15 +383,15 @@
     <ClCompile Include="..\..\gtk\gtkmm\recentmanager.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\ruler.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\scale.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\scalebutton.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+	<ClCompile Include="..\..\gtk\gtkmm\scrollable.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\scrollbar.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -407,9 +419,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\sizegroup.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\socket.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\spinbutton.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -431,7 +440,13 @@
     <ClCompile Include="..\..\gtk\gtkmm\stockitem.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\style.cc">
+    <ClCompile Include="..\..\gtk\gtkmm\stylecontext.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\styleprovider.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\switch.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\table.cc">
@@ -500,9 +515,6 @@
     <ClCompile Include="..\..\gtk\gtkmm\tooltip.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\gtk\gtkmm\tooltips.cc">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\treedragdest.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -560,6 +572,9 @@
     <ClCompile Include="..\..\gtk\gtkmm\widget.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\gtk\gtkmm\widgetpath.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\gtk\gtkmm\window.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -598,6 +613,18 @@
     <ClInclude Include="..\..\gtk\gtkmm\alignment.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\appchooser.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\appchooserbutton.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\appchooserdialog.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\appchooserwidget.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\arrow.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -616,9 +643,15 @@
     <ClInclude Include="..\..\gtk\gtkmm\border.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\border.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\box.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\buildable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\builder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -685,25 +718,16 @@
     <ClInclude Include="..\..\gtk\gtkmm\colorselection.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\combo.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\combobox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\comboboxentry.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\comboboxentrytext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\comboboxtext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\container.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\curve.h">
+    <ClInclude Include="..\..\gtk\gtkmm\cssprovider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\dialog.h">
@@ -763,6 +787,9 @@
     <ClInclude Include="..\..\gtk\gtkmm\frame.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\grid.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\handlebox.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -793,15 +820,9 @@
     <ClInclude Include="..\..\gtk\gtkmm\infobar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\inputdialog.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\invisible.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\item.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\label.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -823,9 +844,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\menu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\menu_elems.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\menubar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -847,13 +865,13 @@
     <ClInclude Include="..\..\gtk\gtkmm\notebook.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\object.h">
+	<ClInclude Include="..\..\gtk\gtkmm\numerableicons.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\offscreenwindow.h">
+    <ClInclude Include="..\..\gtk\gtkmm\object.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\optionmenu.h">
+    <ClInclude Include="..\..\gtk\gtkmm\offscreenwindow.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\orientable.h">
@@ -868,9 +886,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\papersize.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\plug.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\printcontext.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -904,9 +919,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\range.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\rc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\recentaction.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -931,15 +943,15 @@
     <ClInclude Include="..\..\gtk\gtkmm\recentmanager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\ruler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\scale.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\scalebutton.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\scrollable.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\scrollbar.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -967,9 +979,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\sizegroup.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\socket.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\spinbutton.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -991,7 +1000,13 @@
     <ClInclude Include="..\..\gtk\gtkmm\stockitem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\style.h">
+    <ClInclude Include="..\..\gtk\gtkmm\stylecontext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\styleprovider.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\switch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\table.h">
@@ -1060,9 +1075,6 @@
     <ClInclude Include="..\..\gtk\gtkmm\tooltip.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\gtk\gtkmm\tooltips.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\treedragdest.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -1120,6 +1132,9 @@
     <ClInclude Include="..\..\gtk\gtkmm\widget.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\gtk\gtkmm\widgetpath.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\gtk\gtkmm\window.h">
       <Filter>Header Files</Filter>
     </ClInclude>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]