Replace wxTreeItemAttr and wxListItemAttr with wxItemAttr

The two existing structs were completely identical, just replace them with a
single wxItemAttr.

Notice that wxDataViewItemAttr is not quite the same, although pretty similar,
so it remains separate for now. It would be nice to combine it with this one
too in the future, e.g. to make it simpler to make items bold in a wxListCtrl.
This commit is contained in:
Vadim Zeitlin
2016-04-16 17:44:19 +02:00
parent c592363e95
commit 246ae58c19
24 changed files with 232 additions and 221 deletions

View File

@@ -1181,6 +1181,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/systhemectrl.h
wx/collheaderctrl.h
wx/generic/collheaderctrl.h
wx/itemattr.h
</set>
<!-- ====================================================================== -->

View File

@@ -1039,6 +1039,7 @@ GUI_CMN_HDR =
wx/imagtga.h
wx/imagtiff.h
wx/imagxpm.h
wx/itemattr.h
wx/listbase.h
wx/listbook.h
wx/listctrl.h

View File

@@ -1379,6 +1379,7 @@
<ClInclude Include="..\..\include\wx\collheaderctrl.h" />
<ClInclude Include="..\..\include\wx\generic\collheaderctrl.h" />
<ClInclude Include="..\..\include\wx\msw\rt\utils.h" />
<ClInclude Include="..\..\include\wx\itemattr.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

View File

@@ -690,6 +690,9 @@
<ClCompile Include="..\..\src\msw\graphics.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\graphicsd2d.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\headerctrl.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
@@ -897,9 +900,6 @@
<ClCompile Include="..\..\src\xrc\xmlreshandler.cpp">
<Filter>Common Sources</Filter>
</ClCompile>
<ClCompile Include="..\..\src\msw\graphicsd2d.cpp">
<Filter>MSW Sources</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\src\msw\version.rc">
@@ -928,6 +928,9 @@
<ClInclude Include="..\..\include\wx\anybutton.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\appprogress.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\artprov.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1312,6 +1315,9 @@
<ClInclude Include="..\..\include\wx\infobar.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\itemattr.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\itemid.h">
<Filter>Common Headers</Filter>
</ClInclude>
@@ -1672,9 +1678,6 @@
<ClInclude Include="..\..\include\wx\msw\window.h">
<Filter>MSW Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\appprogress.h">
<Filter>Common Headers</Filter>
</ClInclude>
<ClInclude Include="..\..\include\wx\nativewin.h">
<Filter>Common Headers</Filter>
</ClInclude>

View File

@@ -2285,6 +2285,9 @@
<File
RelativePath="..\..\include\wx\infobar.h">
</File>
<File
RelativePath="..\..\include\wx\itemattr.h">
</File>
<File
RelativePath="..\..\include\wx\itemid.h">
</File>

View File

@@ -3548,6 +3548,10 @@
RelativePath="..\..\include\wx\infobar.h"
>
</File>
<File
RelativePath="..\..\include\wx\itemattr.h"
>
</File>
<File
RelativePath="..\..\include\wx\itemid.h"
>

View File

@@ -3544,6 +3544,10 @@
RelativePath="..\..\include\wx\infobar.h"
>
</File>
<File
RelativePath="..\..\include\wx\itemattr.h"
>
</File>
<File
RelativePath="..\..\include\wx\itemid.h"
>