Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add missing XRC handlers to the manual VC{11,12} projects.

Browse Source 
XRC handler in aui, ribbon and richtext libraries were omitted in the initial
versions of the projects for some reason.

See #15780.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-03-02 23:40:32 +00:00
parent e702fd5043
commit dcdbd3c01c
12 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/msw/wx_vc11_aui.vcxproj
View File

@@ -494,6 +494,7 @@
<ClCompile Include="..\..\src\aui\framemanager.cpp" />
<ClCompile Include="..\..\src\aui\tabart.cpp" />
<ClCompile Include="..\..\src\aui\tabmdi.cpp" />
<ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp" />
<ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp" />
</ItemGroup>
<ItemGroup>
@@ -505,7 +506,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
<CustomBuild Include="..\..\include\wx\msw\setup.h">
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
@@ -574,6 +574,8 @@
<ClInclude Include="..\..\include\wx\aui\framemanager.h" />
<ClInclude Include="..\..\include\wx\aui\tabart.h" />
<ClInclude Include="..\..\include\wx\aui\tabmdi.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_vc11_aui.vcxproj.filters
View File

@@ -46,6 +46,9 @@
<ClCompile Include="..\..\src\aui\tabmdi.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -80,6 +83,9 @@
<ClInclude Include="..\..\include\wx\aui\tabmdi.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h">
<Filter>Common Headers</Filter>
</ClInclude>

2
build/msw/wx_vc11_ribbon.vcxproj
View File

@@ -497,6 +497,7 @@
<ClCompile Include="..\..\src\ribbon\page.cpp" />
<ClCompile Include="..\..\src\ribbon\panel.cpp" />
<ClCompile Include="..\..\src\ribbon\toolbar.cpp" />
<ClCompile Include="..\..\src\xrc\xh_ribbon.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -576,6 +577,7 @@
<ClInclude Include="..\..\include\wx\ribbon\page.h" />
<ClInclude Include="..\..\include\wx\ribbon\panel.h" />
<ClInclude Include="..\..\include\wx\ribbon\toolbar.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_vc11_ribbon.vcxproj.filters
View File

@@ -55,6 +55,9 @@
<ClCompile Include="..\..\src\ribbon\toolbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_ribbon.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -89,6 +92,9 @@
<ClInclude Include="..\..\include\wx\ribbon\toolbar.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h">
<Filter>Common Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\include\wx\msw\setup.h">

2
build/msw/wx_vc11_richtext.vcxproj
View File

@@ -497,6 +497,7 @@
<ClCompile Include="..\..\src\richtext\richtextstyles.cpp" />
<ClCompile Include="..\..\src\richtext\richtextsymboldlg.cpp" />
<ClCompile Include="..\..\src\richtext\richtextxml.cpp" />
<ClCompile Include="..\..\src\xrc\xh_richtext.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -588,6 +589,7 @@
<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\xrc\xh_richtext.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_vc11_richtext.vcxproj.filters
View File

@@ -55,6 +55,9 @@
<ClCompile Include="..\..\src\richtext\richtextxml.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_richtext.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -125,6 +128,9 @@
<ClInclude Include="..\..\include\wx\richtext\richtextxml.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_richtext.h">
<Filter>Common Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\include\wx\msw\setup.h">

4
build/msw/wx_vc12_aui.vcxproj
View File

@@ -494,6 +494,7 @@
<ClCompile Include="..\..\src\aui\framemanager.cpp" />
<ClCompile Include="..\..\src\aui\tabart.cpp" />
<ClCompile Include="..\..\src\aui\tabmdi.cpp" />
<ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp" />
<ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp" />
</ItemGroup>
<ItemGroup>
@@ -505,7 +506,6 @@
</ResourceCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
<CustomBuild Include="..\..\include\wx\msw\setup.h">
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
<Message Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'">Creating $(OutDir)$(wxIncSubDir)\wx\setup.h</Message>
@@ -574,6 +574,8 @@
<ClInclude Include="..\..\include\wx\aui\framemanager.h" />
<ClInclude Include="..\..\include\wx\aui\tabart.h" />
<ClInclude Include="..\..\include\wx\aui\tabmdi.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_vc12_aui.vcxproj.filters
View File

@@ -46,6 +46,9 @@
<ClCompile Include="..\..\src\aui\tabmdi.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -80,6 +83,9 @@
<ClInclude Include="..\..\include\wx\aui\tabmdi.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h">
<Filter>Common Headers</Filter>
</ClInclude>

2
build/msw/wx_vc12_ribbon.vcxproj
View File

@@ -497,6 +497,7 @@
<ClCompile Include="..\..\src\ribbon\page.cpp" />
<ClCompile Include="..\..\src\ribbon\panel.cpp" />
<ClCompile Include="..\..\src\ribbon\toolbar.cpp" />
<ClCompile Include="..\..\src\xrc\xh_ribbon.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -576,6 +577,7 @@
<ClInclude Include="..\..\include\wx\ribbon\page.h" />
<ClInclude Include="..\..\include\wx\ribbon\panel.h" />
<ClInclude Include="..\..\include\wx\ribbon\toolbar.h" />
<ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_vc12_ribbon.vcxproj.filters
View File

@@ -55,6 +55,9 @@
<ClCompile Include="..\..\src\ribbon\toolbar.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_ribbon.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -89,6 +92,9 @@
<ClInclude Include="..\..\include\wx\ribbon\toolbar.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_ribbon.h">
<Filter>Common Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\include\wx\msw\setup.h">

2
build/msw/wx_vc12_richtext.vcxproj
View File

@@ -497,6 +497,7 @@
<ClCompile Include="..\..\src\richtext\richtextstyles.cpp" />
<ClCompile Include="..\..\src\richtext\richtextsymboldlg.cpp" />
<ClCompile Include="..\..\src\richtext\richtextxml.cpp" />
<ClCompile Include="..\..\src\xrc\xh_richtext.cpp" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -588,6 +589,7 @@
<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\xrc\xh_richtext.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

6
build/msw/wx_vc12_richtext.vcxproj.filters
View File

@@ -55,6 +55,9 @@
<ClCompile Include="..\..\src\richtext\richtextxml.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\src\xrc\xh_richtext.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -125,6 +128,9 @@
<ClInclude Include="..\..\include\wx\richtext\richtextxml.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\xrc\xh_richtext.h">
<Filter>Common Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="..\..\include\wx\msw\setup.h">