From fd734e350e9917824bf096e3d54a99f4ccb71e24 Mon Sep 17 00:00:00 2001
From: "Julio C. Rocha" <julio@rochsquadron.net>
Date: Tue, 17 Nov 2015 18:59:38 -0800
Subject: [PATCH] Updated wx_core VCXPROJ to version 3.0.2

---
 Source/3rd Party/wx/wx_core.vcxproj         |  615 +++++--
 Source/3rd Party/wx/wx_core.vcxproj.filters | 1770 +++++++++++++++----
 2 files changed, 1961 insertions(+), 424 deletions(-)

diff --git a/Source/3rd Party/wx/wx_core.vcxproj b/Source/3rd Party/wx/wx_core.vcxproj
index 42d81610e..0d5c4b1a0 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj	
+++ b/Source/3rd Party/wx/wx_core.vcxproj	
@@ -48,7 +48,8 @@
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>Comctl32.lib;Rpcrt4.lib;Gdiplus.lib</AdditionalDependencies>
+      <AdditionalDependencies>Comctl32.lib;Rpcrt4.lib</AdditionalDependencies>
+      <!--<AdditionalDependencies>Comctl32.lib;Rpcrt4.lib;Gdiplus.lib</AdditionalDependencies>-->
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -61,8 +62,10 @@
     <ClCompile Include="src\common\artstd.cpp" />
     <ClCompile Include="src\common\arttango.cpp" />
     <ClCompile Include="src\common\bmpbase.cpp" />
+    <ClCompile Include="src\common\bmpbtncmn.cpp" />
     <ClCompile Include="src\common\bookctrl.cpp" />
     <ClCompile Include="src\common\btncmn.cpp" />
+    <ClCompile Include="src\common\cairo.cpp" />
     <ClCompile Include="src\common\checkboxcmn.cpp" />
     <ClCompile Include="src\common\checklstcmn.cpp" />
     <ClCompile Include="src\common\choiccmn.cpp" />
@@ -71,6 +74,7 @@
     <ClCompile Include="src\common\cmdproc.cpp" />
     <ClCompile Include="src\common\cmndata.cpp" />
     <ClCompile Include="src\common\colourcmn.cpp" />
+    <ClCompile Include="src\common\colourdata.cpp" />
     <ClCompile Include="src\common\combocmn.cpp" />
     <ClCompile Include="src\common\containr.cpp" />
     <ClCompile Include="src\common\cshelp.cpp" />
@@ -79,6 +83,8 @@
     <ClCompile Include="src\common\dcbase.cpp" />
     <ClCompile Include="src\common\dcbufcmn.cpp" />
     <ClCompile Include="src\common\dcgraph.cpp" />
+    <ClCompile Include="src\common\dcsvg.cpp" />
+    <ClCompile Include="src\common\dirctrlcmn.cpp" />
     <ClCompile Include="src\common\dlgcmn.cpp" />
     <ClCompile Include="src\common\dndcmn.cpp" />
     <ClCompile Include="src\common\dobjcmn.cpp" />
@@ -91,8 +97,9 @@
     </ClCompile>
     <ClCompile Include="src\common\effects.cpp" />
     <ClCompile Include="src\common\event.cpp" />
-    <ClCompile Include="src\common\evtloopcmn.cpp" />
     <ClCompile Include="src\common\fddlgcmn.cpp" />
+    <ClCompile Include="src\common\filectrlcmn.cpp" />
+    <ClCompile Include="src\common\filehistorycmn.cpp" />
     <ClCompile Include="src\common\filepickercmn.cpp" />
     <ClCompile Include="src\common\fldlgcmn.cpp" />
     <ClCompile Include="src\common\fontcmn.cpp" />
@@ -100,6 +107,7 @@
     <ClCompile Include="src\common\fontenumcmn.cpp" />
     <ClCompile Include="src\common\fontmap.cpp" />
     <ClCompile Include="src\common\fontpickercmn.cpp" />
+    <ClCompile Include="src\common\fontutilcmn.cpp" />
     <ClCompile Include="src\common\framecmn.cpp" />
     <ClCompile Include="src\common\fs_mem.cpp" />
     <ClCompile Include="src\common\gaugecmn.cpp" />
@@ -108,6 +116,8 @@
     <ClCompile Include="src\common\geometry.cpp" />
     <ClCompile Include="src\common\gifdecod.cpp" />
     <ClCompile Include="src\common\graphcmn.cpp" />
+    <ClCompile Include="src\common\headercolcmn.cpp" />
+    <ClCompile Include="src\common\headerctrlcmn.cpp" />
     <ClCompile Include="src\common\helpbase.cpp" />
     <ClCompile Include="src\common\iconbndl.cpp" />
     <ClCompile Include="src\common\imagall.cpp" />
@@ -130,27 +140,29 @@
     <ClCompile Include="src\common\matrix.cpp" />
     <ClCompile Include="src\common\menucmn.cpp" />
     <ClCompile Include="src\common\modalhook.cpp" />
+    <ClCompile Include="src\common\mousemanager.cpp" />
     <ClCompile Include="src\common\msgout.cpp" />
     <ClCompile Include="src\common\nbkbase.cpp" />
-    <ClCompile Include="src\common\object.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="src\common\overlaycmn.cpp" />
     <ClCompile Include="src\common\ownerdrwcmn.cpp" />
     <ClCompile Include="src\common\panelcmn.cpp" />
     <ClCompile Include="src\common\paper.cpp" />
+    <ClCompile Include="src\common\persist.cpp" />
     <ClCompile Include="src\common\pickerbase.cpp" />
     <ClCompile Include="src\common\popupcmn.cpp" />
+    <ClCompile Include="src\common\preferencescmn.cpp" />
     <ClCompile Include="src\common\prntbase.cpp" />
     <ClCompile Include="src\common\quantize.cpp" />
+    <ClCompile Include="src\common\radiobtncmn.cpp" />
     <ClCompile Include="src\common\radiocmn.cpp" />
+    <ClCompile Include="src\common\rearrangectrl.cpp" />
     <ClCompile Include="src\common\rendcmn.cpp" />
     <ClCompile Include="src\common\rgncmn.cpp" />
+    <ClCompile Include="src\common\scrolbarcmn.cpp" />
     <ClCompile Include="src\common\settcmn.cpp" />
     <ClCompile Include="src\common\sizer.cpp" />
+    <ClCompile Include="src\common\slidercmn.cpp" />
+    <ClCompile Include="src\common\spinbtncmn.cpp" />
     <ClCompile Include="src\common\spinctrlcmn.cpp" />
     <ClCompile Include="src\common\srchcmn.cpp" />
     <ClCompile Include="src\common\statbar.cpp" />
@@ -163,64 +175,67 @@
     <ClCompile Include="src\common\textcmn.cpp" />
     <ClCompile Include="src\common\textentrycmn.cpp" />
     <ClCompile Include="src\common\textmeasurecmn.cpp" />
-    <ClCompile Include="src\common\timercmn.cpp" />
-    <ClCompile Include="src\common\timerimpl.cpp" />
     <ClCompile Include="src\common\toplvcmn.cpp" />
     <ClCompile Include="src\common\treebase.cpp" />
+    <ClCompile Include="src\common\uiactioncmn.cpp" />
     <ClCompile Include="src\common\utilscmn.cpp" />
     <ClCompile Include="src\common\valgen.cpp" />
     <ClCompile Include="src\common\validate.cpp" />
+    <ClCompile Include="src\common\valnum.cpp" />
     <ClCompile Include="src\common\valtext.cpp" />
     <ClCompile Include="src\common\wincmn.cpp" />
     <ClCompile Include="src\common\windowid.cpp" />
+    <ClCompile Include="src\common\wrapsizer.cpp" />
     <ClCompile Include="src\common\xpmdecod.cpp" />
-    <ClCompile Include="src\generic\markuptext.cpp" />
-    <ClCompile Include="src\msw\accel.cpp" />
-    <ClCompile Include="src\msw\anybutton.cpp" />
-    <ClCompile Include="src\msw\artmsw.cpp" />
-    <ClCompile Include="src\msw\evtloopconsole.cpp" />
-    <ClCompile Include="src\msw\nonownedwnd.cpp" />
-    <ClCompile Include="src\msw\ole\access.cpp" />
-    <ClCompile Include="src\msw\ole\activex.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="src\generic\preferencesg.cpp" />
+    <ClCompile Include="src\msw\accel.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
     </ClCompile>
+    <ClCompile Include="src\msw\ole\access.cpp" />
+    <ClCompile Include="src\msw\ole\activex.cpp" />
+    <ClCompile Include="src\msw\anybutton.cpp" />
     <ClCompile Include="src\msw\app.cpp" />
+    <ClCompile Include="src\msw\artmsw.cpp" />
     <ClCompile Include="src\msw\ole\automtn.cpp" />
     <ClCompile Include="src\msw\bitmap.cpp" />
