Merge native MSW appearance for AUI toolbars

Closes https://github.com/wxWidgets/wxWidgets/pull/200
2016-02-13 12:31:49 +01:00
parent 86b1181233 49b82e72f2
commit bfbdd37a1a
19 changed files with 758 additions and 39 deletions
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3356,9 +3356,11 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="AUI_MSW_SRC" hints="files">
    src/aui/tabartmsw.cpp
+    src/aui/barartmsw.cpp
 </set>
 <set var="AUI_MSW_HDR" hints="files">
    wx/aui/tabartmsw.h
+    wx/aui/barartmsw.h
 </set>
 <set var="AUI_PLATFORM_SRC" hints="files">
    <if cond="TOOLKIT=='MSW'">$(AUI_MSW_SRC)</if>
--- a/build/files
+++ b/build/files
@@ -2805,8 +2805,10 @@ AUI_CMN_HDR =

 AUI_MSW_HDR =
    wx/aui/tabartmsw.h
+    wx/aui/barartmsw.h
 AUI_MSW_SRC =
    src/aui/tabartmsw.cpp
+    src/aui/barartmsw.cpp

 # wxRibbon

--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1355,7 +1355,8 @@ AUIDLL_OBJECTS =  \
 	$(OBJS)\auidll_tabart.obj \
 	$(OBJS)\auidll_xh_auinotbk.obj \
 	$(OBJS)\auidll_xh_auitoolb.obj \
-	$(OBJS)\auidll_tabartmsw.obj
+	$(OBJS)\auidll_tabartmsw.obj \
+	$(OBJS)\auidll_barartmsw.obj
 AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1375,7 +1376,8 @@ AUILIB_OBJECTS =  \
 	$(OBJS)\auilib_tabart.obj \
 	$(OBJS)\auilib_xh_auinotbk.obj \
 	$(OBJS)\auilib_xh_auitoolb.obj \
-	$(OBJS)\auilib_tabartmsw.obj
+	$(OBJS)\auilib_tabartmsw.obj \
+	$(OBJS)\auilib_barartmsw.obj
 RIBBONDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1737,6 +1739,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_auinotbk.obj \
 	$(OBJS)\monodll_xh_auitoolb.obj \
 	$(OBJS)\monodll_tabartmsw.obj \
+	$(OBJS)\monodll_barartmsw.obj \
 	$(OBJS)\monodll_advprops.obj \
 	$(OBJS)\monodll_editors.obj \
 	$(OBJS)\monodll_manager.obj \
@@ -2559,6 +2562,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_auinotbk.obj \
 	$(OBJS)\monolib_xh_auitoolb.obj \
 	$(OBJS)\monolib_tabartmsw.obj \
+	$(OBJS)\monolib_barartmsw.obj \
 	$(OBJS)\monolib_advprops.obj \
 	$(OBJS)\monolib_editors.obj \
 	$(OBJS)\monolib_manager.obj \
@@ -7396,6 +7400,9 @@ $(OBJS)\monodll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\monodll_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\monodll_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp

@@ -9906,6 +9913,9 @@ $(OBJS)\monolib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\monolib_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\monolib_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp

@@ -16095,6 +16105,9 @@ $(OBJS)\auidll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\auidll_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\auidll_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp

@@ -16128,6 +16141,9 @@ $(OBJS)\auilib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\auilib_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\auilib_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1361,7 +1361,8 @@ AUIDLL_OBJECTS =  \
 	$(OBJS)\auidll_tabart.o \
 	$(OBJS)\auidll_xh_auinotbk.o \
 	$(OBJS)\auidll_xh_auitoolb.o \
-	$(OBJS)\auidll_tabartmsw.o
+	$(OBJS)\auidll_tabartmsw.o \
+	$(OBJS)\auidll_barartmsw.o
 AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1381,7 +1382,8 @@ AUILIB_OBJECTS =  \
 	$(OBJS)\auilib_tabart.o \
 	$(OBJS)\auilib_xh_auinotbk.o \
 	$(OBJS)\auilib_xh_auitoolb.o \
