[gtkmm] Visual Studio builds: Require Visual Studio 2017
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtkmm] Visual Studio builds: Require Visual Studio 2017
- Date: Wed, 15 Mar 2017 11:16:50 +0000 (UTC)
commit 0dac9bb7160c2a8e47b3dfdb2ce033d6a1349f55
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Wed Mar 15 19:13:24 2017 +0800
Visual Studio builds: Require Visual Studio 2017
The latest gtkmm-4.x will require C++-14 features that are supported
only by Visual Studio 2017 and later, so update the projects
accordingly. Also update mentions of earlier Visual Studio versions to
refer to this Visual Studio version.
For the C++ dependencies of gtkmm, use the property sheets to record the
version names so that we can update them more easily in the future if
the need should arise.
MSVC_Net2013/gtkmm-build-defines.props | 44 ---------
MSVC_Net2013/gtkmm-version-paths.props | 42 ---------
{MSVC_Net2013 => MSVC_Net2017}/README | 8 +-
{MSVC_Net2013 => MSVC_Net2017}/filelist.am | 2 +-
{MSVC_Net2013 => MSVC_Net2017}/gdkmm.vcxproj | 13 +--
.../gdkmm.vcxproj.filters | 6 +-
{MSVC_Net2013 => MSVC_Net2017}/gdkmm/gdkmm.rc.in | 0
{MSVC_Net2013 => MSVC_Net2017}/gendef.vcxproj | 8 +-
.../gendef.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/gendef/gendef.cc | 0
MSVC_Net2017/gtkmm-build-defines.props | 44 +++++++++
.../gtkmm-gen-srcs.props | 0
{MSVC_Net2013 => MSVC_Net2017}/gtkmm-install.props | 75 ++-------------
MSVC_Net2017/gtkmm-version-paths.props | 78 ++++++++++++++++
{MSVC_Net2013 => MSVC_Net2017}/gtkmm.sln | 2 +-
{MSVC_Net2013 => MSVC_Net2017}/gtkmm.vcxproj | 98 +++++---------------
.../gtkmm.vcxproj.filters | 74 ++-------------
{MSVC_Net2013 => MSVC_Net2017}/gtkmm/gtkmm.rc.in | 0
{MSVC_Net2013 => MSVC_Net2017}/gtkmm3-demo.vcxproj | 24 +++---
.../gtkmm3-demo.vcxproj.filters | 0
{MSVC_Net2013 => MSVC_Net2017}/install.vcxproj | 8 +-
Makefile.am | 4 +-
README.win32 | 17 ++--
configure.ac | 12 +-
24 files changed, 214 insertions(+), 345 deletions(-)
---
diff --git a/MSVC_Net2013/README b/MSVC_Net2017/README
similarity index 63%
rename from MSVC_Net2013/README
rename to MSVC_Net2017/README
index a25f748..b036f51 100644
--- a/MSVC_Net2013/README
+++ b/MSVC_Net2017/README
@@ -1,11 +1,11 @@
-Building gtkmm-3.0 with Visual Studio 2013
+Building gtkmm-3.0 with Visual Studio 2017
-* You will need Visual Studio 2013 (MSVC 12.0). Earlier versions of the compiler, including 11.0 and earlier
will not work.
+* You will need Visual Studio 2017 (MSVC 15.0). Earlier versions of the compiler, including 14.0 and earlier
will not work.
* Install the latest Win32 GTK+ Development files from ftp://ftp.gnome.org/pub/GNOME/binaries/win32/gtk+
* Build libsigc++, glibmm, cairomm and pangomm from source.
* Add GTK+, libsigc++, glibmm, cairomm and pangomm to the include and lib paths in Visual Studio, if they
are not in
- $(srcroot)\..\vs12\$(platform)
-* Load the MSVC_Net2013/gtkmm.sln solution.
+ $(srcroot)\..\vs15\$(platform)
+* Load the MSVC_Net2017/gtkmm.sln solution.
* Build the entire solution.
* Run the tests.
diff --git a/MSVC_Net2013/filelist.am b/MSVC_Net2017/filelist.am
similarity index 95%
rename from MSVC_Net2013/filelist.am
rename to MSVC_Net2017/filelist.am
index 12928c0..fa77d8d 100644
--- a/MSVC_Net2013/filelist.am
+++ b/MSVC_Net2017/filelist.am
@@ -1,6 +1,6 @@
## This file is part of gtkmm.
-msvc_net2013_data = \
+msvc_net2017_data = \
README \
gtkmm.sln \
gtkmm-build-defines.props \
diff --git a/MSVC_Net2013/gdkmm.vcxproj b/MSVC_Net2017/gdkmm.vcxproj
similarity index 97%
rename from MSVC_Net2013/gdkmm.vcxproj
rename to MSVC_Net2017/gdkmm.vcxproj
index dd495a0..2916d2d 100644
--- a/MSVC_Net2013/gdkmm.vcxproj
+++ b/MSVC_Net2017/gdkmm.vcxproj
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -192,13 +192,13 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\gdk\gdkmm\applaunchcontext.cc" />
- <ClCompile Include="..\gdk\gdkmm\color.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\drawcontext.cc" />
<ClCompile Include="..\gdk\gdkmm\drawingcontext.cc" />
<ClCompile Include="..\gdk\gdkmm\event.cc" />
<ClCompile Include="..\gdk\gdkmm\general.cc" />
@@ -221,14 +221,13 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\gdk\gdkmm\applaunchcontext.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\drawcontext.h" />
<ClInclude Include="..\gdk\gdkmm\drawingcontext.h" />
<ClInclude Include="..\gdk\gdkmm\event.h" />
<ClInclude Include="..\gdk\gdkmm\general.h" />
diff --git a/MSVC_Net2013/gdkmm.vcxproj.filters b/MSVC_Net2017/gdkmm.vcxproj.filters
similarity index 94%
rename from MSVC_Net2013/gdkmm.vcxproj.filters
rename to MSVC_Net2017/gdkmm.vcxproj.filters
index 826f785..ebd4fdd 100644
--- a/MSVC_Net2013/gdkmm.vcxproj.filters
+++ b/MSVC_Net2017/gdkmm.vcxproj.filters
@@ -16,14 +16,13 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\gdk\gdkmm\applaunchcontext.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gdk\gdkmm\color.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gdk\gdkmm\colormap.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gdk\gdkmm\cursor.cc"><Filter>Source Files</Filter></ClCompile>
<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>
<ClCompile Include="..\gdk\gdkmm\displaymanager.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gdk\gdkmm\dragcontext.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gdk\gdkmm\drawcontext.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gdk\gdkmm\drawingcontext.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gdk\gdkmm\event.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gdk\gdkmm\general.cc"><Filter>Source Files</Filter></ClCompile>
@@ -46,14 +45,13 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\gdk\gdkmm\applaunchcontext.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gdk\gdkmm\color.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gdk\gdkmm\colormap.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gdk\gdkmm\cursor.h"><Filter>Header Files</Filter></ClInclude>
<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>
<ClInclude Include="..\gdk\gdkmm\displaymanager.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gdk\gdkmm\dragcontext.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gdk\gdkmm\drawcontext.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gdk\gdkmm\drawingcontext.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gdk\gdkmm\event.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gdk\gdkmm\gc.h"><Filter>Header Files</Filter></ClInclude>
diff --git a/MSVC_Net2013/gdkmm/gdkmm.rc.in b/MSVC_Net2017/gdkmm/gdkmm.rc.in
similarity index 100%
rename from MSVC_Net2013/gdkmm/gdkmm.rc.in
rename to MSVC_Net2017/gdkmm/gdkmm.rc.in
diff --git a/MSVC_Net2013/gendef.vcxproj b/MSVC_Net2017/gendef.vcxproj
similarity index 97%
rename from MSVC_Net2013/gendef.vcxproj
rename to MSVC_Net2017/gendef.vcxproj
index 33dfe5e..4d3b5ca 100644
--- a/MSVC_Net2013/gendef.vcxproj
+++ b/MSVC_Net2017/gendef.vcxproj
@@ -26,22 +26,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/MSVC_Net2013/gendef.vcxproj.filters b/MSVC_Net2017/gendef.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/gendef.vcxproj.filters
rename to MSVC_Net2017/gendef.vcxproj.filters
diff --git a/MSVC_Net2013/gendef/gendef.cc b/MSVC_Net2017/gendef/gendef.cc
similarity index 100%
rename from MSVC_Net2013/gendef/gendef.cc
rename to MSVC_Net2017/gendef/gendef.cc
diff --git a/MSVC_Net2017/gtkmm-build-defines.props b/MSVC_Net2017/gtkmm-build-defines.props
new file mode 100644
index 0000000..5027ea2
--- /dev/null
+++ b/MSVC_Net2017/gtkmm-build-defines.props
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <ImportGroup Label="PropertySheets">
+ <Import Project="gtkmm-version-paths.props" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <GdkMMBuildDefs>GDKMM_BUILD</GdkMMBuildDefs>
+ <GtkMMBuildDefs>GTKMM_BUILD</GtkMMBuildDefs>
+
<CPPDepLibsRelease>pangomm-vc$(VSVer)0-$(PangoMMMajorVersion)_$(PangoMMMinorVersion).lib;giomm-vc$(VSVer)0-$(GLibMMMajorVersion)_$(GLibMMMinorVersion).lib;glibmm-vc$(VSVer)0-$(GLibMMMajorVersion)_$(GLibMMMinorVersion).lib;cairomm-vc$(VSVer)0-$(CairoMMMajorVersion)_$(CairoMMMinorVersion).lib;sigc-vc$(VSVer)0-$(SigCMajorVersion)_0.lib</CPPDepLibsRelease>
+
<CPPDepLibsDebug>pangomm-vc$(VSVer)0-d-$(PangoMMMajorVersion)_$(PangoMMMinorVersion).lib;giomm-vc$(VSVer)0-d-$(GLibMMMajorVersion)_$(GLibMMMinorVersion).lib;glibmm-vc$(VSVer)0-d-$(GLibMMMajorVersion)_$(GLibMMMinorVersion).lib;cairomm-vc$(VSVer)0-d-$(CairoMMMajorVersion)_$(CairoMMMinorVersion).lib;sigc-vc$(VSVer)0-d-$(SigCMajorVersion)_0.lib</CPPDepLibsDebug>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>glibmmbuilddefinesprops</_PropertySheetDisplayName>
+ <OutDir>$(SolutionDir)$(Configuration)\$(PlatformName)\bin\</OutDir>
+ <IntDir>$(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\</IntDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup>
+ <ClCompile>
+
<AdditionalIncludeDirectories>.\gdkmm;..;..\gdk;$(GlibEtcInstallRoot)\include\pangomm-$(PangoMMMajorVersion).$(PangoMMMinorVersion);$(GlibEtcInstallRoot)\lib\pangomm-$(PangoMMMajorVersion).$(PangoMMMinorVersion)\include;$(GlibEtcInstallRoot)\include\giomm-$(GLibMMMajorVersion).$(GLibMMMinorVersion);$(GlibEtcInstallRoot)\lib\giomm-$(GLibMMMajorVersion).$(GLibMMMinorVersion)\include;$(GlibEtcInstallRoot)\include\glibmm-$(GLibMMMajorVersion).$(GLibMMMinorVersion);$(GlibEtcInstallRoot)\lib\glibmm-$(GLibMMMajorVersion).$(GLibMMMinorVersion)\include;$(GlibEtcInstallRoot)\include\cairomm-$(CairoMMMajorVersion).$(CairoMMMinorVersion);$(GlibEtcInstallRoot)\lib\cairomm-$(CairoMMMajorVersion).$(CairoMMMinorVersion)\include;$(GlibEtcInstallRoot)\include\sigc++-$(SigCMajorVersion).0;$(GlibEtcInstallRoot)\lib\sigc++-$(SigCMajorVersion).0\include;$(GlibEtcInstallRoot)\include\gtk-4.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstall
Root)\include\atk-1.0;$(GlibEtcInstallRoot)\include\graphene-1.0;$(GlibEtcInstallRoot)\lib\graphene-1.0\include;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
+ <DisableSpecificWarnings>4250;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <MultiProcessorCompilation>true</MultiProcessorCompilation>
+ <AdditionalOptions>/d2Zi+ %(AdditionalOptions)</AdditionalOptions>
+ </ClCompile>
+ <Link>
+
<AdditionalDependencies>gtk-4.lib;gdk_pixbuf-2.0.lib;gobject-2.0.lib;gio-2.0.lib;glib-2.0.lib;epoxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="GdkMMBuildDefs">
+ <Value>$(GdkMMBuildDefs)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GtkMMBuildDefs">
+ <Value>$(GtkMMBuildDefs)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CPPDepLibsRelease">
+ <Value>$(CPPDepLibsRelease)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CPPDepLibsDebug">
+ <Value>$(CPPDepLibsDebug)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
diff --git a/MSVC_Net2013/gtkmm-gen-srcs.props b/MSVC_Net2017/gtkmm-gen-srcs.props
similarity index 100%
rename from MSVC_Net2013/gtkmm-gen-srcs.props
rename to MSVC_Net2017/gtkmm-gen-srcs.props
diff --git a/MSVC_Net2013/gtkmm-install.props b/MSVC_Net2017/gtkmm-install.props
similarity index 88%
rename from MSVC_Net2013/gtkmm-install.props
rename to MSVC_Net2017/gtkmm-install.props
index ddaaae5..bd5c308 100644
--- a/MSVC_Net2013/gtkmm-install.props
+++ b/MSVC_Net2017/gtkmm-install.props
@@ -27,13 +27,13 @@ copy ..\gdk\gdkmm.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersio
copy ..\gtk\gtkmm.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)
copy ..\gdk\gdkmm\applaunchcontext.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
-copy ..\gdk\gdkmm\color.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\cursor.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\device.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\devicemanager.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\display.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\displaymanager.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\dragcontext.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
+copy ..\gdk\gdkmm\drawcontext.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\drawingcontext.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\event.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\general.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
@@ -55,13 +55,13 @@ copy ..\gdk\gdkmm\window.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMino
copy ..\gdk\gdkmm\wrap_init.h $(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm
copy ..\gdk\gdkmm\private\applaunchcontext_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
-copy ..\gdk\gdkmm\private\color_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\cursor_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\device_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\devicemanager_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\display_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\displaymanager_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\dragcontext_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
+copy ..\gdk\gdkmm\private\drawcontext_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\drawingcontext_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\event_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
copy ..\gdk\gdkmm\private\glcontext_p.h
$(CopyDir)\include\gdkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gdkmm\private
@@ -85,20 +85,15 @@ copy ..\gtk\gtkmm\accelgroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(Api
copy ..\gtk\gtkmm\accellabel.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\accelkey.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\accelmap.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\action.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\actionable.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\actionbar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\actiongroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\activatable.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\adjustment.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\alignment.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\appchooser.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\appchooserbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\appchooserdialog.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\appchooserwidget.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\application.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\applicationwindow.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\arrow.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\aspectframe.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\assistant.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\base.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -134,7 +129,6 @@ copy ..\gtk\gtkmm\clipboard.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiM
copy ..\gtk\gtkmm\colorbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\colorchooser.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\colorchooserdialog.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\colorselection.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\combobox.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\comboboxtext.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\container.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -162,7 +156,6 @@ copy ..\gtk\gtkmm\fontbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(Api
copy ..\gtk\gtkmm\fontchooser.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\fontchooserdialog.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\fontchooserwidget.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\fontselection.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\frame.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\gesture.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\gesturedrag.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -175,22 +168,11 @@ copy ..\gtk\gtkmm\gestureswipe.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(A
copy ..\gtk\gtkmm\gesturezoom.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\glarea.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\grid.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\handlebox.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\headerbar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\hvbox.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\hvbuttonbox.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\hvpaned.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\hvscale.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\hvscrollbar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\hvseparator.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\iconfactory.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\iconinfo.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\iconset.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\iconsource.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\icontheme.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\iconview.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\image.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\imagemenuitem.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\infobar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\invisible.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\label.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -210,12 +192,9 @@ copy ..\gtk\gtkmm\menuitem.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMi
copy ..\gtk\gtkmm\menushell.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\menutoolbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\messagedialog.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\misc.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\modelbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\numerableicon.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\notebook.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\object.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\offscreenwindow.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\orientable.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\overlay.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\pagesetup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -229,13 +208,11 @@ copy ..\gtk\gtkmm\printoperation.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$
copy ..\gtk\gtkmm\printoperationpreview.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\printsettings.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\progressbar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\radioaction.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\radiobutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\radiobuttongroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\radiomenuitem.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\radiotoolbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\range.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\recentaction.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\recentchooser.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\recentchooserdialog.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\recentchoosermenu.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -259,28 +236,24 @@ copy ..\gtk\gtkmm\separatortoolitem.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion
copy ..\gtk\gtkmm\selectiondata_private.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\settings.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\shortcutsgroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
+copy ..\gtk\gtkmm\shortcutlabel.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\shortcutssection.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\shortcutsshortcut.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\shortcutswindow.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\sizegroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
+copy ..\gtk\gtkmm\sizegroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\gtkmm
+copy ..\gtk\gtkmm\snapshot.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\spinbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\spinner.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\stack.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\stacksidebar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\stackswitcher.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\statusbar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\statusicon.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\stock.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\stockid.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\stockitem.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\stylecontext.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
+copy ..\gtk\gtkmm\styleproperty.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\styleprovider.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\switch.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\table.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\targetentry.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\targetlist.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\tearoffmenuitem.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\textattributes.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\textbuffer.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\textchildanchor.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\textiter.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -288,7 +261,6 @@ copy ..\gtk\gtkmm\textmark.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMi
copy ..\gtk\gtkmm\texttag.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\texttagtable.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\textview.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\toggleaction.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\togglebutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\toggletoolbutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\toolbar.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -313,10 +285,11 @@ copy ..\gtk\gtkmm\treestore.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiM
copy ..\gtk\gtkmm\treeview.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\treeviewcolumn.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\treeview_private.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
-copy ..\gtk\gtkmm\uimanager.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\viewport.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\volumebutton.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\widget.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
+copy ..\gtk\gtkmm\widgetcustomdraw.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
+copy ..\gtk\gtkmm\widgetcustomsnapshot.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\widgetpath.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\window.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
copy ..\gtk\gtkmm\windowgroup.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm
@@ -325,20 +298,15 @@ copy ..\gtk\gtkmm\wrap_init.h $(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiM
copy ..\gtk\gtkmm\private\aboutdialog_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\accelgroup_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\accellabel_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\action_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\actionable_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\actionbar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\actiongroup_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\activatable_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\adjustment_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\alignment_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\appchooser_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\appchooserbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\appchooserdialog_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\appchooserwidget_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\application_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\applicationwindow_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\arrow_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\aspectframe_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\assistant_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\bin_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -370,7 +338,6 @@ copy ..\gtk\gtkmm\private\clipboard_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVersi
copy ..\gtk\gtkmm\private\colorbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\colorchooser_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\colorchooserdialog_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\colorselection_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\combobox_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\comboboxtext_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\container_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -398,7 +365,6 @@ copy ..\gtk\gtkmm\private\fontbutton_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVers
copy ..\gtk\gtkmm\private\fontchooser_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\fontchooserdialog_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\fontchooserwidget_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\fontselection_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\frame_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\gesture_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\gesturedrag_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -411,22 +377,11 @@ copy ..\gtk\gtkmm\private\gestureswipe_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVe
copy ..\gtk\gtkmm\private\gesturezoom_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\glarea_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\grid_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\handlebox_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\headerbar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\hvbox_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\hvbuttonbox_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\hvpaned_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\hvscale_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\hvscrollbar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\hvseparator_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\iconfactory_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\iconinfo_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\iconset_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\iconsource_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\icontheme_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\iconview_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\image_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\imagemenuitem_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\infobar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\invisible_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\label_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -445,12 +400,9 @@ copy ..\gtk\gtkmm\private\menuitem_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVersio
copy ..\gtk\gtkmm\private\menushell_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\menutoolbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\messagedialog_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\misc_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\modelbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\numerableicon_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\notebook_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\object_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\offscreenwindow_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\orientable_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\overlay_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\pagesetup_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -464,12 +416,10 @@ copy ..\gtk\gtkmm\private\printoperation_p.h $(CopyDir)\include\gtkmm-$(ApiMajor
copy ..\gtk\gtkmm\private\printoperationpreview_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\printsettings_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\progressbar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\radioaction_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\radiobutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\radiomenuitem_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\radiotoolbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\range_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\recentaction_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\recentchooser_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\recentchooserdialog_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\recentchoosermenu_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -492,25 +442,22 @@ copy ..\gtk\gtkmm\private\separatormenuitem_p.h $(CopyDir)\include\gtkmm-$(ApiMa
copy ..\gtk\gtkmm\private\separatortoolitem_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\settings_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\shortcutsgroup_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
+copy ..\gtk\gtkmm\private\shortcutlabel_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\shortcutssection_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\shortcutsshortcut_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\shortcutswindow_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\sizegroup_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
+copy ..\gtk\gtkmm\private\snapshot_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\spinbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\spinner_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\stack_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\stacksidebar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\stackswitcher_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\statusbar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\statusicon_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\stockitem_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\stylecontext_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\styleprovider_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\switch_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\table_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\targetlist_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\tearoffmenuitem_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\textattributes_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\textbuffer_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\textchildanchor_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\textiter_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -518,7 +465,6 @@ copy ..\gtk\gtkmm\private\textmark_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVersio
copy ..\gtk\gtkmm\private\texttag_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\texttagtable_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\textview_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\toggleaction_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\togglebutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\toggletoolbutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\toolbar_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
@@ -541,7 +487,6 @@ copy ..\gtk\gtkmm\private\treesortable_p.h $(CopyDir)\include\gtkmm-$(ApiMajorVe
copy ..\gtk\gtkmm\private\treestore_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\treeview_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\treeviewcolumn_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
-copy ..\gtk\gtkmm\private\uimanager_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\viewport_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\volumebutton_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
copy ..\gtk\gtkmm\private\widget_p.h
$(CopyDir)\include\gtkmm-$(ApiMajorVersion).$(ApiMinorVersion)\gtkmm\private
diff --git a/MSVC_Net2017/gtkmm-version-paths.props b/MSVC_Net2017/gtkmm-version-paths.props
new file mode 100644
index 0000000..22b49c2
--- /dev/null
+++ b/MSVC_Net2017/gtkmm-version-paths.props
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup Label="UserMacros">
+ <VSVer>15</VSVer>
+ <GlibEtcInstallRoot>$(SolutionDir)\..\..\vs$(VSVer)\$(Platform)</GlibEtcInstallRoot>
+ <CopyDir>$(GlibEtcInstallRoot)</CopyDir>
+ <DefDir>$(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName)\</DefDir>
+ <ApiMajorVersion>4</ApiMajorVersion>
+ <ApiMinorVersion>0</ApiMinorVersion>
+ <ReleaseDllSuffix>-vc$(VSVer)0-$(ApiMajorVersion)_$(ApiMinorVersion)</ReleaseDllSuffix>
+ <DebugDllSuffix>-vc$(VSVer)0-d-$(ApiMajorVersion)_$(ApiMinorVersion)</DebugDllSuffix>
+ <SigCMajorVersion>3</SigCMajorVersion>
+ <GLibMMMajorVersion>2</GLibMMMajorVersion>
+ <GLibMMMinorVersion>52</GLibMMMinorVersion>
+ <PangoMMMajorVersion>2</PangoMMMajorVersion>
+ <PangoMMMinorVersion>42</PangoMMMinorVersion>
+ <AtkMMMajorVersion>2</AtkMMMajorVersion>
+ <AtkMMMinorVersion>26</AtkMMMinorVersion>
+ <CairoMMMajorVersion>1</CairoMMMajorVersion>
+ <CairoMMMinorVersion>16</CairoMMMinorVersion>
+ </PropertyGroup>
+ <PropertyGroup>
+ <_PropertySheetDisplayName>glibmmversionpathsprops</_PropertySheetDisplayName>
+ </PropertyGroup>
+ <ItemGroup>
+ <BuildMacro Include="VSVer">
+ <Value>$(VSVer)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GlibEtcInstallRoot">
+ <Value>$(GlibEtcInstallRoot)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CopyDir">
+ <Value>$(CopyDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="DefDir">
+ <Value>$(DefDir)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ApiMajorVersion">
+ <Value>$(ApiMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ApiMinorVersion">
+ <Value>$(ApiMinorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="ReleaseDllSuffix">
+ <Value>$(ReleaseDllSuffix)</Value>
+ </BuildMacro>
+ <BuildMacro Include="DebugDllSuffix">
+ <Value>$(DebugDllSuffix)</Value>
+ </BuildMacro>
+ <BuildMacro Include="SigCMajorVersion">
+ <Value>$(SigCMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GLibMMMajorVersion">
+ <Value>$(GLibMMMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="GLibMMMinorVersion">
+ <Value>$(GLibMMMinorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="PangoMMMajorVersion">
+ <Value>$(PangoMMMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="PangoMMMinorVersion">
+ <Value>$(PangoMMMinorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="AtkMMMajorVersion">
+ <Value>$(AtkMMMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="AtkMMMinorVersion">
+ <Value>$(AtkMMMinorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CairoMMMajorVersion">
+ <Value>$(CairoMMMajorVersion)</Value>
+ </BuildMacro>
+ <BuildMacro Include="CairoMMMinorVersion">
+ <Value>$(CairoMMMinorVersion)</Value>
+ </BuildMacro>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MSVC_Net2013/gtkmm.sln b/MSVC_Net2017/gtkmm.sln
similarity index 97%
rename from MSVC_Net2013/gtkmm.sln
rename to MSVC_Net2017/gtkmm.sln
index 116ec3c..bd8cb08 100644
--- a/MSVC_Net2013/gtkmm.sln
+++ b/MSVC_Net2017/gtkmm.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio 15
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdkmm", "gdkmm.vcxproj",
"{976C8F9C-1A1D-4E23-B79E-EC9091BBEA0E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkmm", "gtkmm.vcxproj",
"{907B8D15-7E12-4136-A7E6-B6ED5E055D39}"
diff --git a/MSVC_Net2013/gtkmm.vcxproj b/MSVC_Net2017/gtkmm.vcxproj
similarity index 87%
rename from MSVC_Net2013/gtkmm.vcxproj
rename to MSVC_Net2017/gtkmm.vcxproj
index 7e97c57..50167dd 100644
--- a/MSVC_Net2013/gtkmm.vcxproj
+++ b/MSVC_Net2017/gtkmm.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -79,7 +79,7 @@
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GtkMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
<Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
</PreLinkEvent>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-1_6.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;graphene-1.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GtkMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -121,7 +121,7 @@
<Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
</PreLinkEvent>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-1_6.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;graphene-1.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -138,7 +138,7 @@
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;$(GtkMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -154,7 +154,7 @@
<Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
</PreLinkEvent>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-1_6.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;graphene-1.0.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName)$(DebugDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
</Midl>
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>$(GtkMMBuildDefs);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -184,7 +184,7 @@
<Command>$(OutDir)\gendef.exe $(DefDir)\$(ProjectName).def $(TargetFileName) $(IntDir)*.obj</Command>
</PreLinkEvent>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-1_6.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;graphene-1.0.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName)$(ReleaseDllSuffix).dll</OutputFile>
<ModuleDefinitionFile>$(IntDir)\$(ProjectName).def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -201,20 +201,15 @@
<ClCompile Include="..\gtk\gtkmm\accelkey.cc" />
<ClCompile Include="..\gtk\gtkmm\accellabel.cc" />
<ClCompile Include="..\gtk\gtkmm\accelmap.cc" />
- <ClCompile Include="..\gtk\gtkmm\action.cc" />
<ClCompile Include="..\gtk\gtkmm\actionable.cc" />
<ClCompile Include="..\gtk\gtkmm\actionbar.cc" />
- <ClCompile Include="..\gtk\gtkmm\actiongroup.cc" />
- <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\application.cc" />
<ClCompile Include="..\gtk\gtkmm\applicationwindow.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" />
@@ -249,7 +244,6 @@
<ClCompile Include="..\gtk\gtkmm\colorbutton.cc" />
<ClCompile Include="..\gtk\gtkmm\colorchooser.cc" />
<ClCompile Include="..\gtk\gtkmm\colorchooserdialog.cc" />
- <ClCompile Include="..\gtk\gtkmm\colorselection.cc" />
<ClCompile Include="..\gtk\gtkmm\combobox.cc" />
<ClCompile Include="..\gtk\gtkmm\comboboxtext.cc" />
<ClCompile Include="..\gtk\gtkmm\container.cc" />
@@ -277,7 +271,6 @@
<ClCompile Include="..\gtk\gtkmm\fontchooser.cc" />
<ClCompile Include="..\gtk\gtkmm\fontchooserdialog.cc" />
<ClCompile Include="..\gtk\gtkmm\fontchooserwidget.cc" />
- <ClCompile Include="..\gtk\gtkmm\fontselection.cc" />
<ClCompile Include="..\gtk\gtkmm\frame.cc" />
<ClCompile Include="..\gtk\gtkmm\gesture.cc" />
<ClCompile Include="..\gtk\gtkmm\gesturedrag.cc" />
@@ -290,22 +283,11 @@
<ClCompile Include="..\gtk\gtkmm\gesturezoom.cc" />
<ClCompile Include="..\gtk\gtkmm\glarea.cc" />
<ClCompile Include="..\gtk\gtkmm\grid.cc" />
- <ClCompile Include="..\gtk\gtkmm\handlebox.cc" />
<ClCompile Include="..\gtk\gtkmm\headerbar.cc" />
- <ClCompile Include="..\gtk\gtkmm\hvbox.cc" />
- <ClCompile Include="..\gtk\gtkmm\hvbuttonbox.cc" />
- <ClCompile Include="..\gtk\gtkmm\hvpaned.cc" />
- <ClCompile Include="..\gtk\gtkmm\hvscale.cc" />
- <ClCompile Include="..\gtk\gtkmm\hvscrollbar.cc" />
- <ClCompile Include="..\gtk\gtkmm\hvseparator.cc" />
- <ClCompile Include="..\gtk\gtkmm\iconfactory.cc" />
<ClCompile Include="..\gtk\gtkmm\iconinfo.cc" />
- <ClCompile Include="..\gtk\gtkmm\iconset.cc" />
- <ClCompile Include="..\gtk\gtkmm\iconsource.cc" />
<ClCompile Include="..\gtk\gtkmm\icontheme.cc" />
<ClCompile Include="..\gtk\gtkmm\iconview.cc" />
<ClCompile Include="..\gtk\gtkmm\image.cc" />
- <ClCompile Include="..\gtk\gtkmm\imagemenuitem.cc" />
<ClCompile Include="..\gtk\gtkmm\infobar.cc" />
<ClCompile Include="..\gtk\gtkmm\invisible.cc" />
<ClCompile Include="..\gtk\gtkmm\label.cc" />
@@ -325,12 +307,9 @@
<ClCompile Include="..\gtk\gtkmm\menushell.cc" />
<ClCompile Include="..\gtk\gtkmm\menutoolbutton.cc" />
<ClCompile Include="..\gtk\gtkmm\messagedialog.cc" />
- <ClCompile Include="..\gtk\gtkmm\misc.cc" />
<ClCompile Include="..\gtk\gtkmm\modelbutton.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\orientable.cc" />
<ClCompile Include="..\gtk\gtkmm\overlay.cc" />
<ClCompile Include="..\gtk\gtkmm\pagesetup.cc" />
@@ -344,13 +323,11 @@
<ClCompile Include="..\gtk\gtkmm\printoperationpreview.cc" />
<ClCompile Include="..\gtk\gtkmm\printsettings.cc" />
<ClCompile Include="..\gtk\gtkmm\progressbar.cc" />
- <ClCompile Include="..\gtk\gtkmm\radioaction.cc" />
<ClCompile Include="..\gtk\gtkmm\radiobutton.cc" />
<ClCompile Include="..\gtk\gtkmm\radiobuttongroup.cc" />
<ClCompile Include="..\gtk\gtkmm\radiomenuitem.cc" />
<ClCompile Include="..\gtk\gtkmm\radiotoolbutton.cc" />
<ClCompile Include="..\gtk\gtkmm\range.cc" />
- <ClCompile Include="..\gtk\gtkmm\recentaction.cc" />
<ClCompile Include="..\gtk\gtkmm\recentchooser.cc" />
<ClCompile Include="..\gtk\gtkmm\recentchooserdialog.cc" />
<ClCompile Include="..\gtk\gtkmm\recentchoosermenu.cc" />
@@ -373,29 +350,25 @@
<ClCompile Include="..\gtk\gtkmm\separatormenuitem.cc" />
<ClCompile Include="..\gtk\gtkmm\separatortoolitem.cc" />
<ClCompile Include="..\gtk\gtkmm\settings.cc" />
+ <ClCompile Include="..\gtk\gtkmm\shortcutlabel.cc" />
<ClCompile Include="..\gtk\gtkmm\shortcutsgroup.cc" />
<ClCompile Include="..\gtk\gtkmm\shortcutssection.cc" />
<ClCompile Include="..\gtk\gtkmm\shortcutsshortcut.cc" />
<ClCompile Include="..\gtk\gtkmm\shortcutswindow.cc" />
<ClCompile Include="..\gtk\gtkmm\sizegroup.cc" />
+ <ClCompile Include="..\gtk\gtkmm\snapshot.cc" />
<ClCompile Include="..\gtk\gtkmm\spinbutton.cc" />
<ClCompile Include="..\gtk\gtkmm\spinner.cc" />
<ClCompile Include="..\gtk\gtkmm\stack.cc" />
<ClCompile Include="..\gtk\gtkmm\stacksidebar.cc" />
<ClCompile Include="..\gtk\gtkmm\stackswitcher.cc" />
<ClCompile Include="..\gtk\gtkmm\statusbar.cc" />
- <ClCompile Include="..\gtk\gtkmm\statusicon.cc" />
- <ClCompile Include="..\gtk\gtkmm\stock.cc" />
- <ClCompile Include="..\gtk\gtkmm\stockid.cc" />
- <ClCompile Include="..\gtk\gtkmm\stockitem.cc" />
<ClCompile Include="..\gtk\gtkmm\stylecontext.cc" />
+ <ClCompile Include="..\gtk\gtkmm\styleproperty.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" />
- <ClCompile Include="..\gtk\gtkmm\tearoffmenuitem.cc" />
- <ClCompile Include="..\gtk\gtkmm\textattributes.cc" />
<ClCompile Include="..\gtk\gtkmm\textbuffer.cc" />
<ClCompile Include="..\gtk\gtkmm\textchildanchor.cc" />
<ClCompile Include="..\gtk\gtkmm\textiter.cc" />
@@ -403,7 +376,6 @@
<ClCompile Include="..\gtk\gtkmm\texttag.cc" />
<ClCompile Include="..\gtk\gtkmm\texttagtable.cc" />
<ClCompile Include="..\gtk\gtkmm\textview.cc" />
- <ClCompile Include="..\gtk\gtkmm\toggleaction.cc" />
<ClCompile Include="..\gtk\gtkmm\togglebutton.cc" />
<ClCompile Include="..\gtk\gtkmm\toggletoolbutton.cc" />
<ClCompile Include="..\gtk\gtkmm\toolbar.cc" />
@@ -428,10 +400,11 @@
<ClCompile Include="..\gtk\gtkmm\treeview.cc" />
<ClCompile Include="..\gtk\gtkmm\treeview_private.cc" />
<ClCompile Include="..\gtk\gtkmm\treeviewcolumn.cc" />
- <ClCompile Include="..\gtk\gtkmm\uimanager.cc" />
<ClCompile Include="..\gtk\gtkmm\viewport.cc" />
<ClCompile Include="..\gtk\gtkmm\volumebutton.cc" />
<ClCompile Include="..\gtk\gtkmm\widget.cc" />
+ <ClCompile Include="..\gtk\gtkmm\widgetcustomdraw.cc" />
+ <ClCompile Include="..\gtk\gtkmm\widgetcustomsnapshot.cc" />
<ClCompile Include="..\gtk\gtkmm\widgetpath.cc" />
<ClCompile Include="..\gtk\gtkmm\window.cc" />
<ClCompile Include="..\gtk\gtkmm\windowgroup.cc" />
@@ -443,20 +416,15 @@
<ClInclude Include="..\gtk\gtkmm\accelkey.h" />
<ClInclude Include="..\gtk\gtkmm\accellabel.h" />
<ClInclude Include="..\gtk\gtkmm\accelmap.h" />
- <ClInclude Include="..\gtk\gtkmm\action.h" />
<ClInclude Include="..\gtk\gtkmm\actionable.h" />
<ClInclude Include="..\gtk\gtkmm\actionbar.h" />
- <ClInclude Include="..\gtk\gtkmm\actiongroup.h" />
- <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\application.h" />
<ClInclude Include="..\gtk\gtkmm\applicationwindow.h" />
- <ClInclude Include="..\gtk\gtkmm\arrow.h" />
<ClInclude Include="..\gtk\gtkmm\aspectframe.h" />
<ClInclude Include="..\gtk\gtkmm\assistant.h" />
<ClInclude Include="..\gtk\gtkmm\base.h" />
@@ -491,7 +459,6 @@
<ClInclude Include="..\gtk\gtkmm\colorbutton.h" />
<ClInclude Include="..\gtk\gtkmm\colorchooser.h" />
<ClInclude Include="..\gtk\gtkmm\colorchooserdialog.h" />
- <ClInclude Include="..\gtk\gtkmm\colorselection.h" />
<ClInclude Include="..\gtk\gtkmm\combobox.h" />
<ClInclude Include="..\gtk\gtkmm\comboboxtext.h" />
<ClInclude Include="..\gtk\gtkmm\container.h" />
@@ -519,7 +486,6 @@
<ClInclude Include="..\gtk\gtkmm\fontchooser.h" />
<ClInclude Include="..\gtk\gtkmm\fontchooserdialog.h" />
<ClInclude Include="..\gtk\gtkmm\fontchooserwidget.h" />
- <ClInclude Include="..\gtk\gtkmm\fontselection.h" />
<ClInclude Include="..\gtk\gtkmm\frame.h" />
<ClInclude Include="..\gtk\gtkmm\gesture.h" />
<ClInclude Include="..\gtk\gtkmm\gesturedrag.h" />
@@ -532,22 +498,11 @@
<ClInclude Include="..\gtk\gtkmm\gesturezoom.h" />
<ClInclude Include="..\gtk\gtkmm\glarea.h" />
<ClInclude Include="..\gtk\gtkmm\grid.h" />
- <ClInclude Include="..\gtk\gtkmm\handlebox.h" />
<ClInclude Include="..\gtk\gtkmm\headerbar.h" />
- <ClInclude Include="..\gtk\gtkmm\hvbox.h" />
- <ClInclude Include="..\gtk\gtkmm\hvbuttonbox.h" />
- <ClInclude Include="..\gtk\gtkmm\hvpaned.h" />
- <ClInclude Include="..\gtk\gtkmm\hvscale.h" />
- <ClInclude Include="..\gtk\gtkmm\hvscrollbar.h" />
- <ClInclude Include="..\gtk\gtkmm\hvseparator.h" />
- <ClInclude Include="..\gtk\gtkmm\iconfactory.h" />
<ClInclude Include="..\gtk\gtkmm\iconinfo.h" />
- <ClInclude Include="..\gtk\gtkmm\iconset.h" />
- <ClInclude Include="..\gtk\gtkmm\iconsource.h" />
<ClInclude Include="..\gtk\gtkmm\icontheme.h" />
<ClInclude Include="..\gtk\gtkmm\iconview.h" />
<ClInclude Include="..\gtk\gtkmm\image.h" />
- <ClInclude Include="..\gtk\gtkmm\imagemenuitem.h" />
<ClInclude Include="..\gtk\gtkmm\infobar.h" />
<ClInclude Include="..\gtk\gtkmm\invisible.h" />
<ClInclude Include="..\gtk\gtkmm\label.h" />
@@ -567,12 +522,9 @@
<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\modelbutton.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\orientable.h" />
<ClInclude Include="..\gtk\gtkmm\overlay.h" />
<ClInclude Include="..\gtk\gtkmm\pagesetup.h" />
@@ -586,13 +538,11 @@
<ClInclude Include="..\gtk\gtkmm\printoperationpreview.h" />
<ClInclude Include="..\gtk\gtkmm\printsettings.h" />
<ClInclude Include="..\gtk\gtkmm\progressbar.h" />
- <ClInclude Include="..\gtk\gtkmm\radioaction.h" />
<ClInclude Include="..\gtk\gtkmm\radiobutton.h" />
<ClInclude Include="..\gtk\gtkmm\radiobuttongroup.h" />
<ClInclude Include="..\gtk\gtkmm\radiomenuitem.h" />
<ClInclude Include="..\gtk\gtkmm\radiotoolbutton.h" />
<ClInclude Include="..\gtk\gtkmm\range.h" />
- <ClInclude Include="..\gtk\gtkmm\recentaction.h" />
<ClInclude Include="..\gtk\gtkmm\recentchooser.h" />
<ClInclude Include="..\gtk\gtkmm\recentchooserdialog.h" />
<ClInclude Include="..\gtk\gtkmm\recentchoosermenu.h" />
@@ -615,29 +565,25 @@
<ClInclude Include="..\gtk\gtkmm\separatormenuitem.h" />
<ClInclude Include="..\gtk\gtkmm\separatortoolitem.h" />
<ClInclude Include="..\gtk\gtkmm\settings.h" />
+ <ClInclude Include="..\gtk\gtkmm\shortcutlabel.h" />
<ClInclude Include="..\gtk\gtkmm\shortcutsgroup.h" />
<ClInclude Include="..\gtk\gtkmm\shortcutssection.h" />
<ClInclude Include="..\gtk\gtkmm\shortcutsshortcut.h" />
<ClInclude Include="..\gtk\gtkmm\shortcutswindow.h" />
<ClInclude Include="..\gtk\gtkmm\sizegroup.h" />
+ <ClInclude Include="..\gtk\gtkmm\snapshot" />
<ClInclude Include="..\gtk\gtkmm\spinbutton.h" />
<ClInclude Include="..\gtk\gtkmm\spinner.h" />
<ClInclude Include="..\gtk\gtkmm\stack.h" />
<ClInclude Include="..\gtk\gtkmm\stacksidebar.h" />
<ClInclude Include="..\gtk\gtkmm\stackswitcher.h" />
<ClInclude Include="..\gtk\gtkmm\statusbar.h" />
- <ClInclude Include="..\gtk\gtkmm\statusicon.h" />
- <ClInclude Include="..\gtk\gtkmm\stock.h" />
- <ClInclude Include="..\gtk\gtkmm\stockid.h" />
- <ClInclude Include="..\gtk\gtkmm\stockitem.h" />
<ClInclude Include="..\gtk\gtkmm\stylecontext.h" />
+ <ClInclude Include="..\gtk\gtkmm\styleproperty.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" />
- <ClInclude Include="..\gtk\gtkmm\tearoffmenuitem.h" />
- <ClInclude Include="..\gtk\gtkmm\textattributes.h" />
<ClInclude Include="..\gtk\gtkmm\textbuffer.h" />
<ClInclude Include="..\gtk\gtkmm\textchildanchor.h" />
<ClInclude Include="..\gtk\gtkmm\textiter.h" />
@@ -645,7 +591,6 @@
<ClInclude Include="..\gtk\gtkmm\texttag.h" />
<ClInclude Include="..\gtk\gtkmm\texttagtable.h" />
<ClInclude Include="..\gtk\gtkmm\textview.h" />
- <ClInclude Include="..\gtk\gtkmm\toggleaction.h" />
<ClInclude Include="..\gtk\gtkmm\togglebutton.h" />
<ClInclude Include="..\gtk\gtkmm\toggletoolbutton.h" />
<ClInclude Include="..\gtk\gtkmm\toolbar.h" />
@@ -670,10 +615,11 @@
<ClInclude Include="..\gtk\gtkmm\treeview.h" />
<ClInclude Include="..\gtk\gtkmm\treeview_private.h" />
<ClInclude Include="..\gtk\gtkmm\treeviewcolumn.h" />
- <ClInclude Include="..\gtk\gtkmm\uimanager.h" />
<ClInclude Include="..\gtk\gtkmm\viewport.h" />
<ClInclude Include="..\gtk\gtkmm\volumebutton.h" />
<ClInclude Include="..\gtk\gtkmm\widget.h" />
+ <ClInclude Include="..\gtk\gtkmm\widgetcustomdraw.h" />
+ <ClInclude Include="..\gtk\gtkmm\widgetcustomsnapshot.h" />
<ClInclude Include="..\gtk\gtkmm\widgetpath.h" />
<ClInclude Include="..\gtk\gtkmm\window.h" />
<ClInclude Include="..\gtk\gtkmm\windowgroup.h" />
diff --git a/MSVC_Net2013/gtkmm.vcxproj.filters b/MSVC_Net2017/gtkmm.vcxproj.filters
similarity index 87%
rename from MSVC_Net2013/gtkmm.vcxproj.filters
rename to MSVC_Net2017/gtkmm.vcxproj.filters
index 3b85e65..a9efb9f 100644
--- a/MSVC_Net2013/gtkmm.vcxproj.filters
+++ b/MSVC_Net2017/gtkmm.vcxproj.filters
@@ -19,20 +19,15 @@
<ClCompile Include="..\gtk\gtkmm\accelkey.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\accellabel.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\accelmap.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\action.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\actionable.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\actionbar.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\actiongroup.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\activatable.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\adjustment.cc"><Filter>Source Files</Filter></ClCompile>
- <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\application.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\applicationwindow.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\arrow.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\aspectframe.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\assistant.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\bin.cc"><Filter>Source Files</Filter></ClCompile>
@@ -67,7 +62,6 @@
<ClCompile Include="..\gtk\gtkmm\colorbutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\colorchooser.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\colorchooserdialog.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\colorselection.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\combobox.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>
@@ -95,7 +89,6 @@
<ClCompile Include="..\gtk\gtkmm\fontchooser.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\fontchooserdialog.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\fontchooserwidget.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\fontselection.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\frame.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\gesture.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\gesturedrag.cc"><Filter>Source Files</Filter></ClCompile>
@@ -108,22 +101,11 @@
<ClCompile Include="..\gtk\gtkmm\gesturezoom.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\glarea.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>
<ClCompile Include="..\gtk\gtkmm\headerbar.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\hvbox.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\hvbuttonbox.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\hvpaned.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\hvscale.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\hvscrollbar.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\hvseparator.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\iconfactory.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\iconinfo.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\iconset.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\iconsource.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\icontheme.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\iconview.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\image.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\imagemenuitem.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\infobar.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\inputdialog.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\invisible.cc"><Filter>Source Files</Filter></ClCompile>
@@ -145,12 +127,9 @@
<ClCompile Include="..\gtk\gtkmm\menushell.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\menutoolbutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\messagedialog.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\misc.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\modelbutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\notebook.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\numerableicon.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\object.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\offscreenwindow.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\orientable.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\overlay.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\pagesetup.cc"><Filter>Source Files</Filter></ClCompile>
@@ -164,13 +143,11 @@
<ClCompile Include="..\gtk\gtkmm\printoperationpreview.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\printsettings.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\progressbar.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\radioaction.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\radiobutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\radiobuttongroup.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\radiomenuitem.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\radiotoolbutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\range.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\recentaction.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\recentchooser.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\recentchooserdialog.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\recentchoosermenu.cc"><Filter>Source Files</Filter></ClCompile>
@@ -193,29 +170,25 @@
<ClCompile Include="..\gtk\gtkmm\separatormenuitem.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\separatortoolitem.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\settings.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gtk\gtkmm\shortcutlabel.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\shortcutsgroup.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\shortcutssection.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\shortcutsshortcut.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\shortcutswindow.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\sizegroup.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gtk\gtkmm\snapshot.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\spinbutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\spinner.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\stack.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\stacksidebar.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\stackswitcher.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\statusbar.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\statusicon.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\stock.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\stockid.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\stockitem.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\stylecontext.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gtk\gtkmm\styleproperty.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"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\targetentry.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\targetlist.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\tearoffmenuitem.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\textattributes.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\textbuffer.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\textchildanchor.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\textiter.cc"><Filter>Source Files</Filter></ClCompile>
@@ -223,7 +196,6 @@
<ClCompile Include="..\gtk\gtkmm\texttag.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\texttagtable.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\textview.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\toggleaction.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\togglebutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\toggletoolbutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\toolbar.cc"><Filter>Source Files</Filter></ClCompile>
@@ -248,10 +220,11 @@
<ClCompile Include="..\gtk\gtkmm\treeview.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\treeview_private.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\treeviewcolumn.cc"><Filter>Source Files</Filter></ClCompile>
- <ClCompile Include="..\gtk\gtkmm\uimanager.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\viewport.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\volumebutton.cc"><Filter>Source Files</Filter></ClCompile>
<ClCompile Include="..\gtk\gtkmm\widget.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gtk\gtkmm\widgetcustomdraw.cc"><Filter>Source Files</Filter></ClCompile>
+ <ClCompile Include="..\gtk\gtkmm\widgetcustomsnapshot.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>
<ClCompile Include="..\gtk\gtkmm\windowgroup.cc"><Filter>Source Files</Filter></ClCompile>
@@ -263,20 +236,15 @@
<ClInclude Include="..\gtk\gtkmm\accelkey.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\accellabel.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\accelmap.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\action.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\actionable.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\actionbar.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\actiongroup.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\activatable.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\adjustment.h"><Filter>Header Files</Filter></ClInclude>
- <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\application.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\applicationwindow.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\arrow.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\aspectframe.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\assistant.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\base.h"><Filter>Header Files</Filter></ClInclude>
@@ -310,7 +278,6 @@
<ClInclude Include="..\gtk\gtkmm\colorbutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\colorchooser.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\colorchooserdialog.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\colorselection.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\combobox.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>
@@ -339,7 +306,6 @@
<ClInclude Include="..\gtk\gtkmm\fontchooser.h"><Filter>Source Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\fontchooserdialog.h"><Filter>Source Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\fontchooserwidget.h"><Filter>Source Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\fontselection.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\frame.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\gesture.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\gesturedrag.h"><Filter>Header Files</Filter></ClInclude>
@@ -352,22 +318,11 @@
<ClInclude Include="..\gtk\gtkmm\gesturezoom.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\glarea.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>
<ClInclude Include="..\gtk\gtkmm\headerbar.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\hvbox.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\hvbuttonbox.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\hvpaned.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\hvscale.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\hvscrollbar.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\hvseparator.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\iconfactory.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\iconinfo.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\iconset.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\iconsource.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\icontheme.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\iconview.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\image.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\imagemenuitem.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\infobar.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\invisible.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\label.h"><Filter>Header Files</Filter></ClInclude>
@@ -387,12 +342,9 @@
<ClInclude Include="..\gtk\gtkmm\menushell.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\menutoolbutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\messagedialog.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\misc.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\modelbutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\notebook.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\numerableicons.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\object.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\offscreenwindow.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\orientable.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\overlay.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\pagesetup.h"><Filter>Header Files</Filter></ClInclude>
@@ -406,13 +358,11 @@
<ClInclude Include="..\gtk\gtkmm\printoperationpreview.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\printsettings.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\progressbar.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\radioaction.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\radiobutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\radiobuttongroup.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\radiomenuitem.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\radiotoolbutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\range.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\recentaction.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\recentchooser.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\recentchooserdialog.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\recentchoosermenu.h"><Filter>Header Files</Filter></ClInclude>
@@ -435,29 +385,25 @@
<ClInclude Include="..\gtk\gtkmm\separatormenuitem.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\separatortoolitem.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\settings.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gtk\gtkmm\shortcutlabel.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\shortcutsgroup.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\shortcutssection.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\shortcutsshortcut.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\shortcutswindow.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\sizegroup.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gtk\gtkmm\snapshot.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\spinbutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\spinner.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\stack.h"><Filter>Source Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\stacksidebar.h"><Filter>Source Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\stackswitcher.h"><Filter>Source Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\statusbar.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\statusicon.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\stock.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\stockid.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\stockitem.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\stylecontext.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gtk\gtkmm\styleproperty.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"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\targetentry.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\targetlist.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\tearoffmenuitem.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\textattributes.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\textbuffer.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\textchildanchor.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\textiter.h"><Filter>Header Files</Filter></ClInclude>
@@ -465,7 +411,6 @@
<ClInclude Include="..\gtk\gtkmm\texttag.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\texttagtable.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\textview.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\toggleaction.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\togglebutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\toggletoolbutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\toolbar.h"><Filter>Header Files</Filter></ClInclude>
@@ -490,10 +435,11 @@
<ClInclude Include="..\gtk\gtkmm\treeview.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\treeview_private.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\treeviewcolumn.h"><Filter>Header Files</Filter></ClInclude>
- <ClInclude Include="..\gtk\gtkmm\uimanager.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\viewport.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\volumebutton.h"><Filter>Header Files</Filter></ClInclude>
<ClInclude Include="..\gtk\gtkmm\widget.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gtk\gtkmm\widgetcustomdraw.h"><Filter>Header Files</Filter></ClInclude>
+ <ClInclude Include="..\gtk\gtkmm\widgetcustomsnapshot.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>
<ClInclude Include="..\gtk\gtkmm\windowgroup.h"><Filter>Header Files</Filter></ClInclude>
diff --git a/MSVC_Net2013/gtkmm/gtkmm.rc.in b/MSVC_Net2017/gtkmm/gtkmm.rc.in
similarity index 100%
rename from MSVC_Net2013/gtkmm/gtkmm.rc.in
rename to MSVC_Net2017/gtkmm/gtkmm.rc.in
diff --git a/MSVC_Net2013/gtkmm3-demo.vcxproj b/MSVC_Net2017/gtkmm3-demo.vcxproj
similarity index 88%
rename from MSVC_Net2013/gtkmm3-demo.vcxproj
rename to MSVC_Net2017/gtkmm3-demo.vcxproj
index 9c33d45..a8fb46e 100644
--- a/MSVC_Net2013/gtkmm3-demo.vcxproj
+++ b/MSVC_Net2017/gtkmm3-demo.vcxproj
@@ -28,22 +28,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -79,7 +79,7 @@
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -91,7 +91,7 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-1_6.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gtk-demo.pdb</ProgramDatabaseFile>
@@ -105,7 +105,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -115,7 +115,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-1_6.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
@@ -134,7 +134,7 @@
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -146,7 +146,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-1_6.lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-d-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;$(CPPDepLibsDebug);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(OutDir)gtk-demo.pdb</ProgramDatabaseFile>
@@ -163,7 +163,7 @@
</Midl>
<ClCompile>
<AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
-
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-1.6;$(GlibEtcInstallRoot)\lib\atkmm-1.6\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
<AdditionalIncludeDirectories>.\gtkmm;..\gtk;$(GlibEtcInstallRoot)\include\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion);$(GlibEtcInstallRoot)\lib\atkmm-$(AtkMMMajorVersion).$(AtkMMMinorVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -173,7 +173,7 @@
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Link>
-
<AdditionalDependencies>atkmm-vc$(VSVer)0-1_6.lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
+
<AdditionalDependencies>atkmm-vc$(VSVer)0-$(AtkMMMajorVersion)_$(AtkMMMinorVersion).lib;$(CPPDepLibsRelease);%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Console</SubSystem>
diff --git a/MSVC_Net2013/gtkmm3-demo.vcxproj.filters b/MSVC_Net2017/gtkmm3-demo.vcxproj.filters
similarity index 100%
rename from MSVC_Net2013/gtkmm3-demo.vcxproj.filters
rename to MSVC_Net2017/gtkmm3-demo.vcxproj.filters
diff --git a/MSVC_Net2013/install.vcxproj b/MSVC_Net2017/install.vcxproj
similarity index 97%
rename from MSVC_Net2013/install.vcxproj
rename to MSVC_Net2017/install.vcxproj
index 1df2f4b..5d37d77 100644
--- a/MSVC_Net2013/install.vcxproj
+++ b/MSVC_Net2017/install.vcxproj
@@ -28,23 +28,23 @@
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v120</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/Makefile.am b/Makefile.am
index 984b6a7..66b52d2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,11 +43,11 @@ nodist_gtkmm_libinclude_HEADERS = gtk/gtkmmconfig.h
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = gdk/$(GDKMM_MODULE_NAME).pc gtk/$(GTKMM_MODULE_NAME).pc
-include $(srcdir)/MSVC_Net2013/filelist.am
+include $(srcdir)/MSVC_Net2017/filelist.am
include $(srcdir)/win32_installer/filelist.am
text_files = COPYING.tools PORTING README.SUN README.win32
-msvc_files = $(addprefix MSVC_Net2013/,$(msvc_net2013_data))
+msvc_files = $(addprefix MSVC_Net2017/,$(msvc_net2017_data))
winstall_files = $(addprefix win32_installer/,$(windows_installer_files))
dist_noinst_DATA = $(text_files) $(msvc_files) $(winstall_files)
diff --git a/README.win32 b/README.win32
index 46b6665..05b6d15 100644
--- a/README.win32
+++ b/README.win32
@@ -2,7 +2,7 @@ Building gtkmm on Win32
===========================
Currently, both the mingw (native win32) gcc compiler and MS Visual
-Studio 2005 are supported. gtkmm can be built with mingw32-gcc using
+Studio 2017 are supported. gtkmm can be built with mingw32-gcc using
the gnu autotools (automake, autoconf, libtool). As explicitly
stated in the gtk+ for win32 distribution (http://www.gimp.org/win32/),
the gcc compiler provided by the cygwin distribution should not be
@@ -44,20 +44,19 @@ make
make check
make install
-2. MS Visual Studio 2005
+2. MS Visual Studio 2017
-Open the gtkmm.sln solution file in the MSVC_Net2003 directory. In
+Open the gtkmm.sln solution file in the MSVC_Net2017 directory. In
the Tools/Options panel, add the appropriate GTK+, glibmm include and lib
directories to the Projects and Solutions/VC++ directories. Build the
solution.
-Important NOTE : to circumvent the C++ compiler bug described in this
-bugzilla entry (http://bugzilla.gnome.org/show_bug.cgi?id=158040), it
-is necessary to add '/vd2' to the list of compiler options when
-building and/or using gtkmm with Visual Studio 2005.
+Important NOTE : Unlike previous versions of gtkmm, please do *not* use the
+/vd2 switch when building gtkmm, as it is no longer necessary and will cause
+the code to be built incorrectly.
-gtkmm-2.8 will probably not work correctly with Visual Studio 7.1 or
-below because of the aforementioned bug.
+Due to C++-14 requirements, previous versions of Visual Studio are not
+supported.
3. Gtkmm methods and signals not available on win32
diff --git a/configure.ac b/configure.ac
index d75947d..c1e8a81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,15 +158,15 @@ AC_CONFIG_FILES([Makefile
demos/Makefile
docs/Makefile
docs/reference/Doxyfile
- MSVC_Net2013/gdkmm/gdkmm.rc
- MSVC_Net2013/gtkmm/gtkmm.rc
+ MSVC_Net2017/gdkmm/gdkmm.rc
+ MSVC_Net2017/gtkmm/gtkmm.rc
win32_installer/gtkmm-installer.nsi])
# Copy the generated configuration headers into the MSVC project directories.
-AC_CONFIG_COMMANDS([MSVC_Net2013/gdkmm/gdkmmconfig.h],
- [cp -f gdk/gdkmmconfig.h MSVC_Net2013/gdkmm/gdkmmconfig.h])
-AC_CONFIG_COMMANDS([MSVC_Net2013/gtkmm/gtkmmconfig.h],
- [cp -f gtk/gtkmmconfig.h MSVC_Net2013/gtkmm/gtkmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2017/gdkmm/gdkmmconfig.h],
+ [cp -f gdk/gdkmmconfig.h MSVC_Net2017/gdkmm/gdkmmconfig.h])
+AC_CONFIG_COMMANDS([MSVC_Net2017/gtkmm/gtkmmconfig.h],
+ [cp -f gtk/gtkmmconfig.h MSVC_Net2017/gtkmm/gtkmmconfig.h])
AC_CONFIG_COMMANDS([win32_installer/lgpl.txt],
[cp -f COPYING win32_installer/lgpl.txt])
AC_OUTPUT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