-    <ClCompile Include="src\msw\bmpbuttn.cpp" />
+    <ClCompile Include="src\msw\bmpbuttn.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\brush.cpp" />
-    <ClCompile Include="src\msw\button.cpp" />
+    <ClCompile Include="src\msw\button.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\caret.cpp" />
-    <ClCompile Include="src\msw\checkbox.cpp" />
-    <ClCompile Include="src\msw\checklst.cpp" />
-    <ClCompile Include="src\msw\choice.cpp" />
+    <ClCompile Include="src\msw\checkbox.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\checklst.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\choice.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\clipbrd.cpp" />
     <ClCompile Include="src\msw\colordlg.cpp" />
     <ClCompile Include="src\msw\colour.cpp" />
     <ClCompile Include="src\msw\combo.cpp" />
-    <ClCompile Include="src\msw\combobox.cpp" />
-    <ClCompile Include="src\msw\control.cpp" />
+    <ClCompile Include="src\msw\combobox.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\control.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\cursor.cpp" />
     <ClCompile Include="src\msw\data.cpp" />
-    <ClCompile Include="src\msw\ole\dataobj.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="src\msw\ole\dataobj.cpp" />
     <ClCompile Include="src\msw\dc.cpp" />
     <ClCompile Include="src\msw\dcclient.cpp" />
     <ClCompile Include="src\msw\dcmemory.cpp" />
     <ClCompile Include="src\msw\dcprint.cpp" />
     <ClCompile Include="src\msw\dcscreen.cpp" />
-    <ClCompile Include="src\msw\dialog.cpp" />
+    <ClCompile Include="src\msw\dialog.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\dialup.cpp" />
     <ClCompile Include="src\msw\dib.cpp" />
     <ClCompile Include="src\msw\dirdlg.cpp" />
@@ -230,135 +245,176 @@
     <ClCompile Include="src\msw\ole\droptgt.cpp" />
     <ClCompile Include="src\msw\enhmeta.cpp" />
     <ClCompile Include="src\msw\evtloop.cpp" />
-    <ClCompile Include="src\msw\fdrepdlg.cpp" />
-    <ClCompile Include="src\msw\filedlg.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="src\msw\fdrepdlg.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
     </ClCompile>
+    <ClCompile Include="src\msw\filedlg.cpp" />
     <ClCompile Include="src\msw\font.cpp" />
     <ClCompile Include="src\msw\fontdlg.cpp" />
     <ClCompile Include="src\msw\fontenum.cpp" />
     <ClCompile Include="src\msw\fontutil.cpp" />
     <ClCompile Include="src\msw\frame.cpp" />
-    <ClCompile Include="src\msw\gdiimage.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="src\msw\gauge.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
     </ClCompile>
+    <ClCompile Include="src\msw\gdiimage.cpp" />
     <ClCompile Include="src\msw\gdiobj.cpp" />
-    <ClCompile Include="src\msw\graphics.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="src\msw\gdiplus.cpp" />
+    <ClCompile Include="src\msw\graphics.cpp" />
+    <ClCompile Include="src\msw\headerctrl.cpp" />
     <ClCompile Include="src\msw\helpchm.cpp" />
     <ClCompile Include="src\msw\helpwin.cpp" />
     <ClCompile Include="src\msw\icon.cpp" />
     <ClCompile Include="src\msw\imaglist.cpp" />
     <ClCompile Include="src\msw\iniconf.cpp" />
-    <ClCompile Include="src\msw\listbox.cpp" />
-    <ClCompile Include="src\msw\listctrl.cpp" />
+    <ClCompile Include="src\msw\listbox.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\listctrl.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\main.cpp" />
     <ClCompile Include="src\msw\mdi.cpp" />
-    <ClCompile Include="src\msw\menu.cpp" />
+    <ClCompile Include="src\msw\menu.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\menuitem.cpp" />
     <ClCompile Include="src\msw\metafile.cpp" />
     <ClCompile Include="src\msw\minifram.cpp" />
     <ClCompile Include="src\msw\msgdlg.cpp" />
     <ClCompile Include="src\msw\mslu.cpp" />
     <ClCompile Include="src\msw\nativdlg.cpp" />
-    <ClCompile Include="src\msw\notebook.cpp" />
-    <ClCompile Include="src\msw\ole\oleutils.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    <ClCompile Include="src\msw\nativewin.cpp" />
+    <ClCompile Include="src\msw\nonownedwnd.cpp" />
+    <ClCompile Include="src\msw\notebook.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
     </ClCompile>
+    <ClCompile Include="src\msw\ole\oleutils.cpp" />
     <ClCompile Include="src\msw\ole\safearray.cpp" />
     <ClCompile Include="src\msw\ownerdrw.cpp" />
     <ClCompile Include="src\msw\palette.cpp" />
     <ClCompile Include="src\msw\panel.cpp" />
     <ClCompile Include="src\msw\pen.cpp" />
     <ClCompile Include="src\msw\popupwin.cpp" />
-    <ClCompile Include="src\msw\printdlg.cpp">
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="src\msw\printdlg.cpp" />
     <ClCompile Include="src\msw\printwin.cpp" />
-    <ClCompile Include="src\msw\radiobox.cpp" />
-    <ClCompile Include="src\msw\radiobut.cpp" />
+    <ClCompile Include="src\msw\progdlg.cpp" />
+    <ClCompile Include="src\msw\radiobox.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\radiobut.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\region.cpp" />
     <ClCompile Include="src\msw\renderer.cpp" />
-    <ClCompile Include="src\msw\scrolbar.cpp" />
+    <ClCompile Include="src\msw\richmsgdlg.cpp" />
+    <ClCompile Include="src\msw\scrolbar.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\settings.cpp" />
-    <ClCompile Include="src\msw\slider.cpp" />
-    <ClCompile Include="src\msw\spinbutt.cpp" />
+    <ClCompile Include="src\msw\slider.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\spinbutt.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\spinctrl.cpp" />
-    <ClCompile Include="src\msw\statbmp.cpp" />
-    <ClCompile Include="src\msw\statbox.cpp" />
-    <ClCompile Include="src\msw\statline.cpp" />
-    <ClCompile Include="src\msw\stattext.cpp" />
+    <ClCompile Include="src\msw\statbmp.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\statbox.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\statline.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\stattext.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\statusbar.cpp" />
     <ClCompile Include="src\msw\textctrl.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
     </ClCompile>
     <ClCompile Include="src\msw\textentry.cpp" />
-    <ClCompile Include="src\msw\textmeasure.cpp" />
-    <ClCompile Include="src\msw\tglbtn.cpp" />
-    <ClCompile Include="src\msw\timer.cpp" />
-    <ClCompile Include="src\msw\toolbar.cpp" />
+    <ClCompile Include="src\msw\textmeasure.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\tglbtn.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
+    <ClCompile Include="src\msw\toolbar.cpp">
+      <!-- <ObjectFileName>$(IntDir)msw_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\msw\tooltip.cpp" />
     <ClCompile Include="src\msw\toplevel.cpp" />
     <ClCompile Include="src\msw\treectrl.cpp" />
+    <ClCompile Include="src\msw\uiaction.cpp" />
     <ClCompile Include="src\msw\utilsgui.cpp" />
-    <ClCompile Include="src\msw\ole\uuid.cpp" />
     <ClCompile Include="src\msw\utilswin.cpp" />
+    <ClCompile Include="src\msw\ole\uuid.cpp" />
     <ClCompile Include="src\msw\uxtheme.cpp" />
     <ClCompile Include="src\msw\volume.cpp" />
     <ClCompile Include="src\msw\window.cpp" />
+    <ClCompile Include="src\generic\accel.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\generic\busyinfo.cpp" />
     <ClCompile Include="src\generic\buttonbar.cpp" />
     <ClCompile Include="src\generic\choicbkg.cpp" />
     <ClCompile Include="src\generic\choicdgg.cpp" />
     <ClCompile Include="src\generic\clrpickerg.cpp" />
     <ClCompile Include="src\generic\collpaneg.cpp" />
+    <ClCompile Include="src\generic\colrdlgg.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\generic\combog.cpp" />
     <ClCompile Include="src\generic\dcpsg.cpp" />
     <ClCompile Include="src\generic\dirctrlg.cpp" />
+    <ClCompile Include="src\generic\dirdlgg.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\generic\dragimgg.cpp" />
+    <ClCompile Include="src\generic\fdrepdlg.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\generic\filectrlg.cpp" />
+    <ClCompile Include="src\generic\filedlgg.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\generic\filepickerg.cpp" />
+    <ClCompile Include="src\generic\fontdlgg.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\generic\fontpickerg.cpp" />
     <ClCompile Include="src\generic\graphicc.cpp" />
+    <ClCompile Include="src\generic\headerctrlg.cpp" />
+    <ClCompile Include="src\generic\infobar.cpp" />
     <ClCompile Include="src\generic\listbkg.cpp" />