-	$(OBJS)\auilib_tabartmsw.o
+	$(OBJS)\auilib_tabartmsw.o \
+	$(OBJS)\auilib_barartmsw.o
 RIBBONDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1755,6 +1757,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_auinotbk.o \
 	$(OBJS)\monodll_xh_auitoolb.o \
 	$(OBJS)\monodll_tabartmsw.o \
+	$(OBJS)\monodll_barartmsw.o \
 	$(OBJS)\monodll_advprops.o \
 	$(OBJS)\monodll_editors.o \
 	$(OBJS)\monodll_manager.o \
@@ -2583,6 +2586,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_auinotbk.o \
 	$(OBJS)\monolib_xh_auitoolb.o \
 	$(OBJS)\monolib_tabartmsw.o \
+	$(OBJS)\monolib_barartmsw.o \
 	$(OBJS)\monolib_advprops.o \
 	$(OBJS)\monolib_editors.o \
 	$(OBJS)\monolib_manager.o \
@@ -7571,6 +7575,9 @@ $(OBJS)\monodll_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
 $(OBJS)\monodll_tabartmsw.o: ../../src/aui/tabartmsw.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monodll_barartmsw.o: ../../src/aui/barartmsw.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_advprops.o: ../../src/propgrid/advprops.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<

@@ -10081,6 +10088,9 @@ $(OBJS)\monolib_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
 $(OBJS)\monolib_tabartmsw.o: ../../src/aui/tabartmsw.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\monolib_barartmsw.o: ../../src/aui/barartmsw.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_advprops.o: ../../src/propgrid/advprops.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<

@@ -16270,6 +16280,9 @@ $(OBJS)\auidll_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
 $(OBJS)\auidll_tabartmsw.o: ../../src/aui/tabartmsw.cpp
 	$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\auidll_barartmsw.o: ../../src/aui/barartmsw.cpp
+	$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<

@@ -16303,6 +16316,9 @@ $(OBJS)\auilib_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
 $(OBJS)\auilib_tabartmsw.o: ../../src/aui/tabartmsw.cpp
 	$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<

+$(OBJS)\auilib_barartmsw.o: ../../src/aui/barartmsw.cpp
+	$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp
 	$(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $<

--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1499,7 +1499,8 @@ AUIDLL_OBJECTS =  \
 	$(OBJS)\auidll_tabart.obj \
 	$(OBJS)\auidll_xh_auinotbk.obj \
 	$(OBJS)\auidll_xh_auitoolb.obj \
-	$(OBJS)\auidll_tabartmsw.obj
+	$(OBJS)\auidll_tabartmsw.obj \
+	$(OBJS)\auidll_barartmsw.obj
 AUIDLL_RESOURCES =  \
 	$(OBJS)\auidll_version.res
 AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1525,7 +1526,8 @@ AUILIB_OBJECTS =  \
 	$(OBJS)\auilib_tabart.obj \
 	$(OBJS)\auilib_xh_auinotbk.obj \
 	$(OBJS)\auilib_xh_auitoolb.obj \
-	$(OBJS)\auilib_tabartmsw.obj
+	$(OBJS)\auilib_tabartmsw.obj \
+	$(OBJS)\auilib_barartmsw.obj
 RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__DEBUGINFO) \
 	/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG).pdb \
@@ -2037,6 +2039,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_xh_auinotbk.obj \
 	$(OBJS)\monodll_xh_auitoolb.obj \
 	$(OBJS)\monodll_tabartmsw.obj \
+	$(OBJS)\monodll_barartmsw.obj \
 	$(OBJS)\monodll_advprops.obj \
 	$(OBJS)\monodll_editors.obj \
 	$(OBJS)\monodll_manager.obj \
@@ -2865,6 +2868,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_xh_auinotbk.obj \
 	$(OBJS)\monolib_xh_auitoolb.obj \
 	$(OBJS)\monolib_tabartmsw.obj \
+	$(OBJS)\monolib_barartmsw.obj \
 	$(OBJS)\monolib_advprops.obj \
 	$(OBJS)\monolib_editors.obj \
 	$(OBJS)\monolib_manager.obj \
