diff --git a/Makefile.in b/Makefile.in
index 4a192c1266..782aa59413 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1884,7 +1884,7 @@ AUIDLL_OBJECTS = \
auidll_auibar.o \
auidll_tabmdi.o \
auidll_tabart.o \
- auidll_xh_auinotbk.o \
+ auidll_xh_aui.o \
auidll_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS_2) \
$(__AUI_PLATFORM_SRC_OBJECTS_2)
@@ -1902,7 +1902,7 @@ AUILIB_OBJECTS = \
auilib_auibar.o \
auilib_tabmdi.o \
auilib_tabart.o \
- auilib_xh_auinotbk.o \
+ auilib_xh_aui.o \
auilib_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS_3) \
$(__AUI_PLATFORM_SRC_OBJECTS_3)
@@ -3974,7 +3974,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/aui/tabmdi.h \
wx/aui/aui.h \
wx/aui/tabart.h \
- wx/xrc/xh_auinotbk.h \
+ wx/xrc/xh_aui.h \
wx/xrc/xh_auitoolb.h \
$(AUI_GTK_HDR) \
$(AUI_PLATFORM_HDR) \
@@ -4280,7 +4280,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_auibar.o \
monodll_tabmdi.o \
monodll_tabart.o \
- monodll_xh_auinotbk.o \
+ monodll_xh_aui.o \
monodll_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS) \
$(__AUI_PLATFORM_SRC_OBJECTS) \
@@ -6294,7 +6294,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_auibar.o \
monolib_tabmdi.o \
monolib_tabart.o \
- monolib_xh_auinotbk.o \
+ monolib_xh_aui.o \
monolib_xh_auitoolb.o \
$(__AUI_GTK_SRC_OBJECTS_1) \
$(__AUI_PLATFORM_SRC_OBJECTS_1) \
@@ -17047,8 +17047,8 @@ monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
monodll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
-monodll_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(MONODLL_ODEP)
- $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
+monodll_xh_aui.o: $(srcdir)/src/xrc/xh_aui.cpp $(MONODLL_ODEP)
+ $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_aui.cpp
monodll_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
@@ -21877,8 +21877,8 @@ monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP)
monolib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
-monolib_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(MONOLIB_ODEP)
- $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
+monolib_xh_aui.o: $(srcdir)/src/xrc/xh_aui.cpp $(MONOLIB_ODEP)
+ $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_aui.cpp
monolib_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
@@ -34705,8 +34705,8 @@ auidll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUIDLL_ODEP)
auidll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
-auidll_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(AUIDLL_ODEP)
- $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
+auidll_xh_aui.o: $(srcdir)/src/xrc/xh_aui.cpp $(AUIDLL_ODEP)
+ $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_aui.cpp
auidll_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
@@ -34741,8 +34741,8 @@ auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
auilib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
-auilib_xh_auinotbk.o: $(srcdir)/src/xrc/xh_auinotbk.cpp $(AUILIB_ODEP)
- $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auinotbk.cpp
+auilib_xh_aui.o: $(srcdir)/src/xrc/xh_aui.cpp $(AUILIB_ODEP)
+ $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/xrc/xh_aui.cpp
auilib_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/xrc/xh_auitoolb.cpp
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 9660bf0066..e8a3dc4630 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3384,7 +3384,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/aui/auibar.cpp
src/aui/tabmdi.cpp
src/aui/tabart.cpp
- src/xrc/xh_auinotbk.cpp
+ src/xrc/xh_aui.cpp
src/xrc/xh_auitoolb.cpp
@@ -3401,7 +3401,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/tabmdi.h
wx/aui/aui.h
wx/aui/tabart.h
- wx/xrc/xh_auinotbk.h
+ wx/xrc/xh_aui.h
wx/xrc/xh_auitoolb.h
diff --git a/build/files b/build/files
index 9ac55577b9..c75433c695 100644
--- a/build/files
+++ b/build/files
@@ -2994,7 +2994,7 @@ AUI_CMN_SRC =
src/aui/auibar.cpp
src/aui/tabmdi.cpp
src/aui/tabart.cpp
- src/xrc/xh_auinotbk.cpp
+ src/xrc/xh_aui.cpp
src/xrc/xh_auitoolb.cpp
AUI_CMN_HDR =
wx/aui/framemanager.h
@@ -3005,7 +3005,7 @@ AUI_CMN_HDR =
wx/aui/tabmdi.h
wx/aui/aui.h
wx/aui/tabart.h
- wx/xrc/xh_auinotbk.h
+ wx/xrc/xh_aui.h
wx/xrc/xh_auitoolb.h
AUI_MSW_HDR =
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 21926203fe..ab07b27785 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1358,7 +1358,7 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_auibar.obj \
$(OBJS)\auidll_tabmdi.obj \
$(OBJS)\auidll_tabart.obj \
- $(OBJS)\auidll_xh_auinotbk.obj \
+ $(OBJS)\auidll_xh_aui.obj \
$(OBJS)\auidll_xh_auitoolb.obj \
$(OBJS)\auidll_tabartmsw.obj \
$(OBJS)\auidll_barartmsw.obj
@@ -1379,7 +1379,7 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_auibar.obj \
$(OBJS)\auilib_tabmdi.obj \
$(OBJS)\auilib_tabart.obj \
- $(OBJS)\auilib_xh_auinotbk.obj \
+ $(OBJS)\auilib_xh_aui.obj \
$(OBJS)\auilib_xh_auitoolb.obj \
$(OBJS)\auilib_tabartmsw.obj \
$(OBJS)\auilib_barartmsw.obj
@@ -1741,7 +1741,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_auibar.obj \
$(OBJS)\monodll_tabmdi.obj \
$(OBJS)\monodll_tabart.obj \
- $(OBJS)\monodll_xh_auinotbk.obj \
+ $(OBJS)\monodll_xh_aui.obj \
$(OBJS)\monodll_xh_auitoolb.obj \
$(OBJS)\monodll_tabartmsw.obj \
$(OBJS)\monodll_barartmsw.obj \
@@ -2572,7 +2572,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_auibar.obj \
$(OBJS)\monolib_tabmdi.obj \
$(OBJS)\monolib_tabart.obj \
- $(OBJS)\monolib_xh_auinotbk.obj \
+ $(OBJS)\monolib_xh_aui.obj \
$(OBJS)\monolib_xh_auitoolb.obj \
$(OBJS)\monolib_tabartmsw.obj \
$(OBJS)\monolib_barartmsw.obj \
@@ -7440,8 +7440,8 @@ $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\monodll_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\monodll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
@@ -9975,8 +9975,8 @@ $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\monolib_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\monolib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
@@ -16220,8 +16220,8 @@ $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\auidll_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\auidll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
@@ -16256,8 +16256,8 @@ $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\auilib_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\auilib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index 8293421b5b..492fe10dad 100644
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1364,7 +1364,7 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_auibar.o \
$(OBJS)\auidll_tabmdi.o \
$(OBJS)\auidll_tabart.o \
- $(OBJS)\auidll_xh_auinotbk.o \
+ $(OBJS)\auidll_xh_aui.o \
$(OBJS)\auidll_xh_auitoolb.o \
$(OBJS)\auidll_tabartmsw.o \
$(OBJS)\auidll_barartmsw.o
@@ -1385,7 +1385,7 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_auibar.o \
$(OBJS)\auilib_tabmdi.o \
$(OBJS)\auilib_tabart.o \
- $(OBJS)\auilib_xh_auinotbk.o \
+ $(OBJS)\auilib_xh_aui.o \
$(OBJS)\auilib_xh_auitoolb.o \
$(OBJS)\auilib_tabartmsw.o \
$(OBJS)\auilib_barartmsw.o
@@ -1759,7 +1759,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_auibar.o \
$(OBJS)\monodll_tabmdi.o \
$(OBJS)\monodll_tabart.o \
- $(OBJS)\monodll_xh_auinotbk.o \
+ $(OBJS)\monodll_xh_aui.o \
$(OBJS)\monodll_xh_auitoolb.o \
$(OBJS)\monodll_tabartmsw.o \
$(OBJS)\monodll_barartmsw.o \
@@ -2596,7 +2596,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_auibar.o \
$(OBJS)\monolib_tabmdi.o \
$(OBJS)\monolib_tabart.o \
- $(OBJS)\monolib_xh_auinotbk.o \
+ $(OBJS)\monolib_xh_aui.o \
$(OBJS)\monolib_xh_auitoolb.o \
$(OBJS)\monolib_tabartmsw.o \
$(OBJS)\monolib_barartmsw.o \
@@ -7615,7 +7615,7 @@ $(OBJS)\monodll_tabmdi.o: ../../src/aui/tabmdi.cpp
$(OBJS)\monodll_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monodll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
+$(OBJS)\monodll_xh_aui.o: ../../src/xrc/xh_aui.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
@@ -10152,7 +10152,7 @@ $(OBJS)\monolib_tabmdi.o: ../../src/aui/tabmdi.cpp
$(OBJS)\monolib_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\monolib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
+$(OBJS)\monolib_xh_aui.o: ../../src/xrc/xh_aui.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
@@ -16399,7 +16399,7 @@ $(OBJS)\auidll_tabmdi.o: ../../src/aui/tabmdi.cpp
$(OBJS)\auidll_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\auidll_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
+$(OBJS)\auidll_xh_aui.o: ../../src/xrc/xh_aui.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auidll_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
@@ -16435,7 +16435,7 @@ $(OBJS)\auilib_tabmdi.o: ../../src/aui/tabmdi.cpp
$(OBJS)\auilib_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
-$(OBJS)\auilib_xh_auinotbk.o: ../../src/xrc/xh_auinotbk.cpp
+$(OBJS)\auilib_xh_aui.o: ../../src/xrc/xh_aui.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auilib_xh_auitoolb.o: ../../src/xrc/xh_auitoolb.cpp
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index c1a60828cf..5f3afb2537 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1502,7 +1502,7 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_auibar.obj \
$(OBJS)\auidll_tabmdi.obj \
$(OBJS)\auidll_tabart.obj \
- $(OBJS)\auidll_xh_auinotbk.obj \
+ $(OBJS)\auidll_xh_aui.obj \
$(OBJS)\auidll_xh_auitoolb.obj \
$(OBJS)\auidll_tabartmsw.obj \
$(OBJS)\auidll_barartmsw.obj
@@ -1529,7 +1529,7 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_auibar.obj \
$(OBJS)\auilib_tabmdi.obj \
$(OBJS)\auilib_tabart.obj \
- $(OBJS)\auilib_xh_auinotbk.obj \
+ $(OBJS)\auilib_xh_aui.obj \
$(OBJS)\auilib_xh_auitoolb.obj \
$(OBJS)\auilib_tabartmsw.obj \
$(OBJS)\auilib_barartmsw.obj
@@ -2041,7 +2041,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_auibar.obj \
$(OBJS)\monodll_tabmdi.obj \
$(OBJS)\monodll_tabart.obj \
- $(OBJS)\monodll_xh_auinotbk.obj \
+ $(OBJS)\monodll_xh_aui.obj \
$(OBJS)\monodll_xh_auitoolb.obj \
$(OBJS)\monodll_tabartmsw.obj \
$(OBJS)\monodll_barartmsw.obj \
@@ -2878,7 +2878,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_auibar.obj \
$(OBJS)\monolib_tabmdi.obj \
$(OBJS)\monolib_tabart.obj \
- $(OBJS)\monolib_xh_auinotbk.obj \
+ $(OBJS)\monolib_xh_aui.obj \
$(OBJS)\monolib_xh_auitoolb.obj \
$(OBJS)\monolib_tabartmsw.obj \
$(OBJS)\monolib_barartmsw.obj \
@@ -8132,8 +8132,8 @@ $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\monodll_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\monodll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\monodll_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\monodll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
@@ -10667,8 +10667,8 @@ $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\monolib_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\monolib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\monolib_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\monolib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
@@ -16912,8 +16912,8 @@ $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\auidll_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\auidll_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\auidll_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
@@ -16948,8 +16948,8 @@ $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
-$(OBJS)\auilib_xh_auinotbk.obj: ..\..\src\xrc\xh_auinotbk.cpp
- $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auinotbk.cpp
+$(OBJS)\auilib_xh_aui.obj: ..\..\src\xrc\xh_aui.cpp
+ $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_aui.cpp
$(OBJS)\auilib_xh_auitoolb.obj: ..\..\src\xrc\xh_auitoolb.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\xrc\xh_auitoolb.cpp
diff --git a/build/msw/wx_aui.vcxproj b/build/msw/wx_aui.vcxproj
index 9f3d2b3580..888f0fa9ed 100644
--- a/build/msw/wx_aui.vcxproj
+++ b/build/msw/wx_aui.vcxproj
@@ -463,10 +463,10 @@
-
+
@@ -505,10 +505,10 @@
-
+
diff --git a/build/msw/wx_aui.vcxproj.filters b/build/msw/wx_aui.vcxproj.filters
index 86759b9720..233007d3b5 100644
--- a/build/msw/wx_aui.vcxproj.filters
+++ b/build/msw/wx_aui.vcxproj.filters
@@ -22,9 +22,6 @@
-
- Common Sources
-
Source Files
@@ -52,7 +49,10 @@
Source Files
-
+
+ Common Sources
+
+
Source Files
@@ -95,7 +95,7 @@
Common Headers
-
+
Common Headers
diff --git a/build/msw/wx_vc7_aui.vcproj b/build/msw/wx_vc7_aui.vcproj
index a0e89934d8..a74b471e35 100644
--- a/build/msw/wx_vc7_aui.vcproj
+++ b/build/msw/wx_vc7_aui.vcproj
@@ -444,7 +444,7 @@
RelativePath="..\..\include\wx\aui\tabmdi.h">
+ RelativePath="..\..\include\wx\xrc\xh_aui.h">
@@ -482,7 +482,7 @@
RelativePath="..\..\src\aui\tabmdi.cpp">
+ RelativePath="..\..\src\xrc\xh_aui.cpp">
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index df55d70876..1a69b3b619 100644
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -2751,7 +2751,7 @@
RelativePath="..\..\include\wx\xrc\xh_animatctrl.h">
+ RelativePath="..\..\include\wx\xrc\xh_aui.h">
diff --git a/build/msw/wx_vc8_aui.vcproj b/build/msw/wx_vc8_aui.vcproj
index cad62d3621..f9cff31af8 100644
--- a/build/msw/wx_vc8_aui.vcproj
+++ b/build/msw/wx_vc8_aui.vcproj
@@ -1094,7 +1094,7 @@
>
+
+ AddHandler(new wxAuiXmlHandler);
+@endcode
+to use it.
+
+A wxAuiManager can have one or more child objects of the
+wxAuiPaneInfo class.
+wxAuiPaneInfo objects have the following properties:
+
+@beginTable
+@hdr3col{property, type, description}
+@row3col{caption, @ref overview_xrcformat_type_text,
+ Sets the caption of the pane.}
+@row3col{caption_visible, @ref overview_xrcformat_type_bool,
+ Indicates that a pane caption should be visible.}
+@row3col{close_button, @ref overview_xrcformat_type_bool,
+ Indicates that a close button should be drawn for the pane.}
+@row3col{maximize_button, @ref overview_xrcformat_type_bool,
+ Indicates that a maximize button should be drawn for the pane.}
+@row3col{minimize_button, @ref overview_xrcformat_type_bool,
+ Indicates that a minimize button should be drawn for the pane.}
+@row3col{pin_button, @ref overview_xrcformat_type_bool,
+ Indicates that a pin button should be drawn for the pane.}
+@row3col{gripper, @ref overview_xrcformat_type_bool,
+ Indicates that a gripper should be drawn for the pane.}
+@row3col{pane_border, @ref overview_xrcformat_type_bool,
+ Indicates that a border should be drawn for the pane.}
+@row3col{dock, ,
+ Indicates that a pane should be docked.}
+@row3col{float, ,
+ Indicates that a pane should be floated.}
+@row3col{top_dockable, @ref overview_xrcformat_type_bool,
+ Indicates whether a pane can be docked at the top of the frame.}
+@row3col{bottom_dockable, @ref overview_xrcformat_type_bool,
+ Indicates whether a pane can be docked at the bottom of the frame.}
+@row3col{left_dockable, @ref overview_xrcformat_type_bool,
+ Indicates whether a pane can be docked on the left of the frame.}
+@row3col{right_dockable, @ref overview_xrcformat_type_bool,
+ Indicates whether a pane can be docked on the right of the frame.}
+@row3col{dock_fixed, @ref overview_xrcformat_type_bool,
+ Causes the containing dock to have no resize sash.}
+@row3col{resizable, @ref overview_xrcformat_type_bool,
+ Allows a pane to be resized if the parameter is @true, and forces it
+ to be a fixed size if the parameter is @false.}
+@row3col{movable, @ref overview_xrcformat_type_bool,
+ Indicates whether a pane can be moved.}
+@row3col{floatable, @ref overview_xrcformat_type_bool,
+ Sets whether the user will be able to undock a pane and turn it
+ into a floating window.}
+@row3col{best_size, @ref overview_xrcformat_type_size,
+ Sets the ideal size for the pane.}
+@row3col{floating_size, @ref overview_xrcformat_type_size,
+ Sets the size of the floating pane.}
+@row3col{min_size, @ref overview_xrcformat_type_size,
+ Sets the minimum size of the pane.}
+@row3col{max_size, @ref overview_xrcformat_type_size,
+ Sets the maximum size of the pane.}
+@row3col{default_pane, ,
+ Specifies that the pane should adopt the default pane settings.}
+@row3col{toolbar_pane, ,
+ Specifies that the pane should adopt the default toolbar pane settings.}
+@row3col{layer, , Determines the layer of the docked pane.}
+@row3col{row, , Determines the row of the docked pane.}
+@row3col{center_pane, ,
+ Specifies that the pane should adopt the default center pane settings.}
+@row3col{centre_pane, ,
+ Same as center_pane.}
+@row3col{direction, ,
+ Determines the direction of the docked pane.}
+@row3col{top, ,
+ Sets the pane dock position to the top of the frame.}
+@row3col{bottom, ,
+ Sets the pane dock position to the bottom side of the frame.}
+@row3col{left, ,
+ Sets the pane dock position to the left side of the frame.}
+@row3col{right, ,
+ Sets the pane dock position to the right side of the frame.}
+@row3col{center, ,
+ Sets the pane dock position to the center of the frame.}
+@row3col{centre, ,
+ Same as center.}
+@endTable
+
+
@subsubsection xrc_wxauinotebook wxAuiNotebook
A wxAuiNotebook can have one or more child objects of the @c notebookpage
@@ -592,14 +682,7 @@ Example:
@endcode
-Notice that wxAuiNotebook support in XRC is available in wxWidgets 2.9.5 and
-later only and you need to explicitly register its handler using
-@code
- #include
-
- AddHandler(new wxAuiNotebookXmlHandler);
-@endcode
-to use it.
+@note See @ref xrc_wxauimanager about using wxAUI classes in XRC.
@subsubsection xrc_wxauitoolbar wxAuiToolBar
diff --git a/include/wx/xrc/xh_aui.h b/include/wx/xrc/xh_aui.h
new file mode 100644
index 0000000000..ada8e345f4
--- /dev/null
+++ b/include/wx/xrc/xh_aui.h
@@ -0,0 +1,51 @@
+/////////////////////////////////////////////////////////////////////////////
+// Name: wx/xrc/xh_aui.h
+// Purpose: XRC resource handler for wxAUI
+// Author: Andrea Zanellato, Steve Lamerton (wxAuiNotebook)
+// Created: 2011-09-18
+// Copyright: (c) 2011 wxWidgets Team
+// Licence: wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_XH_AUI_H_
+#define _WX_XH_AUI_H_
+
+#include "wx/xrc/xmlres.h"
+
+#if wxUSE_XRC && wxUSE_AUI
+
+#include "wx/vector.h"
+
+class WXDLLIMPEXP_FWD_AUI wxAuiManager;
+class WXDLLIMPEXP_FWD_AUI wxAuiNotebook;
+
+class WXDLLIMPEXP_AUI wxAuiXmlHandler : public wxXmlResourceHandler
+{
+public:
+ wxAuiXmlHandler();
+ virtual wxObject *DoCreateResource() wxOVERRIDE;
+ virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
+
+ // Returns the wxAuiManager for the specified window
+ wxAuiManager *GetAuiManager(wxWindow *managed) const;
+
+private:
+ // Used to UnInit() the wxAuiManager before destroying its managed window
+ void OnManagedWindowClose(wxWindowDestroyEvent &event);
+
+ typedef wxVector Managers;
+ Managers m_managers; // all wxAuiManagers created in this handler
+
+ wxAuiManager *m_manager; // Current wxAuiManager
+ wxWindow *m_window; // Current managed wxWindow
+ wxAuiNotebook *m_notebook;
+
+ bool m_mgrInside; // Are we handling a wxAuiManager or panes inside it?
+ bool m_anbInside; // Are we handling a wxAuiNotebook or pages inside it?
+
+ wxDECLARE_DYNAMIC_CLASS(wxAuiXmlHandler);
+};
+
+#endif //wxUSE_XRC && wxUSE_AUI
+
+#endif //_WX_XH_AUI_H_
diff --git a/include/wx/xrc/xh_auinotbk.h b/include/wx/xrc/xh_auinotbk.h
deleted file mode 100644
index 787fa9a08c..0000000000
--- a/include/wx/xrc/xh_auinotbk.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/////////////////////////////////////////////////////////////////////////////
-// Name: wx/xrc/xh_auinotbk.h
-// Purpose: XML resource handler for wxAuiNotebook
-// Author: Steve Lamerton
-// Created: 2009-06-12
-// Copyright: (c) 2009 Steve Lamerton
-// Licence: wxWindows licence
-/////////////////////////////////////////////////////////////////////////////
-
-#ifndef _WX_XRC_XH_AUINOTEBOOK_H_
-#define _WX_XRC_XH_AUINOTEBOOK_H_
-
-#include "wx/xrc/xmlres.h"
-
-class WXDLLIMPEXP_FWD_AUI wxAuiNotebook;
-
-#if wxUSE_XRC && wxUSE_AUI
-
-class WXDLLIMPEXP_AUI wxAuiNotebookXmlHandler : public wxXmlResourceHandler
-{
-public:
- wxAuiNotebookXmlHandler();
- virtual wxObject *DoCreateResource() wxOVERRIDE;
- virtual bool CanHandle(wxXmlNode *node) wxOVERRIDE;
-
-private:
- bool m_isInside;
- wxAuiNotebook *m_notebook;
-
- wxDECLARE_DYNAMIC_CLASS(wxAuiNotebookXmlHandler);
-};
-
-#endif // wxUSE_XRC && wxUSE_AUI
-
-#endif // _WX_XRC_XH_AUINOTEBOOK_H_
diff --git a/samples/xrc/myframe.cpp b/samples/xrc/myframe.cpp
index bdb95e2ee0..90a40d482c 100644
--- a/samples/xrc/myframe.cpp
+++ b/samples/xrc/myframe.cpp
@@ -282,7 +282,6 @@ void MyFrame::OnAuiDemoToolOrMenuCommand(wxCommandEvent& WXUNUSED(event))
#if wxUSE_AUI
wxDialog dlg;
wxXmlResource::Get()->LoadDialog(&dlg, this, wxS("aui_dialog"));
- dlg.SetSize(-1,300);
dlg.ShowModal();
#else
wxLogWarning("wxUSE_AUI must be set to 1 in 'setup.h' to view the AUI demo.");
diff --git a/samples/xrc/rc/aui.xrc b/samples/xrc/rc/aui.xrc
index 4f20bf282c..fac593e3ad 100644
--- a/samples/xrc/rc/aui.xrc
+++ b/samples/xrc/rc/aui.xrc
@@ -4,12 +4,163 @@
AUI XRC demo
1
- 500,300