+    <ClCompile Include="src\generic\listctrl.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="src\generic\logg.cpp" />
+    <ClCompile Include="src\generic\markuptext.cpp" />
+    <ClCompile Include="src\generic\mdig.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="src\generic\msgdlgg.cpp" />
     <ClCompile Include="src\generic\numdlgg.cpp" />
     <ClCompile Include="src\generic\printps.cpp" />
     <ClCompile Include="src\generic\prntdlgg.cpp" />
     <ClCompile Include="src\generic\progdlgg.cpp" />
     <ClCompile Include="src\generic\renderg.cpp" />
+    <ClCompile Include="src\generic\richmsgdlgg.cpp" />
     <ClCompile Include="src\generic\scrlwing.cpp" />
     <ClCompile Include="src\generic\selstore.cpp" />
     <ClCompile Include="src\generic\spinctlg.cpp" />
     <ClCompile Include="src\generic\splitter.cpp" />
     <ClCompile Include="src\generic\srchctlg.cpp" />
-    <ClCompile Include="src\generic\statusbr.cpp" />
+    <ClCompile Include="src\generic\statbmpg.cpp" />
+    <ClCompile Include="src\generic\stattextg.cpp" />
+    <ClCompile Include="src\generic\statusbr.cpp">
+      <!-- <ObjectFileName>$(IntDir)generic_%(Filename).obj</ObjectFileName> -->
+    </ClCompile>
     <ClCompile Include="src\generic\textdlgg.cpp" />
     <ClCompile Include="src\generic\tipwin.cpp" />
     <ClCompile Include="src\generic\toolbkg.cpp" />
@@ -366,9 +422,11 @@
     <ClCompile Include="src\generic\treectlg.cpp" />
     <ClCompile Include="src\generic\vlbox.cpp" />
     <ClCompile Include="src\generic\vscroll.cpp" />
+    <ClCompile Include="src\xrc\xmlreshandler.cpp" />
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="include\wx\msw\setup.h">
+      <!-- <ExcludedFromBuild>true</ExcludedFromBuild> -->
       <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswd\wx\setup.h</Message>
       <Command Condition="'$(Configuration)'=='Debug'">copy "%(FullPath)" lib\vc_lib\mswd\wx\setup.h</Command>
       <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswd\wx\setup.h;%(Outputs)</Outputs>
@@ -376,14 +434,29 @@
       <Command Condition="'$(Configuration)'=='Release'">copy "%(FullPath)" lib\vc_lib\msw\wx\setup.h</Command>
       <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\msw\wx\setup.h;%(Outputs)</Outputs>
     </CustomBuild>
+    <CustomBuild Include="include\wx\msw\genrcdefs.h">
+      <!-- <ExcludedFromBuild>true</ExcludedFromBuild> -->
+      <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)'=='Debug'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
+      <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
+      <Command Condition="'$(Configuration)'=='Release'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
+      <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
+    </CustomBuild>
+  </ItemGroup>
+  <ItemGroup>
     <ClInclude Include="include\wx\msw\accel.h" />
+    <ClInclude Include="include\wx\msw\ole\access.h" />
     <ClInclude Include="include\wx\msw\ole\activex.h" />
+    <ClInclude Include="include\wx\msw\anybutton.h" />
     <ClInclude Include="include\wx\msw\app.h" />
     <ClInclude Include="include\wx\msw\ole\automtn.h" />
     <ClInclude Include="include\wx\msw\bitmap.h" />
     <ClInclude Include="include\wx\msw\bmpbuttn.h" />
+    <ClInclude Include="include\wx\msw\bmpcbox.h" />
     <ClInclude Include="include\wx\msw\brush.h" />
     <ClInclude Include="include\wx\msw\button.h" />
+    <ClInclude Include="include\wx\msw\calctrl.h" />
     <ClInclude Include="include\wx\msw\caret.h" />
     <ClInclude Include="include\wx\msw\checkbox.h" />
     <ClInclude Include="include\wx\msw\checklst.h" />
@@ -393,12 +466,16 @@
     <ClInclude Include="include\wx\msw\colour.h" />
     <ClInclude Include="include\wx\msw\combo.h" />
     <ClInclude Include="include\wx\msw\combobox.h" />
+    <ClInclude Include="include\wx\msw\commandlinkbutton.h" />
     <ClInclude Include="include\wx\msw\control.h" />
     <ClInclude Include="include\wx\msw\ctrlsub.h" />
     <ClInclude Include="include\wx\msw\cursor.h" />
+    <ClInclude Include="include\wx\msw\custombgwin.h" />
     <ClInclude Include="include\wx\msw\ole\dataform.h" />
     <ClInclude Include="include\wx\msw\ole\dataobj.h" />
     <ClInclude Include="include\wx\msw\ole\dataobj2.h" />
+    <ClInclude Include="include\wx\msw\datectrl.h" />
+    <ClInclude Include="include\wx\msw\datetimectrl.h" />
     <ClInclude Include="include\wx\msw\dc.h" />
     <ClInclude Include="include\wx\msw\dcclient.h" />
     <ClInclude Include="include\wx\msw\dcmemory.h" />
@@ -419,32 +496,31 @@
     <ClInclude Include="include\wx\msw\frame.h" />
     <ClInclude Include="include\wx\msw\gauge.h" />
     <ClInclude Include="include\wx\msw\gdiimage.h" />
-    <CustomBuild Include="include\wx\msw\genrcdefs.h">
-      <Message Condition="'$(Configuration)'=='Debug'">Creating lib\vc_lib\mswud\wx\msw\rcdefs.h</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswud\wx\msw\rcdefs.h"</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">lib\vc_lib\mswud\wx\msw\rcdefs.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Creating lib\vc_lib\mswu\wx\msw\rcdefs.h</Message>
-      <Command Condition="'$(Configuration)'=='Release'">cl /EP /nologo "%(FullPath)" &gt; "lib\vc_lib\mswu\wx\msw\rcdefs.h"</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">lib\vc_lib\mswu\wx\msw\rcdefs.h;%(Outputs)</Outputs>
-    </CustomBuild>
+    <ClInclude Include="include\wx\msw\glcanvas.h" />
     <ClInclude Include="include\wx\msw\headerctrl.h" />
+    <ClInclude Include="include\wx\msw\helpbest.h" />
     <ClInclude Include="include\wx\msw\helpchm.h" />
     <ClInclude Include="include\wx\msw\helpwin.h" />
     <ClInclude Include="include\wx\msw\htmlhelp.h" />
+    <ClInclude Include="include\wx\msw\hyperlink.h" />
     <ClInclude Include="include\wx\msw\icon.h" />
     <ClInclude Include="include\wx\msw\imaglist.h" />
+    <ClInclude Include="include\wx\msw\iniconf.h" />
     <ClInclude Include="include\wx\msw\init.h" />
+    <ClInclude Include="include\wx\msw\joystick.h" />
     <ClInclude Include="include\wx\msw\listbox.h" />
     <ClInclude Include="include\wx\msw\listctrl.h" />
     <ClInclude Include="include\wx\msw\mdi.h" />
     <ClInclude Include="include\wx\msw\menu.h" />
     <ClInclude Include="include\wx\msw\menuitem.h" />
+    <ClInclude Include="include\wx\msw\metafile.h" />
     <ClInclude Include="include\wx\msw\minifram.h" />
     <ClInclude Include="include\wx\msw\missing.h" />
     <ClInclude Include="include\wx\msw\msgdlg.h" />
     <ClInclude Include="include\wx\msw\msvcrt.h" />
     <ClInclude Include="include\wx\msw\nonownedwnd.h" />
     <ClInclude Include="include\wx\msw\notebook.h" />
+    <ClInclude Include="include\wx\msw\notifmsg.h" />
     <ClInclude Include="include\wx\msw\ole\oleutils.h" />
     <ClInclude Include="include\wx\msw\ownerdrw.h" />
     <ClInclude Include="include\wx\msw\palette.h" />
@@ -456,9 +532,12 @@
     <ClInclude Include="include\wx\msw\progdlg.h" />
     <ClInclude Include="include\wx\msw\radiobox.h" />
     <ClInclude Include="include\wx\msw\radiobut.h" />
+    <ClInclude Include="include\wx\msw\rcdefs.h" />
     <ClInclude Include="include\wx\msw\region.h" />
+    <ClInclude Include="include\wx\msw\richmsgdlg.h" />
     <ClInclude Include="include\wx\msw\scrolbar.h" />
     <ClInclude Include="include\wx\msw\slider.h" />
+    <ClInclude Include="include\wx\msw\sound.h" />
     <ClInclude Include="include\wx\msw\spinbutt.h" />
     <ClInclude Include="include\wx\msw\spinctrl.h" />
     <ClInclude Include="include\wx\msw\statbmp.h" />
@@ -466,9 +545,11 @@
     <ClInclude Include="include\wx\msw\statline.h" />
     <ClInclude Include="include\wx\msw\stattext.h" />
     <ClInclude Include="include\wx\msw\statusbar.h" />
+    <ClInclude Include="include\wx\msw\taskbar.h" />
     <ClInclude Include="include\wx\msw\textctrl.h" />
     <ClInclude Include="include\wx\msw\textentry.h" />
     <ClInclude Include="include\wx\msw\tglbtn.h" />