@@ -8088,6 +8092,9 @@ $(OBJS)\monodll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\monodll_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\monodll_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp

@@ -10598,6 +10605,9 @@ $(OBJS)\monolib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\monolib_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\monolib_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp

@@ -16787,6 +16797,9 @@ $(OBJS)\auidll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\auidll_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\auidll_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

@@ -16820,6 +16833,9 @@ $(OBJS)\auilib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
 $(OBJS)\auilib_tabartmsw.obj: ..\..\src\aui\tabartmsw.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabartmsw.cpp

+$(OBJS)\auilib_barartmsw.obj: ..\..\src\aui\barartmsw.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\barartmsw.cpp
+
 $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

--- a/build/msw/wx_aui.vcxproj
+++ b/build/msw/wx_aui.vcxproj
@@ -466,6 +466,7 @@
    <ClCompile Include="..\..\src\xrc\xh_auinotbk.cpp" />
    <ClCompile Include="..\..\src\xrc\xh_auitoolb.cpp" />
    <ClCompile Include="..\..\src\aui\tabartmsw.cpp" />
+    <ClCompile Include="..\..\src\aui\barartmsw.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="..\..\src\msw\version.rc">
@@ -507,6 +508,7 @@
    <ClInclude Include="..\..\include\wx\xrc\xh_auinotbk.h" />
    <ClInclude Include="..\..\include\wx\xrc\xh_auitoolb.h" />
    <ClInclude Include="..\..\include\wx\aui\tabartmsw.h" />
+    <ClInclude Include="..\..\include\wx\aui\barartmsw.h" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
--- a/build/msw/wx_aui.vcxproj.filters
+++ b/build/msw/wx_aui.vcxproj.filters
@@ -31,6 +31,9 @@
    <ClCompile Include="..\..\src\aui\auibook.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\src\aui\barartmsw.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
    <ClCompile Include="..\..\src\aui\dockart.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -71,6 +74,9 @@
    <ClInclude Include="..\..\include\wx\aui\auibook.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\include\wx\aui\barartmsw.h">
+      <Filter>Common Headers</Filter>
+    </ClInclude>
    <ClInclude Include="..\..\include\wx\aui\dockart.h">
      <Filter>Common Headers</Filter>
    </ClInclude>
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.vcproj
@@ -422,6 +422,9 @@
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\barartmsw.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\dockart.h">
 			</File>
@@ -457,6 +460,9 @@
 			<File
 				RelativePath="..\..\src\aui\auibook.cpp">
 			</File>
+			<File
+				RelativePath="..\..\src\aui\barartmsw.cpp">
+			</File>
 			<File
 				RelativePath="..\..\src\aui\dockart.cpp">
 			</File>
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -1931,6 +1931,9 @@
 			<File
 				RelativePath="..\..\include\wx\ribbon\bar.h">
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\barartmsw.h">
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bitmap.h">
 			</File>
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -1065,6 +1065,10 @@
 				RelativePath="..\..\include\wx\aui\auibook.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\barartmsw.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\dockart.h"
 				>
@@ -1111,6 +1115,10 @@
 				RelativePath="..\..\src\aui\auibook.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\aui\barartmsw.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\aui\dockart.cpp"
 				>
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -3076,6 +3076,10 @@
 				RelativePath="..\..\include\wx\ribbon\bar.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\barartmsw.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bitmap.h"
 				>
--- a/build/msw/wx_vc9_aui.vcproj
+++ b/build/msw/wx_vc9_aui.vcproj
@@ -1061,6 +1061,10 @@
 				RelativePath="..\..\include\wx\aui\auibook.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\barartmsw.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\aui\dockart.h"
 				>
@@ -1107,6 +1111,10 @@
 				RelativePath="..\..\src\aui\auibook.cpp"
 				>
 			</File>
+			<File
+				RelativePath="..\..\src\aui\barartmsw.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\aui\dockart.cpp"
 				>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -3072,6 +3072,10 @@
 				RelativePath="..\..\include\wx\ribbon\bar.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\include\wx\aui\barartmsw.h"
+				>
+			</File>
 			<File
 				RelativePath="..\..\include\wx\bitmap.h"
 				>