diff --git a/Makefile.in b/Makefile.in
index db86f1645e..5a076bb7b4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1621,6 +1621,7 @@ AUIDLL_OBJECTS =  \
 	auidll_dockart.o \
 	auidll_floatpane.o \
 	auidll_auibook.o \
+	auidll_auibar.o \
 	auidll_tabmdi.o
 AUIDLL_ODEP =  $(___pch_wxprec_auidll_wx_wxprec_h_gch___depname)
 AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
@@ -1633,6 +1634,7 @@ AUILIB_OBJECTS =  \
 	auilib_dockart.o \
 	auilib_floatpane.o \
 	auilib_auibook.o \
+	auilib_auibar.o \
 	auilib_tabmdi.o
 AUILIB_ODEP =  $(___pch_wxprec_auilib_wx_wxprec_h_gch___depname)
 RICHTEXTDLL_CXXFLAGS = $(__richtextdll_PCH_INC) -D__WX$(TOOLKIT)__ \
@@ -3452,6 +3454,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS =  \
 	wx/aui/dockart.h \
 	wx/aui/floatpane.h \
 	wx/aui/auibook.h \
+	wx/aui/auibar.h \
 	wx/aui/tabmdi.h \
 	wx/aui/aui.h \
 	wx/richtext/richtextctrl.h \
@@ -3806,6 +3809,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS =  \
 	monodll_dockart.o \
 	monodll_floatpane.o \
 	monodll_auibook.o \
+	monodll_auibar.o \
 	monodll_tabmdi.o \
 	monodll_richtextctrl.o \
 	monodll_richtextbuffer.o \
@@ -5706,6 +5710,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 =  \
 	monolib_dockart.o \
 	monolib_floatpane.o \
 	monolib_auibook.o \
+	monolib_auibar.o \
 	monolib_tabmdi.o \
 	monolib_richtextctrl.o \
 	monolib_richtextbuffer.o \
@@ -14353,6 +14358,9 @@ monodll_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONODLL_ODEP)
 monodll_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
 
+monodll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONODLL_ODEP)
+	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+
 monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
 
@@ -18844,6 +18852,9 @@ monolib_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(MONOLIB_ODEP)
 monolib_auibook.o: $(srcdir)/src/aui/auibook.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
 
+monolib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONOLIB_ODEP)
+	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+
 monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
 
@@ -31516,6 +31527,9 @@ auidll_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(AUIDLL_ODEP)
 auidll_auibook.o: $(srcdir)/src/aui/auibook.cpp $(AUIDLL_ODEP)
 	$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
 
+auidll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUIDLL_ODEP)
+	$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+
 auidll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUIDLL_ODEP)
 	$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
 
@@ -31531,6 +31545,9 @@ auilib_floatpane.o: $(srcdir)/src/aui/floatpane.cpp $(AUILIB_ODEP)
 auilib_auibook.o: $(srcdir)/src/aui/auibook.cpp $(AUILIB_ODEP)
 	$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/auibook.cpp
 
+auilib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUILIB_ODEP)
+	$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/auibar.cpp
+
 auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
 	$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 89c037a8a0..f35d5d6897 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3325,6 +3325,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/aui/dockart.cpp
     src/aui/floatpane.cpp
     src/aui/auibook.cpp
+    src/aui/auibar.cpp
     src/aui/tabmdi.cpp
 </set>
 <set var="AUI_HDR" hints="files">
@@ -3332,6 +3333,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/aui/dockart.h
     wx/aui/floatpane.h
     wx/aui/auibook.h
+    wx/aui/auibar.h
     wx/aui/tabmdi.h
     wx/aui/aui.h
 </set>
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index a6220fd837..4c9e5afd6d 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1205,6 +1205,7 @@ AUIDLL_OBJECTS =  \
 	$(OBJS)\auidll_dockart.obj \
 	$(OBJS)\auidll_floatpane.obj \
 	$(OBJS)\auidll_auibook.obj \
+	$(OBJS)\auidll_auibar.obj \
 	$(OBJS)\auidll_tabmdi.obj
 AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -1220,6 +1221,7 @@ AUILIB_OBJECTS =  \
 	$(OBJS)\auilib_dockart.obj \
 	$(OBJS)\auilib_floatpane.obj \
 	$(OBJS)\auilib_auibook.obj \