+    <ClInclude Include="include\wx\msw\timectrl.h" />
     <ClInclude Include="include\wx\msw\toolbar.h" />
     <ClInclude Include="include\wx\msw\tooltip.h" />
     <ClInclude Include="include\wx\msw\toplevel.h" />
@@ -476,45 +557,116 @@
     <ClInclude Include="include\wx\msw\ole\uuid.h" />
     <ClInclude Include="include\wx\msw\uxtheme.h" />
     <ClInclude Include="include\wx\msw\uxthemep.h" />
+    <ClInclude Include="include\wx\msw\webview_ie.h" />
+    <ClInclude Include="include\wx\msw\webviewhistoryitem_ie.h" />
     <ClInclude Include="include\wx\msw\window.h" />
+    <ClInclude Include="include\wx\generic\aboutdlgg.h" />
+    <ClInclude Include="include\wx\generic\accel.h" />
+    <ClInclude Include="include\wx\generic\animate.h" />
+    <ClInclude Include="include\wx\generic\bmpcbox.h" />
     <ClInclude Include="include\wx\generic\busyinfo.h" />
+    <ClInclude Include="include\wx\generic\buttonbar.h" />
+    <ClInclude Include="include\wx\generic\calctrlg.h" />
     <ClInclude Include="include\wx\generic\choicdgg.h" />
     <ClInclude Include="include\wx\generic\clrpickerg.h" />
     <ClInclude Include="include\wx\generic\collpaneg.h" />
+    <ClInclude Include="include\wx\generic\colrdlgg.h" />
     <ClInclude Include="include\wx\generic\combo.h" />
     <ClInclude Include="include\wx\generic\ctrlsub.h" />
+    <ClInclude Include="include\wx\generic\custombgwin.h" />
+    <ClInclude Include="include\wx\generic\dataview.h" />
+    <ClInclude Include="include\wx\generic\datectrl.h" />
+    <ClInclude Include="include\wx\generic\dcpsg.h" />
     <ClInclude Include="include\wx\generic\dirctrlg.h" />
+    <ClInclude Include="include\wx\generic\dirdlgg.h" />
     <ClInclude Include="include\wx\generic\dragimgg.h" />
+    <ClInclude Include="include\wx\generic\dvrenderer.h" />
+    <ClInclude Include="include\wx\generic\dvrenderers.h" />
+    <ClInclude Include="include\wx\generic\fdrepdlg.h" />
     <ClInclude Include="include\wx\generic\filectrlg.h" />
+    <ClInclude Include="include\wx\generic\filedlgg.h" />
     <ClInclude Include="include\wx\generic\filepickerg.h" />
+    <ClInclude Include="include\wx\generic\fontdlgg.h" />
     <ClInclude Include="include\wx\generic\fontpickerg.h" />
+    <ClInclude Include="include\wx\generic\grid.h" />
+    <ClInclude Include="include\wx\generic\gridctrl.h" />
+    <ClInclude Include="include\wx\generic\grideditors.h" />
+    <ClInclude Include="include\wx\generic\gridsel.h" />
+    <ClInclude Include="include\wx\generic\headerctrlg.h" />
+    <ClInclude Include="include\wx\generic\helpext.h" />
+    <ClInclude Include="include\wx\generic\hyperlink.h" />
     <ClInclude Include="include\wx\generic\infobar.h" />
+    <ClInclude Include="include\wx\generic\laywin.h" />
+    <ClInclude Include="include\wx\generic\listctrl.h" />
     <ClInclude Include="include\wx\generic\logg.h" />
+    <ClInclude Include="include\wx\generic\mdig.h" />
     <ClInclude Include="include\wx\generic\msgdlgg.h" />
     <ClInclude Include="include\wx\generic\notebook.h" />
+    <ClInclude Include="include\wx\generic\notifmsg.h" />
     <ClInclude Include="include\wx\generic\numdlgg.h" />
+    <ClInclude Include="include\wx\generic\panelg.h" />
+    <ClInclude Include="include\wx\generic\printps.h" />
     <ClInclude Include="include\wx\generic\prntdlgg.h" />
     <ClInclude Include="include\wx\generic\progdlgg.h" />
+    <ClInclude Include="include\wx\generic\propdlg.h" />
     <ClInclude Include="include\wx\generic\richmsgdlgg.h" />
+    <ClInclude Include="include\wx\generic\sashwin.h" />
     <ClInclude Include="include\wx\generic\scrolwin.h" />
     <ClInclude Include="include\wx\generic\spinctlg.h" />
+    <ClInclude Include="include\wx\generic\splash.h" />
     <ClInclude Include="include\wx\generic\splitter.h" />
     <ClInclude Include="include\wx\generic\srchctlg.h" />
     <ClInclude Include="include\wx\generic\statbmpg.h" />
     <ClInclude Include="include\wx\generic\stattextg.h" />
     <ClInclude Include="include\wx\generic\statusbr.h" />
     <ClInclude Include="include\wx\generic\textdlgg.h" />
+    <ClInclude Include="include\wx\generic\timectrl.h" />
     <ClInclude Include="include\wx\generic\treectlg.h" />
+    <ClInclude Include="include\wx\generic\wizard.h" />
+    <ClInclude Include="include\wx\html\helpctrl.h" />
+    <ClInclude Include="include\wx\html\helpdata.h" />
+    <ClInclude Include="include\wx\html\helpdlg.h" />
+    <ClInclude Include="include\wx\html\helpfrm.h" />
+    <ClInclude Include="include\wx\html\helpwnd.h" />
+    <ClInclude Include="include\wx\html\htmlcell.h" />
+    <ClInclude Include="include\wx\html\htmldefs.h" />
+    <ClInclude Include="include\wx\html\htmlfilt.h" />
+    <ClInclude Include="include\wx\html\htmlpars.h" />
+    <ClInclude Include="include\wx\html\htmlproc.h" />
+    <ClInclude Include="include\wx\html\htmltag.h" />
+    <ClInclude Include="include\wx\html\htmlwin.h" />
+    <ClInclude Include="include\wx\html\htmprint.h" />
+    <ClInclude Include="include\wx\html\m_templ.h" />
+    <ClInclude Include="include\wx\html\styleparams.h" />
+    <ClInclude Include="include\wx\html\winpars.h" />
+    <ClInclude Include="include\wx\aboutdlg.h" />
     <ClInclude Include="include\wx\accel.h" />
+    <ClInclude Include="include\wx\access.h" />
+    <ClInclude Include="include\wx\propgrid\advprops.h" />
+    <ClInclude Include="include\wx\affinematrix2d.h" />
+    <ClInclude Include="include\wx\affinematrix2dbase.h" />
     <ClInclude Include="include\wx\anidecod.h" />
+    <ClInclude Include="include\wx\animate.h" />
     <ClInclude Include="include\wx\animdecod.h" />
+    <ClInclude Include="include\wx\anybutton.h" />
+    <ClInclude Include="include\wx\ribbon\art.h" />
+    <ClInclude Include="include\wx\ribbon\art_internal.h" />
     <ClInclude Include="include\wx\artprov.h" />
+    <ClInclude Include="include\wx\aui\aui.h" />
+    <ClInclude Include="include\wx\aui\auibar.h" />
+    <ClInclude Include="include\wx\aui\auibook.h" />
+    <ClInclude Include="include\wx\bannerwindow.h" />
+    <ClInclude Include="include\wx\ribbon\bar.h" />
     <ClInclude Include="include\wx\bitmap.h" />
     <ClInclude Include="include\wx\bmpbuttn.h" />
+    <ClInclude Include="include\wx\bmpcbox.h" />
     <ClInclude Include="include\wx\bookctrl.h" />
+    <ClInclude Include="include\wx\persist\bookctrl.h" />
     <ClInclude Include="include\wx\brush.h" />
     <ClInclude Include="include\wx\busyinfo.h" />
     <ClInclude Include="include\wx\button.h" />
+    <ClInclude Include="include\wx\ribbon\buttonbar.h" />
+    <ClInclude Include="include\wx\calctrl.h" />
     <ClInclude Include="include\wx\caret.h" />
     <ClInclude Include="include\wx\checkbox.h" />
     <ClInclude Include="include\wx\checklst.h" />
@@ -528,13 +680,22 @@
     <ClInclude Include="include\wx\collpane.h" />
     <ClInclude Include="include\wx\colordlg.h" />
     <ClInclude Include="include\wx\colour.h" />
+    <ClInclude Include="include\wx\colourdata.h" />
     <ClInclude Include="include\wx\combo.h" />
     <ClInclude Include="include\wx\combobox.h" />
+    <ClInclude Include="include\wx\commandlinkbutton.h" />
+    <ClInclude Include="include\wx\compositewin.h" />
     <ClInclude Include="include\wx\control.h" />
+    <ClInclude Include="include\wx\ribbon\control.h" />
     <ClInclude Include="include\wx\cshelp.h" />
     <ClInclude Include="include\wx\ctrlsub.h" />
     <ClInclude Include="include\wx\cursor.h" />
+    <ClInclude Include="include\wx\custombgwin.h" />
     <ClInclude Include="include\wx\dataobj.h" />
+    <ClInclude Include="include\wx\dataview.h" />
+    <ClInclude Include="include\wx\datectrl.h" />
+    <ClInclude Include="include\wx\dateevt.h" />
+    <ClInclude Include="include\wx\datetimectrl.h" />
     <ClInclude Include="include\wx\dc.h" />
     <ClInclude Include="include\wx\dcbuffer.h" />
     <ClInclude Include="include\wx\dcclient.h" />
@@ -542,37 +703,60 @@
     <ClInclude Include="include\wx\dcmemory.h" />
     <ClInclude Include="include\wx\dcmirror.h" />
     <ClInclude Include="include\wx\dcprint.h" />
+    <ClInclude Include="include\wx\dcps.h" />
     <ClInclude Include="include\wx\dcscreen.h" />
+    <ClInclude Include="include\wx\dcsvg.h" />
+    <ClInclude Include="include\wx\debugrpt.h" />
     <ClInclude Include="include\wx\dialog.h" />
     <ClInclude Include="include\wx\dialup.h" />
+    <ClInclude Include="include\wx\dirctrl.h" />
     <ClInclude Include="include\wx\dirdlg.h" />
     <ClInclude Include="include\wx\display.h" />
     <ClInclude Include="include\wx\display_impl.h" />
     <ClInclude Include="include\wx\dnd.h" />
+    <ClInclude Include="include\wx\aui\dockart.h" />
     <ClInclude Include="include\wx\docmdi.h" />
     <ClInclude Include="include\wx\docview.h" />
+    <ClInclude Include="include\wx\dragimag.h" />
+    <ClInclude Include="include\wx\dvrenderers.h" />
+    <ClInclude Include="include\wx\editlbox.h" />
+    <ClInclude Include="include\wx\propgrid\editors.h" />
     <ClInclude Include="include\wx\effects.h" />
     <ClInclude Include="include\wx\encinfo.h" />
+    <ClInclude Include="include\wx\evtloopsrc.h" />
     <ClInclude Include="include\wx\fdrepdlg.h" />
+    <ClInclude Include="include\wx\filectrl.h" />
     <ClInclude Include="include\wx\filedlg.h" />
+    <ClInclude Include="include\wx\filehistory.h" />
     <ClInclude Include="include\wx\filepicker.h" />
+    <ClInclude Include="include\wx\aui\floatpane.h" />
     <ClInclude Include="include\wx\fmappriv.h" />
     <ClInclude Include="include\wx\font.h" />
+    <ClInclude Include="include\wx\fontdata.h" />
     <ClInclude Include="include\wx\fontdlg.h" />
     <ClInclude Include="include\wx\fontenum.h" />
     <ClInclude Include="include\wx\fontpicker.h" />
     <ClInclude Include="include\wx\fontutil.h" />
     <ClInclude Include="include\wx\frame.h" />
+    <ClInclude Include="include\wx\aui\framemanager.h" />
+    <ClInclude Include="include\wx\ribbon\gallery.h" />
     <ClInclude Include="include\wx\gauge.h" />
     <ClInclude Include="include\wx\gbsizer.h" />
     <ClInclude Include="include\wx\gdicmn.h" />
     <ClInclude Include="include\wx\gdiobj.h" />
     <ClInclude Include="include\wx\geometry.h" />
     <ClInclude Include="include\wx\gifdecod.h" />
+    <ClInclude Include="include\wx\glcanvas.h" />
     <ClInclude Include="include\wx\graphics.h" />
+    <ClInclude Include="include\wx\grid.h" />
+    <ClInclude Include="include\wx\headercol.h" />
     <ClInclude Include="include\wx\headerctrl.h" />
     <ClInclude Include="include\wx\help.h" />
     <ClInclude Include="include\wx\helpbase.h" />
+    <ClInclude Include="include\wx\helphtml.h" />
+    <ClInclude Include="include\wx\helpwin.h" />
+    <ClInclude Include="include\wx\htmllbox.h" />
+    <ClInclude Include="include\wx\hyperlink.h" />
     <ClInclude Include="include\wx\icon.h" />
     <ClInclude Include="include\wx\iconbndl.h" />
     <ClInclude Include="include\wx\imagbmp.h" />
@@ -582,5 +766,222 @@
     <ClInclude Include="include\wx\imagjpeg.h" />
     <ClInclude Include="include\wx\imaglist.h" />
     <ClInclude Include="include\wx\imagpcx.h" />