+	$(OBJS)\auilib_auibar.obj \
 	$(OBJS)\auilib_tabmdi.obj
 RICHTEXTDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -1465,6 +1467,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dockart.obj \
 	$(OBJS)\monodll_floatpane.obj \
 	$(OBJS)\monodll_auibook.obj \
+	$(OBJS)\monodll_auibar.obj \
 	$(OBJS)\monodll_tabmdi.obj \
 	$(OBJS)\monodll_richtextctrl.obj \
 	$(OBJS)\monodll_richtextbuffer.obj \
@@ -2121,6 +2124,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dockart.obj \
 	$(OBJS)\monolib_floatpane.obj \
 	$(OBJS)\monolib_auibook.obj \
+	$(OBJS)\monolib_auibar.obj \
 	$(OBJS)\monolib_tabmdi.obj \
 	$(OBJS)\monolib_richtextctrl.obj \
 	$(OBJS)\monolib_richtextbuffer.obj \
@@ -5999,6 +6003,9 @@ $(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
@@ -8155,6 +8162,9 @@ $(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
@@ -13761,6 +13771,9 @@ $(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
@@ -13779,6 +13792,9 @@ $(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 95a9c24e72..58ca66dcd3 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1209,6 +1209,7 @@ AUIDLL_OBJECTS =  \
 	$(OBJS)\auidll_dockart.o \
 	$(OBJS)\auidll_floatpane.o \
 	$(OBJS)\auidll_auibook.o \
+	$(OBJS)\auidll_auibar.o \
 	$(OBJS)\auidll_tabmdi.o
 AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
@@ -1224,6 +1225,7 @@ AUILIB_OBJECTS =  \
 	$(OBJS)\auilib_dockart.o \
 	$(OBJS)\auilib_floatpane.o \
 	$(OBJS)\auilib_auibook.o \
+	$(OBJS)\auilib_auibar.o \
 	$(OBJS)\auilib_tabmdi.o
 RICHTEXTDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
@@ -1481,6 +1483,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dockart.o \
 	$(OBJS)\monodll_floatpane.o \
 	$(OBJS)\monodll_auibook.o \
+	$(OBJS)\monodll_auibar.o \
 	$(OBJS)\monodll_tabmdi.o \
 	$(OBJS)\monodll_richtextctrl.o \
 	$(OBJS)\monodll_richtextbuffer.o \
@@ -2143,6 +2146,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dockart.o \
 	$(OBJS)\monolib_floatpane.o \
 	$(OBJS)\monolib_auibook.o \
+	$(OBJS)\monolib_auibar.o \
 	$(OBJS)\monolib_tabmdi.o \
 	$(OBJS)\monolib_richtextctrl.o \
 	$(OBJS)\monolib_richtextbuffer.o \
@@ -6141,6 +6145,9 @@ $(OBJS)\monodll_floatpane.o: ../../src/aui/floatpane.cpp
 $(OBJS)\monodll_auibook.o: ../../src/aui/auibook.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monodll_auibar.o: ../../src/aui/auibar.cpp
+	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monodll_tabmdi.o: ../../src/aui/tabmdi.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -8411,6 +8418,9 @@ $(OBJS)\monolib_floatpane.o: ../../src/aui/floatpane.cpp
 $(OBJS)\monolib_auibook.o: ../../src/aui/auibook.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\monolib_auibar.o: ../../src/aui/auibar.cpp
+	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\monolib_tabmdi.o: ../../src/aui/tabmdi.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14355,6 +14365,9 @@ $(OBJS)\auidll_floatpane.o: ../../src/aui/floatpane.cpp
 $(OBJS)\auidll_auibook.o: ../../src/aui/auibook.cpp
 	$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\auidll_auibar.o: ../../src/aui/auibar.cpp
+	$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\auidll_tabmdi.o: ../../src/aui/tabmdi.cpp
 	$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
 
@@ -14373,6 +14386,9 @@ $(OBJS)\auilib_floatpane.o: ../../src/aui/floatpane.cpp
 $(OBJS)\auilib_auibook.o: ../../src/aui/auibook.cpp
 	$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\auilib_auibar.o: ../../src/aui/auibar.cpp
+	$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\auilib_tabmdi.o: ../../src/aui/tabmdi.cpp
 	$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index ba39187d8b..0fe9530a03 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1283,6 +1283,7 @@ AUIDLL_OBJECTS =  \
 	$(OBJS)\auidll_dockart.obj \
 	$(OBJS)\auidll_floatpane.obj \
 	$(OBJS)\auidll_auibook.obj \
+	$(OBJS)\auidll_auibar.obj \
 	$(OBJS)\auidll_tabmdi.obj
 AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_383)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__DEBUGINFO) \
@@ -1301,6 +1302,7 @@ AUILIB_OBJECTS =  \
 	$(OBJS)\auilib_dockart.obj \
 	$(OBJS)\auilib_floatpane.obj \
 	$(OBJS)\auilib_auibook.obj \
+	$(OBJS)\auilib_auibar.obj \
 	$(OBJS)\auilib_tabmdi.obj
 RICHTEXTDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_397)$(__DEBUGRUNTIME) /DWIN32 \
 	$(__DEBUGINFO) \
@@ -1639,6 +1641,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_dockart.obj \
 	$(OBJS)\monodll_floatpane.obj \
 	$(OBJS)\monodll_auibook.obj \
+	$(OBJS)\monodll_auibar.obj \
 	$(OBJS)\monodll_tabmdi.obj \
 	$(OBJS)\monodll_richtextctrl.obj \
 	$(OBJS)\monodll_richtextbuffer.obj \
@@ -2301,6 +2304,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_dockart.obj \
 	$(OBJS)\monolib_floatpane.obj \
 	$(OBJS)\monolib_auibook.obj \
+	$(OBJS)\monolib_auibar.obj \
 	$(OBJS)\monolib_tabmdi.obj \
 	$(OBJS)\monolib_richtextctrl.obj \
 	$(OBJS)\monolib_richtextbuffer.obj \
@@ -6331,6 +6335,9 @@ $(OBJS)\monodll_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\monodll_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
@@ -8487,6 +8494,9 @@ $(OBJS)\monolib_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\monolib_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
@@ -14093,6 +14103,9 @@ $(OBJS)\auidll_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\auidll_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
@@ -14111,6 +14124,9 @@ $(OBJS)\auilib_floatpane.obj: ..\..\src\aui\floatpane.cpp
 $(OBJS)\auilib_auibook.obj: ..\..\src\aui\auibook.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibook.cpp
 
+$(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\auibar.cpp
+
 $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
 
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index 2314a02016..d1a516449f 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -193,6 +193,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_dockart.obj &
 	$(OBJS)\monodll_floatpane.obj &
 	$(OBJS)\monodll_auibook.obj &
+	$(OBJS)\monodll_auibar.obj &
 	$(OBJS)\monodll_tabmdi.obj &
 	$(OBJS)\monodll_richtextctrl.obj &
 	$(OBJS)\monodll_richtextbuffer.obj &
@@ -860,6 +861,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_dockart.obj &
 	$(OBJS)\monolib_floatpane.obj &
 	$(OBJS)\monolib_auibook.obj &
+	$(OBJS)\monolib_auibar.obj &
 	$(OBJS)\monolib_tabmdi.obj &
 	$(OBJS)\monolib_richtextctrl.obj &
 	$(OBJS)\monolib_richtextbuffer.obj &
@@ -4202,6 +4204,7 @@ AUIDLL_OBJECTS =  &
 	$(OBJS)\auidll_dockart.obj &
 	$(OBJS)\auidll_floatpane.obj &
 	$(OBJS)\auidll_auibook.obj &
+	$(OBJS)\auidll_auibar.obj &
 	$(OBJS)\auidll_tabmdi.obj
 AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@@ -4217,6 +4220,7 @@ AUILIB_OBJECTS =  &
 	$(OBJS)\auilib_dockart.obj &
 	$(OBJS)\auilib_floatpane.obj &
 	$(OBJS)\auilib_auibook.obj &
+	$(OBJS)\auilib_auibar.obj &
 	$(OBJS)\auilib_tabmdi.obj
 RICHTEXTDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
@@ -6373,6 +6377,9 @@ $(OBJS)\monodll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
 $(OBJS)\monodll_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
+$(OBJS)\monodll_auibar.obj :  .AUTODEPEND ..\..\src\aui\auibar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+
 $(OBJS)\monodll_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 
@@ -8643,6 +8650,9 @@ $(OBJS)\monolib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
 $(OBJS)\monolib_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
+$(OBJS)\monolib_auibar.obj :  .AUTODEPEND ..\..\src\aui\auibar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+
 $(OBJS)\monolib_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 
@@ -14587,6 +14597,9 @@ $(OBJS)\auidll_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
 $(OBJS)\auidll_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
 
+$(OBJS)\auidll_auibar.obj :  .AUTODEPEND ..\..\src\aui\auibar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
+
 $(OBJS)\auidll_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
 
@@ -14605,6 +14618,9 @@ $(OBJS)\auilib_floatpane.obj :  .AUTODEPEND ..\..\src\aui\floatpane.cpp
 $(OBJS)\auilib_auibook.obj :  .AUTODEPEND ..\..\src\aui\auibook.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
 
+$(OBJS)\auilib_auibar.obj :  .AUTODEPEND ..\..\src\aui\auibar.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
+
 $(OBJS)\auilib_tabmdi.obj :  .AUTODEPEND ..\..\src\aui\tabmdi.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
 
diff --git a/build/msw/wx_aui.dsp b/build/msw/wx_aui.dsp
index 22f71d893e..152e3c0e45 100644
--- a/build/msw/wx_aui.dsp
+++ b/build/msw/wx_aui.dsp
@@ -534,6 +534,10 @@ SOURCE=..\..\include\wx\aui\aui.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\auibar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\aui\auibook.h
 # End Source File
 # Begin Source File
@@ -558,6 +562,10 @@ SOURCE=..\..\include\wx\aui\tabmdi.h
 # PROP Default_Filter ""
 # Begin Source File
 
+SOURCE=..\..\src\aui\auibar.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\aui\auibook.cpp
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index d12c85c174..9a740c1a28 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -5651,6 +5651,10 @@ SOURCE=..\..\include\wx\aui\aui.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\include\wx\aui\auibar.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\include\wx\aui\auibook.h
 # End Source File
 # Begin Source File
diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj
index e89f299e68..0e0f9c9c8a 100644
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.vcproj
@@ -837,6 +837,8 @@
 			UniqueIdentifier="{8C07E926-65B0-5F00-B0D6-7F40DA69BB25}">
 			<File
 				RelativePath="..\..\include\wx\aui\aui.h"/>
+			<File
+				RelativePath="..\..\include\wx\aui\auibar.h"/>
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h"/>
 			<File
@@ -852,6 +854,8 @@
 			Name="Source Files"
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx">
+			<File
+				RelativePath="..\..\src\aui\auibar.cpp"/>
 			<File
 				RelativePath="..\..\src\aui\auibook.cpp"/>
 			<File
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 9a5f5676ce..7ba9e05de8 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -3158,6 +3158,8 @@
 				RelativePath="..\..\include\wx\artprov.h"/>
 			<File
 				RelativePath="..\..\include\wx\aui\aui.h"/>
+			<File
+				RelativePath="..\..\include\wx\aui\auibar.h"/>
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h"/>
 			<File
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index 28d8a20710..7d2793fb41 100644
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -1045,6 +1045,9 @@
 			<File
 				RelativePath="..\..\include\wx\aui\aui.h"
 			/>
+			<File
+				RelativePath="..\..\include\wx\aui\auibar.h"
+			/>
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h"
 			/>
@@ -1066,6 +1069,9 @@
 			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
 			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
 			>
+			<File
+				RelativePath="..\..\src\aui\auibar.cpp"
+			/>
 			<File
 				RelativePath="..\..\src\aui\auibook.cpp"
 			/>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 18d2f29b24..e97efc7ed3 100644
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -4274,6 +4274,9 @@
 			<File
 				RelativePath="..\..\include\wx\aui\aui.h"
 			/>
+			<File
+				RelativePath="..\..\include\wx\aui\auibar.h"
+			/>
 			<File
 				RelativePath="..\..\include\wx\aui\auibook.h"
 			/>