+    <ClInclude Include="include\wx\imagpng.h" />
+    <ClInclude Include="include\wx\imagpnm.h" />
+    <ClInclude Include="include\wx\imagtga.h" />
+    <ClInclude Include="include\wx\imagtiff.h" />
+    <ClInclude Include="include\wx\imagxpm.h" />
+    <ClInclude Include="include\wx\infobar.h" />
+    <ClInclude Include="include\wx\itemid.h" />
+    <ClInclude Include="include\wx\joystick.h" />
+    <ClInclude Include="include\wx\layout.h" />
+    <ClInclude Include="include\wx\laywin.h" />
+    <ClInclude Include="include\wx\listbase.h" />
+    <ClInclude Include="include\wx\listbook.h" />
+    <ClInclude Include="include\wx\listbox.h" />
+    <ClInclude Include="include\wx\listctrl.h" />
+    <ClInclude Include="include\wx\propgrid\manager.h" />
+    <ClInclude Include="include\wx\matrix.h" />
+    <ClInclude Include="include\wx\mdi.h" />
+    <ClInclude Include="include\wx\mediactrl.h" />
+    <ClInclude Include="include\wx\menu.h" />
+    <ClInclude Include="include\wx\menuitem.h" />
+    <ClInclude Include="include\wx\metafile.h" />
+    <ClInclude Include="include\wx\minifram.h" />
+    <ClInclude Include="include\wx\modalhook.h" />
+    <ClInclude Include="include\wx\mousemanager.h" />
+    <ClInclude Include="include\wx\msgdlg.h" />
+    <ClInclude Include="include\wx\nativewin.h" />
+    <ClInclude Include="include\wx\nonownedwnd.h" />
+    <ClInclude Include="include\wx\notebook.h" />
+    <ClInclude Include="include\wx\notifmsg.h" />
+    <ClInclude Include="include\wx\numdlg.h" />
+    <ClInclude Include="include\wx\odcombo.h" />
+    <ClInclude Include="include\wx\overlay.h" />
+    <ClInclude Include="include\wx\ownerdrw.h" />
+    <ClInclude Include="include\wx\ribbon\page.h" />
+    <ClInclude Include="include\wx\palette.h" />
+    <ClInclude Include="include\wx\panel.h" />
+    <ClInclude Include="include\wx\ribbon\panel.h" />
+    <ClInclude Include="include\wx\paper.h" />
+    <ClInclude Include="include\wx\pen.h" />
+    <ClInclude Include="include\wx\persist.h" />
+    <ClInclude Include="include\wx\pickerbase.h" />
+    <ClInclude Include="include\wx\popupwin.h" />
+    <ClInclude Include="include\wx\position.h" />
+    <ClInclude Include="include\wx\print.h" />
+    <ClInclude Include="include\wx\printdlg.h" />
+    <ClInclude Include="include\wx\prntbase.h" />
+    <ClInclude Include="include\wx\progdlg.h" />
+    <ClInclude Include="include\wx\propdlg.h" />
+    <ClInclude Include="include\wx\propgrid\property.h" />
+    <ClInclude Include="include\wx\propgrid\propgrid.h" />
+    <ClInclude Include="include\wx\propgrid\propgriddefs.h" />
+    <ClInclude Include="include\wx\propgrid\propgridiface.h" />
+    <ClInclude Include="include\wx\propgrid\propgridpagestate.h" />
+    <ClInclude Include="include\wx\propgrid\props.h" />
+    <ClInclude Include="include\wx\quantize.h" />
+    <ClInclude Include="include\wx\radiobox.h" />
+    <ClInclude Include="include\wx\radiobut.h" />
+    <ClInclude Include="include\wx\range.h" />
+    <ClInclude Include="include\wx\rawbmp.h" />
+    <ClInclude Include="include\wx\rearrangectrl.h" />
+    <ClInclude Include="include\wx\region.h" />
+    <ClInclude Include="include\wx\renderer.h" />
+    <ClInclude Include="include\wx\richmsgdlg.h" />
+    <ClInclude Include="include\wx\richtext\richtextbackgroundpage.h" />
+    <ClInclude Include="include\wx\richtext\richtextborderspage.h" />
+    <ClInclude Include="include\wx\richtext\richtextbuffer.h" />
+    <ClInclude Include="include\wx\richtext\richtextbulletspage.h" />
+    <ClInclude Include="include\wx\richtext\richtextctrl.h" />
+    <ClInclude Include="include\wx\richtext\richtextdialogpage.h" />
+    <ClInclude Include="include\wx\richtext\richtextfontpage.h" />
+    <ClInclude Include="include\wx\richtext\richtextformatdlg.h" />
+    <ClInclude Include="include\wx\richtext\richtexthtml.h" />
+    <ClInclude Include="include\wx\richtext\richtextimagedlg.h" />
+    <ClInclude Include="include\wx\richtext\richtextindentspage.h" />
+    <ClInclude Include="include\wx\richtext\richtextliststylepage.h" />
+    <ClInclude Include="include\wx\richtext\richtextmarginspage.h" />
+    <ClInclude Include="include\wx\richtext\richtextprint.h" />
+    <ClInclude Include="include\wx\richtext\richtextsizepage.h" />
+    <ClInclude Include="include\wx\richtext\richtextstyledlg.h" />
+    <ClInclude Include="include\wx\richtext\richtextstylepage.h" />
+    <ClInclude Include="include\wx\richtext\richtextstyles.h" />
+    <ClInclude Include="include\wx\richtext\richtextsymboldlg.h" />
+    <ClInclude Include="include\wx\richtext\richtextuicustomization.h" />
+    <ClInclude Include="include\wx\richtext\richtextxml.h" />
+    <ClInclude Include="include\wx\richtooltip.h" />
+    <ClInclude Include="include\wx\sashwin.h" />
+    <ClInclude Include="include\wx\scopeguard.h" />
+    <ClInclude Include="include\wx\scrolbar.h" />
+    <ClInclude Include="include\wx\scrolwin.h" />
+    <ClInclude Include="include\wx\selstore.h" />
+    <ClInclude Include="include\wx\settings.h" />
+    <ClInclude Include="include\wx\simplebook.h" />
+    <ClInclude Include="include\wx\sizer.h" />
+    <ClInclude Include="include\wx\slider.h" />
+    <ClInclude Include="include\wx\sound.h" />
+    <ClInclude Include="include\wx\spinbutt.h" />
+    <ClInclude Include="include\wx\spinctrl.h" />
+    <ClInclude Include="include\wx\splash.h" />
+    <ClInclude Include="include\wx\persist\splitter.h" />
+    <ClInclude Include="include\wx\splitter.h" />
+    <ClInclude Include="include\wx\srchctrl.h" />
+    <ClInclude Include="include\wx\statbmp.h" />
+    <ClInclude Include="include\wx\statbox.h" />
+    <ClInclude Include="include\wx\statline.h" />
+    <ClInclude Include="include\wx\stattext.h" />
+    <ClInclude Include="include\wx\statusbr.h" />
+    <ClInclude Include="include\wx\stc\stc.h" />
+    <ClInclude Include="include\wx\aui\tabart.h" />
+    <ClInclude Include="include\wx\aui\tabmdi.h" />
+    <ClInclude Include="include\wx\taskbar.h" />
+    <ClInclude Include="include\wx\tbarbase.h" />
+    <ClInclude Include="include\wx\textcompleter.h" />
+    <ClInclude Include="include\wx\textctrl.h" />
+    <ClInclude Include="include\wx\textdlg.h" />
+    <ClInclude Include="include\wx\textentry.h" />
+    <ClInclude Include="include\wx\textwrapper.h" />
+    <ClInclude Include="include\wx\tglbtn.h" />
+    <ClInclude Include="include\wx\timectrl.h" />
+    <ClInclude Include="include\wx\tipdlg.h" />
+    <ClInclude Include="include\wx\tipwin.h" />
+    <ClInclude Include="include\wx\ribbon\toolbar.h" />
+    <ClInclude Include="include\wx\toolbar.h" />
+    <ClInclude Include="include\wx\toolbook.h" />
+    <ClInclude Include="include\wx\tooltip.h" />
+    <ClInclude Include="include\wx\persist\toplevel.h" />
+    <ClInclude Include="include\wx\toplevel.h" />
+    <ClInclude Include="include\wx\treebase.h" />
+    <ClInclude Include="include\wx\persist\treebook.h" />
+    <ClInclude Include="include\wx\treebook.h" />
+    <ClInclude Include="include\wx\treectrl.h" />
+    <ClInclude Include="include\wx\treelist.h" />
+    <ClInclude Include="include\wx\uiaction.h" />
+    <ClInclude Include="include\wx\valgen.h" />
+    <ClInclude Include="include\wx\validate.h" />
+    <ClInclude Include="include\wx\valnum.h" />
+    <ClInclude Include="include\wx\valtext.h" />
+    <ClInclude Include="include\wx\vidmode.h" />
+    <ClInclude Include="include\wx\vlbox.h" />
+    <ClInclude Include="include\wx\vms_x_fix.h" />
+    <ClInclude Include="include\wx\vscroll.h" />
+    <ClInclude Include="include\wx\webview.h" />
+    <ClInclude Include="include\wx\webviewarchivehandler.h" />
+    <ClInclude Include="include\wx\persist\window.h" />
+    <ClInclude Include="include\wx\window.h" />
+    <ClInclude Include="include\wx\windowid.h" />
+    <ClInclude Include="include\wx\windowptr.h" />
+    <ClInclude Include="include\wx\withimages.h" />
+    <ClInclude Include="include\wx\wizard.h" />
+    <ClInclude Include="include\wx\wrapsizer.h" />
+    <ClInclude Include="include\wx\wupdlock.h" />
+    <ClInclude Include="include\wx\wxhtml.h" />
+    <ClInclude Include="include\wx\xrc\xh_all.h" />
+    <ClInclude Include="include\wx\xrc\xh_animatctrl.h" />
+    <ClInclude Include="include\wx\xrc\xh_bannerwindow.h" />
+    <ClInclude Include="include\wx\xrc\xh_bmp.h" />
+    <ClInclude Include="include\wx\xrc\xh_bmpbt.h" />
+    <ClInclude Include="include\wx\xrc\xh_bmpcbox.h" />
+    <ClInclude Include="include\wx\xrc\xh_bttn.h" />
+    <ClInclude Include="include\wx\xrc\xh_cald.h" />
+    <ClInclude Include="include\wx\xrc\xh_chckb.h" />
+    <ClInclude Include="include\wx\xrc\xh_chckl.h" />
+    <ClInclude Include="include\wx\xrc\xh_choic.h" />
+    <ClInclude Include="include\wx\xrc\xh_choicbk.h" />
+    <ClInclude Include="include\wx\xrc\xh_clrpicker.h" />
+    <ClInclude Include="include\wx\xrc\xh_cmdlinkbn.h" />
+    <ClInclude Include="include\wx\xrc\xh_collpane.h" />
+    <ClInclude Include="include\wx\xrc\xh_combo.h" />
+    <ClInclude Include="include\wx\xrc\xh_comboctrl.h" />
+    <ClInclude Include="include\wx\xrc\xh_datectrl.h" />
+    <ClInclude Include="include\wx\xrc\xh_dirpicker.h" />
+    <ClInclude Include="include\wx\xrc\xh_dlg.h" />
+    <ClInclude Include="include\wx\xrc\xh_editlbox.h" />
+    <ClInclude Include="include\wx\xrc\xh_filectrl.h" />
+    <ClInclude Include="include\wx\xrc\xh_filepicker.h" />
+    <ClInclude Include="include\wx\xrc\xh_fontpicker.h" />
+    <ClInclude Include="include\wx\xrc\xh_frame.h" />
+    <ClInclude Include="include\wx\xrc\xh_gauge.h" />
+    <ClInclude Include="include\wx\xrc\xh_gdctl.h" />
+    <ClInclude Include="include\wx\xrc\xh_grid.h" />
+    <ClInclude Include="include\wx\xrc\xh_html.h" />
+    <ClInclude Include="include\wx\xrc\xh_htmllbox.h" />
+    <ClInclude Include="include\wx\xrc\xh_hyperlink.h" />
+    <ClInclude Include="include\wx\xrc\xh_listb.h" />
+    <ClInclude Include="include\wx\xrc\xh_listbk.h" />
+    <ClInclude Include="include\wx\xrc\xh_listc.h" />
+    <ClInclude Include="include\wx\xrc\xh_mdi.h" />
+    <ClInclude Include="include\wx\xrc\xh_menu.h" />
+    <ClInclude Include="include\wx\xrc\xh_notbk.h" />
+    <ClInclude Include="include\wx\xrc\xh_odcombo.h" />
+    <ClInclude Include="include\wx\xrc\xh_panel.h" />
+    <ClInclude Include="include\wx\xrc\xh_propdlg.h" />
+    <ClInclude Include="include\wx\xrc\xh_radbt.h" />
+    <ClInclude Include="include\wx\xrc\xh_radbx.h" />
+    <ClInclude Include="include\wx\xrc\xh_scrol.h" />
+    <ClInclude Include="include\wx\xrc\xh_scwin.h" />
+    <ClInclude Include="include\wx\xrc\xh_sizer.h" />
+    <ClInclude Include="include\wx\xrc\xh_slidr.h" />
+    <ClInclude Include="include\wx\xrc\xh_spin.h" />
+    <ClInclude Include="include\wx\xrc\xh_split.h" />
+    <ClInclude Include="include\wx\xrc\xh_srchctrl.h" />
+    <ClInclude Include="include\wx\xrc\xh_statbar.h" />
+    <ClInclude Include="include\wx\xrc\xh_stbmp.h" />
+    <ClInclude Include="include\wx\xrc\xh_stbox.h" />
+    <ClInclude Include="include\wx\xrc\xh_stlin.h" />
+    <ClInclude Include="include\wx\xrc\xh_sttxt.h" />
+    <ClInclude Include="include\wx\xrc\xh_text.h" />
+    <ClInclude Include="include\wx\xrc\xh_tglbtn.h" />
+    <ClInclude Include="include\wx\xrc\xh_timectrl.h" />
+    <ClInclude Include="include\wx\xrc\xh_toolb.h" />
+    <ClInclude Include="include\wx\xrc\xh_toolbk.h" />
+    <ClInclude Include="include\wx\xrc\xh_tree.h" />
+    <ClInclude Include="include\wx\xrc\xh_treebk.h" />
+    <ClInclude Include="include\wx\xrc\xh_unkwn.h" />
+    <ClInclude Include="include\wx\xrc\xh_wizrd.h" />
+    <ClInclude Include="include\wx\xrc\xmlres.h" />
+    <ClInclude Include="include\wx\xpmdecod.h" />
+    <ClInclude Include="include\wx\xpmhand.h" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Source/3rd Party/wx/wx_core.vcxproj.filters b/Source/3rd Party/wx/wx_core.vcxproj.filters
index dde815acd..1088976f3 100644
--- a/Source/3rd Party/wx/wx_core.vcxproj.filters	
+++ b/Source/3rd Party/wx/wx_core.vcxproj.filters	
@@ -24,641 +24,851 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="src\common\accelcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
     <ClCompile Include="src\common\accesscmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\affinematrix2d.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\anidecod.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\appcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\artprov.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\artstd.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\arttango.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\bmpbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\bmpbtncmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\bookctrl.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\btncmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\cairo.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\checkboxcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\checklstcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\choiccmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\clipcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\clrpickercmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\cmdproc.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\cmndata.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\colourcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\colourdata.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\combocmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\containr.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\cshelp.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\ctrlcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\ctrlsub.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dcbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dcbufcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dcgraph.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dcsvg.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\dirctrlcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dlgcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dndcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dobjcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\docmdi.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\docview.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dpycmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dseldlg.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\dummy.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\effects.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\event.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fddlgcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filectrlcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\filehistorycmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\filepickercmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fldlgcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fontcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontdata.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fontenumcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fontmap.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fontpickercmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\fontutilcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\framecmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\fs_mem.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\gaugecmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\gbsizer.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\gdicmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\geometry.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\gifdecod.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\graphcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\headercolcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\headerctrlcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\helpbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\iconbndl.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagall.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagbmp.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\image.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagfill.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imaggif.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagiff.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagjpeg.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagpcx.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagpng.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagpnm.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagtga.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagtiff.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\imagxpm.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\layout.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\lboxcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\listctrlcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\markupparser.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\matrix.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\menucmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\modalhook.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\mousemanager.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\msgout.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\nbkbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\overlaycmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\ownerdrwcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\panelcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\paper.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\persist.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\pickerbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\popupcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\prntbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\quantize.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\radiobtncmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\radiocmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\rearrangectrl.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\rendcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\rgncmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\scrolbarcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\settcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\sizer.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\slidercmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\spinbtncmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\spinctrlcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\srchcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\statbar.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statbmpcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statboxcmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\statlinecmn.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\stattextcmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\stockitem.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\tbarbase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\textcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\textentrycmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\toplvcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\treebase.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\uiactioncmn.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\utilscmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\valgen.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\validate.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\valnum.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\valtext.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\wincmn.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\windowid.cpp">
+    <Filter>Common Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\common\wrapsizer.cpp">
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\common\xpmdecod.cpp">
-      <Filter>Common Sources</Filter>
+    <Filter>Common Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\accel.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\access.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\activex.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\anybutton.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\app.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\artmsw.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\automtn.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\bitmap.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\bmpbuttn.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\brush.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\button.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\caret.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\checkbox.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\checklst.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\choice.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\clipbrd.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\colordlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\colour.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\combo.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\combobox.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\control.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\cursor.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\data.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\dataobj.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dc.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dcclient.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dcmemory.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dcprint.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dcscreen.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dialog.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dialup.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dib.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dirdlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\display.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\dragimag.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\dropsrc.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\droptgt.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\enhmeta.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\evtloop.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\fdrepdlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\filedlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\font.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\fontdlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\fontenum.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\fontutil.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\frame.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gauge.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\gdiimage.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\gdiobj.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\gdiplus.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\graphics.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\headerctrl.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\helpchm.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\helpwin.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\icon.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\imaglist.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\iniconf.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\listbox.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\listctrl.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\main.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\mdi.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\menu.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\menuitem.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\metafile.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\minifram.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\msgdlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\mslu.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\nativdlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\nativewin.cpp">
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\nonownedwnd.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\notebook.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\oleutils.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ownerdrw.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\palette.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\panel.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\pen.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\popupwin.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\printdlg.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\printwin.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\progdlg.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\radiobox.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\radiobut.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\region.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\renderer.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\richmsgdlg.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\scrolbar.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\settings.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\slider.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\spinbutt.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\spinctrl.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\statbmp.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\statbox.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\statline.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\stattext.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\statusbar.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\textctrl.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\textentry.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\tglbtn.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\toolbar.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\tooltip.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\toplevel.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\treectrl.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\uiaction.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\utilsgui.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\msw\utilswin.cpp">
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\ole\uuid.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\uxtheme.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\volume.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\msw\window.cpp">
-      <Filter>MSW Sources</Filter>
+    <Filter>MSW Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\accel.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\busyinfo.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\buttonbar.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\choicbkg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\choicdgg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\clrpickerg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\collpaneg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\colrdlgg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\combog.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\dcpsg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\dirctrlg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\dirdlgg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\dragimgg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\fdrepdlg.cpp">
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\filectrlg.cpp">
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\filedlgg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\filepickerg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\fontdlgg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\fontpickerg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\graphicc.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\headerctrlg.cpp">
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\infobar.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\listbkg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\listctrl.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\logg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\markuptext.cpp">
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\mdig.cpp">
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\msgdlgg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\numdlgg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\printps.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\prntdlgg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\progdlgg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\renderg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\richmsgdlgg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\scrlwing.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\selstore.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\spinctlg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\splitter.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\srchctlg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\statbmpg.cpp">
+    <Filter>Generic Sources</Filter>
+    </ClCompile>
+    <ClCompile Include="src\generic\stattextg.cpp">
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\statusbr.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\textdlgg.cpp">
-      <Filter>Generic Sources</Filter>
+    <Filter>Generic Sources</Filter>
     </ClCompile>
     <ClCompile Include="src\generic\tipwin.cpp">
       <Filter>Generic Sources</Filter>
@@ -678,125 +888,32 @@
     <ClCompile Include="src\generic\vscroll.cpp">
       <Filter>Generic Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\evtloopcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\timercmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\timer.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\panelcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\panel.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\nonownedwnd.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\anybutton.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\btncmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\stattextcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\statboxcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\textentrycmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\textentry.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\windowid.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\textmeasurecmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\textmeasure.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\slider.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\markupparser.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\generic\markuptext.cpp">
-      <Filter>Generic Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\modalhook.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\evtloopconsole.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\affinematrix2d.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\fontdata.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\ownerdrwcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\statusbar.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\toolbar.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\timerimpl.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\arttango.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\object.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\artmsw.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\checklstcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
     <ClCompile Include="src\msw\ole\safearray.cpp">
       <Filter>MSW Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\accelcmn.cpp">
+    <ClCompile Include="src\common\textmeasurecmn.cpp" />
+    <ClCompile Include="src\msw\textmeasure.cpp" />
+    <ClCompile Include="src\xrc\xmlreshandler.cpp" />
+    <ClCompile Include="src\common\preferencescmn.cpp">
       <Filter>Common Sources</Filter>
     </ClCompile>
-    <ClCompile Include="src\common\spinctrlcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\statlinecmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\statbmpcmn.cpp">
-      <Filter>Common Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\msw\utilswin.cpp">
-      <Filter>MSW Sources</Filter>
-    </ClCompile>
-    <ClCompile Include="src\common\checkboxcmn.cpp">
-      <Filter>Common Sources</Filter>
+    <ClCompile Include="src\generic\preferencesg.cpp">
+      <Filter>Generic Sources</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\wx\msw\accel.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\ole\access.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\ole\activex.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\anybutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\app.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -809,12 +926,18 @@
     <ClInclude Include="include\wx\msw\bmpbuttn.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\bmpcbox.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\brush.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\msw\button.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\calctrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\caret.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -842,6 +965,9 @@
     <ClInclude Include="include\wx\msw\combobox.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\commandlinkbutton.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\control.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -851,6 +977,9 @@
     <ClInclude Include="include\wx\msw\cursor.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\custombgwin.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\ole\dataform.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -860,6 +989,12 @@
     <ClInclude Include="include\wx\msw\ole\dataobj2.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\datectrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\datetimectrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\dc.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -920,9 +1055,15 @@
     <ClInclude Include="include\wx\msw\gdiimage.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\glcanvas.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\headerctrl.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\helpbest.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\helpchm.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -932,15 +1073,24 @@
     <ClInclude Include="include\wx\msw\htmlhelp.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\hyperlink.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\icon.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\msw\imaglist.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\iniconf.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\init.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\joystick.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\listbox.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -956,6 +1106,9 @@
     <ClInclude Include="include\wx\msw\menuitem.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\metafile.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\minifram.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -974,6 +1127,9 @@
     <ClInclude Include="include\wx\msw\notebook.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\notifmsg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\ole\oleutils.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1007,15 +1163,24 @@
     <ClInclude Include="include\wx\msw\radiobut.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\rcdefs.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\region.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\richmsgdlg.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\scrolbar.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\msw\slider.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\sound.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\spinbutt.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1037,6 +1202,9 @@
     <ClInclude Include="include\wx\msw\statusbar.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\taskbar.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\textctrl.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1046,6 +1214,9 @@
     <ClInclude Include="include\wx\msw\tglbtn.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\timectrl.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\toolbar.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
@@ -1067,12 +1238,36 @@
     <ClInclude Include="include\wx\msw\uxthemep.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\msw\webview_ie.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msw\webviewhistoryitem_ie.h">
+      <Filter>MSW Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\msw\window.h">
       <Filter>MSW Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\aboutdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\accel.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\animate.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\bmpcbox.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\busyinfo.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\buttonbar.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\calctrlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\choicdgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
@@ -1082,57 +1277,138 @@
     <ClInclude Include="include\wx\generic\collpaneg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\colrdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\combo.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\generic\ctrlsub.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\custombgwin.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\dataview.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\datectrl.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\dcpsg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\dirctrlg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\dirdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\dragimgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\dvrenderer.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\dvrenderers.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\fdrepdlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\filectrlg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\filedlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\filepickerg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\fontdlgg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\fontpickerg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\grid.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\gridctrl.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\grideditors.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\gridsel.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\headerctrlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\helpext.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\hyperlink.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\infobar.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\laywin.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\listctrl.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\logg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\mdig.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\msgdlgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\generic\notebook.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\notifmsg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\numdlgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\panelg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\generic\printps.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\prntdlgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\generic\progdlgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\propdlg.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\richmsgdlgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\sashwin.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\scrolwin.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\generic\spinctlg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\splash.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\splitter.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
@@ -1151,30 +1427,132 @@
     <ClInclude Include="include\wx\generic\textdlgg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\timectrl.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\generic\treectlg.h">
       <Filter>Generic Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\generic\wizard.h">
+      <Filter>Generic Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\helpctrl.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\helpdata.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\helpdlg.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\helpfrm.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\helpwnd.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmlcell.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmldefs.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmlfilt.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmlpars.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmlproc.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmltag.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmlwin.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\htmprint.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\m_templ.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\styleparams.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\html\winpars.h">
+      <Filter>wxHTML Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\aboutdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\accel.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\access.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\advprops.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\affinematrix2d.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\affinematrix2dbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\anidecod.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\animate.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\animdecod.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\anybutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\art.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\art_internal.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\artprov.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\aui\aui.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\aui\auibar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\aui\auibook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\bannerwindow.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\bar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\bitmap.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\bmpbuttn.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\bmpcbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\bookctrl.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\persist\bookctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\brush.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1184,6 +1562,12 @@
     <ClInclude Include="include\wx\button.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\ribbon\buttonbar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\calctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\caret.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1223,15 +1607,27 @@
     <ClInclude Include="include\wx\colour.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\colourdata.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\combo.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\combobox.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\commandlinkbutton.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\compositewin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\control.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\ribbon\control.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\cshelp.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1241,9 +1637,24 @@
     <ClInclude Include="include\wx\cursor.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\custombgwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\dataobj.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\dataview.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\datectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dateevt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\datetimectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\dc.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1265,15 +1676,27 @@
     <ClInclude Include="include\wx\dcprint.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\dcps.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\dcscreen.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\dcsvg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\debugrpt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\dialog.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\dialup.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\dirctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\dirdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1286,33 +1709,63 @@
     <ClInclude Include="include\wx\dnd.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\aui\dockart.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\docmdi.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\docview.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\dragimag.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\dvrenderers.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\editlbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\editors.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\effects.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\encinfo.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\evtloopsrc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\fdrepdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\filectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\filedlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\filehistory.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\filepicker.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\aui\floatpane.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\fmappriv.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
     <ClInclude Include="include\wx\font.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\fontdata.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\fontdlg.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1328,6 +1781,12 @@
     <ClInclude Include="include\wx\frame.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\aui\framemanager.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\gallery.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\gauge.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1346,9 +1805,18 @@
     <ClInclude Include="include\wx\gifdecod.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\glcanvas.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\graphics.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\grid.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\headercol.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\headerctrl.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1358,6 +1826,18 @@
     <ClInclude Include="include\wx\helpbase.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\helphtml.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\helpwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\htmllbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\hyperlink.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
     <ClInclude Include="include\wx\icon.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
@@ -1385,6 +1865,662 @@
     <ClInclude Include="include\wx\imagpcx.h">
       <Filter>Common Headers</Filter>
     </ClInclude>
+    <ClInclude Include="include\wx\imagpng.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagpnm.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagtga.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagtiff.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\imagxpm.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\infobar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\itemid.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\joystick.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\layout.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\laywin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\listbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\listbook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\listbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\listctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\manager.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\matrix.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\mdi.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\mediactrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\menu.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\menuitem.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\metafile.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\minifram.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\modalhook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\mousemanager.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\msgdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\nativewin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\nonownedwnd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\notebook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\notifmsg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\numdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\odcombo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\overlay.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ownerdrw.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\page.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\palette.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\panel.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\panel.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\paper.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\pen.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\persist.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\pickerbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\popupwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\position.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\print.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\printdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\prntbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\progdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\property.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\propgrid.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\propgriddefs.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\propgridiface.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\propgridpagestate.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\propgrid\props.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\quantize.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\radiobox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\radiobut.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\range.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\rawbmp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\rearrangectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\region.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\renderer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richmsgdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextbackgroundpage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextborderspage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextbuffer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextbulletspage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextdialogpage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextfontpage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextformatdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtexthtml.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextimagedlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextindentspage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextliststylepage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextmarginspage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextprint.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextsizepage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextstyledlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextstylepage.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextstyles.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextsymboldlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextuicustomization.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtext\richtextxml.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\richtooltip.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\sashwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\scopeguard.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\scrolbar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\scrolwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\selstore.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\settings.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\simplebook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\sizer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\slider.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\sound.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\spinbutt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\spinctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\splash.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\persist\splitter.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\splitter.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\srchctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\statbmp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\statbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\statline.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stattext.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\statusbr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\stc\stc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\aui\tabart.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\aui\tabmdi.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\taskbar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tbarbase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textcompleter.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textentry.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\textwrapper.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tglbtn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\timectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tipdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tipwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\ribbon\toolbar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\toolbar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\toolbook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\tooltip.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\persist\toplevel.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\toplevel.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\treebase.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\persist\treebook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\treebook.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\treectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\treelist.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\uiaction.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\valgen.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\validate.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\valnum.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\valtext.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\vidmode.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\vlbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\vms_x_fix.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\vscroll.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\webview.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\webviewarchivehandler.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\persist\window.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\window.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\windowid.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\withimages.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wizard.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wrapsizer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wupdlock.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\wxhtml.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_all.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_animatctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_bannerwindow.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_bmp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_bmpbt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_bmpcbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_bttn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_cald.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_chckb.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_chckl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_choic.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_choicbk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_clrpicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_cmdlinkbn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_collpane.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_combo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_comboctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_datectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_dirpicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_dlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_editlbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_filectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_filepicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_fontpicker.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_frame.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_gauge.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_gdctl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_grid.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_html.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_htmllbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_hyperlink.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_listb.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_listbk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_listc.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_mdi.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_menu.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_notbk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_odcombo.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_panel.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_propdlg.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_radbt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_radbx.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_scrol.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_scwin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_sizer.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_slidr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_spin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_split.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_srchctrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_statbar.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_stbmp.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_stbox.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_stlin.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_sttxt.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_text.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_tglbtn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_timectrl.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_toolb.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_toolbk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_tree.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_treebk.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_unkwn.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xh_wizrd.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xrc\xmlres.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xpmdecod.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\xpmhand.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+    <ClInclude Include="include\wx\windowptr.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="src\msw\version.rc">
+      <Filter>MSW Sources</Filter>
+    </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="include\wx\msw\setup.h">