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

Refactor wxAUI: extract wxAuiTabArt in a separate file.

Browse Source 
No real changes, just extract wxAuiTabArt into its own file. Also rename
wxAuiDefaultTabArt to wxAuiSimpleTabArt in preparation for having other tab
art classes as the default one.

See #14098.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71001 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-25 17:55:59 +00:00
parent 445a98c7d2
commit 4758baf5eb
18 changed files with 1684 additions and 1495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Makefile.in
View File

@@ -1840,7 +1840,8 @@ AUIDLL_OBJECTS = \
auidll_floatpane.o \ auidll_floatpane.o \
auidll_auibook.o \ auidll_auibook.o \
auidll_auibar.o \ auidll_auibar.o \
auidll_tabmdi.o auidll_tabmdi.o \
auidll_tabart.o
AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname) AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname)
AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1853,7 +1854,8 @@ AUILIB_OBJECTS = \
auilib_floatpane.o \ auilib_floatpane.o \
auilib_auibook.o \ auilib_auibook.o \
auilib_auibar.o \ auilib_auibar.o \
auilib_tabmdi.o auilib_tabmdi.o \
auilib_tabart.o
AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname) AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \ RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -4198,6 +4200,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
wx/aui/auibar.h \ wx/aui/auibar.h \
wx/aui/tabmdi.h \ wx/aui/tabmdi.h \
wx/aui/aui.h \ wx/aui/aui.h \
wx/aui/tabart.h \
wx/propgrid/advprops.h \ wx/propgrid/advprops.h \
wx/propgrid/editors.h \ wx/propgrid/editors.h \
wx/propgrid/manager.h \ wx/propgrid/manager.h \
@@ -4514,6 +4517,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
monodll_auibook.o \ monodll_auibook.o \
monodll_auibar.o \ monodll_auibar.o \
monodll_tabmdi.o \ monodll_tabmdi.o \
monodll_tabart.o \
monodll_advprops.o \ monodll_advprops.o \
monodll_editors.o \ monodll_editors.o \
monodll_manager.o \ monodll_manager.o \
@@ -6408,6 +6412,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
monolib_auibook.o \ monolib_auibook.o \
monolib_auibar.o \ monolib_auibar.o \
monolib_tabmdi.o \ monolib_tabmdi.o \
monolib_tabart.o \
monolib_advprops.o \ monolib_advprops.o \
monolib_editors.o \ monolib_editors.o \
monolib_manager.o \ monolib_manager.o \
@@ -17403,6 +17408,9 @@ monodll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONODLL_ODEP)
monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP) monodll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
monodll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP) monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP)
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp $(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
@@ -22701,6 +22709,9 @@ monolib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(MONOLIB_ODEP)
monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP) monolib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
monolib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
monolib_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONOLIB_ODEP) monolib_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONOLIB_ODEP)
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp $(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
@@ -36462,6 +36473,9 @@ auidll_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUIDLL_ODEP)
auidll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUIDLL_ODEP) auidll_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp $(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
auidll_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUIDLL_ODEP)
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
auilib_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUILIB_ODEP) auilib_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
@@ -36480,6 +36494,9 @@ auilib_auibar.o: $(srcdir)/src/aui/auibar.cpp $(AUILIB_ODEP)
auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP) auilib_tabmdi.o: $(srcdir)/src/aui/tabmdi.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp $(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabmdi.cpp
auilib_tabart.o: $(srcdir)/src/aui/tabart.cpp $(AUILIB_ODEP)
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabart.cpp
ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP) ribbondll_version_rc.o: $(srcdir)/src/msw/version.rc $(RIBBONDLL_ODEP)
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON $(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_67) $(__DEBUG_DEFINE_p_66) $(__EXCEPTIONS_DEFINE_p_65) $(__RTTI_DEFINE_p_65) $(__THREAD_DEFINE_p_65) --define WXBUILDING --define WXDLLNAME=$(WXDLLNAMEPREFIXGUI)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon$(WXCOMPILER)$(VENDORTAG)$(WXDLLVERSIONTAG) $(__RCDEFDIR_p) --include-dir $(top_srcdir)/include $(__INC_TIFF_BUILD_p_66) $(__INC_TIFF_p_66) $(__INC_JPEG_p_66) $(__INC_PNG_p_65) $(__INC_ZLIB_p_67) $(__INC_REGEX_p_65) $(__INC_EXPAT_p_65) --define WXUSINGDLL --define WXMAKINGDLL_RIBBON

2
build/bakefiles/files.bkl
View File

@@ -3555,6 +3555,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/aui/auibook.cpp src/aui/auibook.cpp
src/aui/auibar.cpp src/aui/auibar.cpp
src/aui/tabmdi.cpp src/aui/tabmdi.cpp
src/aui/tabart.cpp
</set> </set>
<set var="AUI_HDR" hints="files"> <set var="AUI_HDR" hints="files">
wx/aui/framemanager.h wx/aui/framemanager.h
@@ -3564,6 +3565,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/aui/auibar.h wx/aui/auibar.h
wx/aui/tabmdi.h wx/aui/tabmdi.h
wx/aui/aui.h wx/aui/aui.h
wx/aui/tabart.h
</set> </set>
<!-- ====================================================================== --> <!-- ====================================================================== -->

20
build/msw/makefile.bcc
View File

@@ -1325,7 +1325,8 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_floatpane.obj \ $(OBJS)\auidll_floatpane.obj \
$(OBJS)\auidll_auibook.obj \ $(OBJS)\auidll_auibook.obj \
$(OBJS)\auidll_auibar.obj \ $(OBJS)\auidll_auibar.obj \
$(OBJS)\auidll_tabmdi.obj $(OBJS)\auidll_tabmdi.obj \
$(OBJS)\auidll_tabart.obj
AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ AUILIB_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1342,7 +1343,8 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_floatpane.obj \ $(OBJS)\auilib_floatpane.obj \
$(OBJS)\auilib_auibook.obj \ $(OBJS)\auilib_auibook.obj \
$(OBJS)\auilib_auibar.obj \ $(OBJS)\auilib_auibar.obj \
$(OBJS)\auilib_tabmdi.obj $(OBJS)\auilib_tabmdi.obj \
$(OBJS)\auilib_tabart.obj
RIBBONDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ RIBBONDLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(__OPTIMIZEFLAG) $(__THREADSFLAG) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1688,6 +1690,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_auibook.obj \ $(OBJS)\monodll_auibook.obj \
$(OBJS)\monodll_auibar.obj \ $(OBJS)\monodll_auibar.obj \
$(OBJS)\monodll_tabmdi.obj \ $(OBJS)\monodll_tabmdi.obj \
$(OBJS)\monodll_tabart.obj \
$(OBJS)\monodll_advprops.obj \ $(OBJS)\monodll_advprops.obj \
$(OBJS)\monodll_editors.obj \ $(OBJS)\monodll_editors.obj \
$(OBJS)\monodll_manager.obj \ $(OBJS)\monodll_manager.obj \
@@ -2471,6 +2474,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_auibook.obj \ $(OBJS)\monolib_auibook.obj \
$(OBJS)\monolib_auibar.obj \ $(OBJS)\monolib_auibar.obj \
$(OBJS)\monolib_tabmdi.obj \ $(OBJS)\monolib_tabmdi.obj \
$(OBJS)\monolib_tabart.obj \
$(OBJS)\monolib_advprops.obj \ $(OBJS)\monolib_advprops.obj \
$(OBJS)\monolib_editors.obj \ $(OBJS)\monolib_editors.obj \
$(OBJS)\monolib_manager.obj \ $(OBJS)\monolib_manager.obj \
@@ -7072,6 +7076,9 @@ $(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\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_advprops.obj: ..\..\src\propgrid\advprops.cpp $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp $(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -9477,6 +9484,9 @@ $(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\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_advprops.obj: ..\..\src\propgrid\advprops.cpp $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp $(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -15430,6 +15440,9 @@ $(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) -q -c -P -o$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) -H ..\..\src\common\dummy.cpp
@@ -15451,6 +15464,9 @@ $(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) -q -c -P -o$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp $(CXX) -q -c -P -o$@ $(RIBBONDLL_CXXFLAGS) -H ..\..\src\common\dummy.cpp

20
build/msw/makefile.gcc
View File

@@ -1324,7 +1324,8 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_floatpane.o \ $(OBJS)\auidll_floatpane.o \
$(OBJS)\auidll_auibook.o \ $(OBJS)\auidll_auibook.o \
$(OBJS)\auidll_auibar.o \ $(OBJS)\auidll_auibar.o \
$(OBJS)\auidll_tabmdi.o $(OBJS)\auidll_tabmdi.o \
$(OBJS)\auidll_tabart.o
AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \ AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -1340,7 +1341,8 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_floatpane.o \ $(OBJS)\auilib_floatpane.o \
$(OBJS)\auilib_auibook.o \ $(OBJS)\auilib_auibook.o \
$(OBJS)\auilib_auibar.o \ $(OBJS)\auilib_auibar.o \
$(OBJS)\auilib_tabmdi.o $(OBJS)\auilib_tabmdi.o \
$(OBJS)\auilib_tabart.o
RIBBONDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \ RIBBONDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
@@ -1699,6 +1701,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_auibook.o \ $(OBJS)\monodll_auibook.o \
$(OBJS)\monodll_auibar.o \ $(OBJS)\monodll_auibar.o \
$(OBJS)\monodll_tabmdi.o \ $(OBJS)\monodll_tabmdi.o \
$(OBJS)\monodll_tabart.o \
$(OBJS)\monodll_advprops.o \ $(OBJS)\monodll_advprops.o \
$(OBJS)\monodll_editors.o \ $(OBJS)\monodll_editors.o \
$(OBJS)\monodll_manager.o \ $(OBJS)\monodll_manager.o \
@@ -2488,6 +2491,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_auibook.o \ $(OBJS)\monolib_auibook.o \
$(OBJS)\monolib_auibar.o \ $(OBJS)\monolib_auibar.o \
$(OBJS)\monolib_tabmdi.o \ $(OBJS)\monolib_tabmdi.o \
$(OBJS)\monolib_tabart.o \
$(OBJS)\monolib_advprops.o \ $(OBJS)\monolib_advprops.o \
$(OBJS)\monolib_editors.o \ $(OBJS)\monolib_editors.o \
$(OBJS)\monolib_manager.o \ $(OBJS)\monolib_manager.o \
@@ -7240,6 +7244,9 @@ $(OBJS)\monodll_auibar.o: ../../src/aui/auibar.cpp
$(OBJS)\monodll_tabmdi.o: ../../src/aui/tabmdi.cpp $(OBJS)\monodll_tabmdi.o: ../../src/aui/tabmdi.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_advprops.o: ../../src/propgrid/advprops.cpp $(OBJS)\monodll_advprops.o: ../../src/propgrid/advprops.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -9645,6 +9652,9 @@ $(OBJS)\monolib_auibar.o: ../../src/aui/auibar.cpp
$(OBJS)\monolib_tabmdi.o: ../../src/aui/tabmdi.cpp $(OBJS)\monolib_tabmdi.o: ../../src/aui/tabmdi.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_advprops.o: ../../src/propgrid/advprops.cpp $(OBJS)\monolib_advprops.o: ../../src/propgrid/advprops.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -15598,6 +15608,9 @@ $(OBJS)\auidll_auibar.o: ../../src/aui/auibar.cpp
$(OBJS)\auidll_tabmdi.o: ../../src/aui/tabmdi.cpp $(OBJS)\auidll_tabmdi.o: ../../src/aui/tabmdi.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auidll_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(AUIDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp $(OBJS)\auilib_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
@@ -15619,6 +15632,9 @@ $(OBJS)\auilib_auibar.o: ../../src/aui/auibar.cpp
$(OBJS)\auilib_tabmdi.o: ../../src/aui/tabmdi.cpp $(OBJS)\auilib_tabmdi.o: ../../src/aui/tabmdi.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\auilib_tabart.o: ../../src/aui/tabart.cpp
$(CXX) -c -o $@ $(AUILIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp $(OBJS)\ribbondll_dummy.o: ../../src/common/dummy.cpp
$(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(RIBBONDLL_CXXFLAGS) $(CPPDEPS) $<

20
build/msw/makefile.vc
View File

@@ -1463,7 +1463,8 @@ AUIDLL_OBJECTS = \
$(OBJS)\auidll_floatpane.obj \ $(OBJS)\auidll_floatpane.obj \
$(OBJS)\auidll_auibook.obj \ $(OBJS)\auidll_auibook.obj \
$(OBJS)\auidll_auibar.obj \ $(OBJS)\auidll_auibar.obj \
$(OBJS)\auidll_tabmdi.obj $(OBJS)\auidll_tabmdi.obj \
$(OBJS)\auidll_tabart.obj
AUIDLL_RESOURCES = \ AUIDLL_RESOURCES = \
$(OBJS)\auidll_version.res $(OBJS)\auidll_version.res
AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \ AUILIB_CXXFLAGS = /M$(__RUNTIME_LIBS_472)$(__DEBUGRUNTIME) /DWIN32 \
@@ -1486,7 +1487,8 @@ AUILIB_OBJECTS = \
$(OBJS)\auilib_floatpane.obj \ $(OBJS)\auilib_floatpane.obj \
$(OBJS)\auilib_auibook.obj \ $(OBJS)\auilib_auibook.obj \
$(OBJS)\auilib_auibar.obj \ $(OBJS)\auilib_auibar.obj \
$(OBJS)\auilib_tabmdi.obj $(OBJS)\auilib_tabmdi.obj \
$(OBJS)\auilib_tabart.obj
RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \ RIBBONDLL_CXXFLAGS = /M$(__RUNTIME_LIBS_488)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) \ $(__DEBUGINFO) \
/Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \ /Fd$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon_vc$(VENDORTAG).pdb \
@@ -1969,6 +1971,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_auibook.obj \ $(OBJS)\monodll_auibook.obj \
$(OBJS)\monodll_auibar.obj \ $(OBJS)\monodll_auibar.obj \
$(OBJS)\monodll_tabmdi.obj \ $(OBJS)\monodll_tabmdi.obj \
$(OBJS)\monodll_tabart.obj \
$(OBJS)\monodll_advprops.obj \ $(OBJS)\monodll_advprops.obj \
$(OBJS)\monodll_editors.obj \ $(OBJS)\monodll_editors.obj \
$(OBJS)\monodll_manager.obj \ $(OBJS)\monodll_manager.obj \
@@ -2758,6 +2761,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_auibook.obj \ $(OBJS)\monolib_auibook.obj \
$(OBJS)\monolib_auibar.obj \ $(OBJS)\monolib_auibar.obj \
$(OBJS)\monolib_tabmdi.obj \ $(OBJS)\monolib_tabmdi.obj \
$(OBJS)\monolib_tabart.obj \
$(OBJS)\monolib_advprops.obj \ $(OBJS)\monolib_advprops.obj \
$(OBJS)\monolib_editors.obj \ $(OBJS)\monolib_editors.obj \
$(OBJS)\monolib_manager.obj \ $(OBJS)\monolib_manager.obj \
@@ -7745,6 +7749,9 @@ $(OBJS)\monodll_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\monodll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\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_advprops.obj: ..\..\src\propgrid\advprops.cpp $(OBJS)\monodll_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -10150,6 +10157,9 @@ $(OBJS)\monolib_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\monolib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\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_advprops.obj: ..\..\src\propgrid\advprops.cpp $(OBJS)\monolib_advprops.obj: ..\..\src\propgrid\advprops.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp $(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\propgrid\advprops.cpp
@@ -16103,6 +16113,9 @@ $(OBJS)\auidll_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\auidll_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
$(OBJS)\auidll_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUIDLL_CXXFLAGS) ..\..\src\aui\tabart.cpp
$(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\auilib_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp
@@ -16124,6 +16137,9 @@ $(OBJS)\auilib_auibar.obj: ..\..\src\aui\auibar.cpp
$(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp $(OBJS)\auilib_tabmdi.obj: ..\..\src\aui\tabmdi.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp $(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabmdi.cpp
$(OBJS)\auilib_tabart.obj: ..\..\src\aui\tabart.cpp
$(CXX) /c /nologo /TP /Fo$@ $(AUILIB_CXXFLAGS) ..\..\src\aui\tabart.cpp
$(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp $(OBJS)\ribbondll_dummy.obj: ..\..\src\common\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp $(CXX) /c /nologo /TP /Fo$@ $(RIBBONDLL_CXXFLAGS) /Ycwx/wxprec.h ..\..\src\common\dummy.cpp

20
build/msw/makefile.wat
View File

@@ -211,6 +211,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_auibook.obj & $(OBJS)\monodll_auibook.obj &
$(OBJS)\monodll_auibar.obj & $(OBJS)\monodll_auibar.obj &
$(OBJS)\monodll_tabmdi.obj & $(OBJS)\monodll_tabmdi.obj &
$(OBJS)\monodll_tabart.obj &
$(OBJS)\monodll_advprops.obj & $(OBJS)\monodll_advprops.obj &
$(OBJS)\monodll_editors.obj & $(OBJS)\monodll_editors.obj &
$(OBJS)\monodll_manager.obj & $(OBJS)\monodll_manager.obj &
@@ -1005,6 +1006,7 @@ ____MONOLIB_GUI_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_auibook.obj & $(OBJS)\monolib_auibook.obj &
$(OBJS)\monolib_auibar.obj & $(OBJS)\monolib_auibar.obj &
$(OBJS)\monolib_tabmdi.obj & $(OBJS)\monolib_tabmdi.obj &
$(OBJS)\monolib_tabart.obj &
$(OBJS)\monolib_advprops.obj & $(OBJS)\monolib_advprops.obj &
$(OBJS)\monolib_editors.obj & $(OBJS)\monolib_editors.obj &
$(OBJS)\monolib_manager.obj & $(OBJS)\monolib_manager.obj &
@@ -4844,7 +4846,8 @@ AUIDLL_OBJECTS = &
$(OBJS)\auidll_floatpane.obj & $(OBJS)\auidll_floatpane.obj &
$(OBJS)\auidll_auibook.obj & $(OBJS)\auidll_auibook.obj &
$(OBJS)\auidll_auibar.obj & $(OBJS)\auidll_auibar.obj &
$(OBJS)\auidll_tabmdi.obj $(OBJS)\auidll_tabmdi.obj &
$(OBJS)\auidll_tabart.obj
AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & AUILIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@@ -4861,7 +4864,8 @@ AUILIB_OBJECTS = &
$(OBJS)\auilib_floatpane.obj & $(OBJS)\auilib_floatpane.obj &
$(OBJS)\auilib_auibook.obj & $(OBJS)\auilib_auibook.obj &
$(OBJS)\auilib_auibar.obj & $(OBJS)\auilib_auibar.obj &
$(OBJS)\auilib_tabmdi.obj $(OBJS)\auilib_tabmdi.obj &
$(OBJS)\auilib_tabart.obj
RIBBONDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) & RIBBONDLL_CXXFLAGS = -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) & $(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) & $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) &
@@ -7511,6 +7515,9 @@ $(OBJS)\monodll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp
$(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(OBJS)\monodll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp $(OBJS)\monodll_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -9916,6 +9923,9 @@ $(OBJS)\monolib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp
$(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(OBJS)\monolib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp $(OBJS)\monolib_advprops.obj : .AUTODEPEND ..\..\src\propgrid\advprops.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -15869,6 +15879,9 @@ $(OBJS)\auidll_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp
$(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(OBJS)\auidll_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auidll_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUIDLL_CXXFLAGS) $<
$(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\auilib_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
@@ -15890,6 +15903,9 @@ $(OBJS)\auilib_auibar.obj : .AUTODEPEND ..\..\src\aui\auibar.cpp
$(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp $(OBJS)\auilib_tabmdi.obj : .AUTODEPEND ..\..\src\aui\tabmdi.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\auilib_tabart.obj : .AUTODEPEND ..\..\src\aui\tabart.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(AUILIB_CXXFLAGS) $<
$(OBJS)\ribbondll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp $(OBJS)\ribbondll_dummy.obj : .AUTODEPEND ..\..\src\common\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(RIBBONDLL_CXXFLAGS) $<

8
build/msw/wx_aui.dsp
View File

@@ -554,6 +554,10 @@ SOURCE=..\..\include\wx\aui\framemanager.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\aui\tabart.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\aui\tabmdi.h SOURCE=..\..\include\wx\aui\tabmdi.h
# End Source File # End Source File
# End Group # End Group
@@ -582,6 +586,10 @@ SOURCE=..\..\src\aui\framemanager.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\src\aui\tabart.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\aui\tabmdi.cpp SOURCE=..\..\src\aui\tabmdi.cpp
# End Source File # End Source File
# End Group # End Group

4
build/msw/wx_core.dsp
View File

@@ -6892,6 +6892,10 @@ SOURCE=..\..\include\wx\stc\stc.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\..\include\wx\aui\tabart.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\aui\tabmdi.h SOURCE=..\..\include\wx\aui\tabmdi.h
# End Source File # End Source File
# Begin Source File # Begin Source File

6
build/msw/wx_vc7_aui.vcproj
View File

@@ -789,6 +789,9 @@
<File <File
RelativePath="..\..\include\wx\aui\framemanager.h"> RelativePath="..\..\include\wx\aui\framemanager.h">
</File> </File>
<File
RelativePath="..\..\include\wx\aui\tabart.h">
</File>
<File <File
RelativePath="..\..\include\wx\aui\tabmdi.h"> RelativePath="..\..\include\wx\aui\tabmdi.h">
</File> </File>
@@ -812,6 +815,9 @@
<File <File
RelativePath="..\..\src\aui\framemanager.cpp"> RelativePath="..\..\src\aui\framemanager.cpp">
</File> </File>
<File
RelativePath="..\..\src\aui\tabart.cpp">
</File>
<File <File
RelativePath="..\..\src\aui\tabmdi.cpp"> RelativePath="..\..\src\aui\tabmdi.cpp">
</File> </File>

3
build/msw/wx_vc7_core.vcproj
View File

@@ -5744,6 +5744,9 @@
<File <File
RelativePath="..\..\include\wx\stc\stc.h"> RelativePath="..\..\include\wx\stc\stc.h">
</File> </File>
<File
RelativePath="..\..\include\wx\aui\tabart.h">
</File>
<File <File
RelativePath="..\..\include\wx\aui\tabmdi.h"> RelativePath="..\..\include\wx\aui\tabmdi.h">
</File> </File>

8
build/msw/wx_vc8_aui.vcproj
View File

@@ -1074,6 +1074,10 @@
RelativePath="..\..\include\wx\aui\framemanager.h" RelativePath="..\..\include\wx\aui\framemanager.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\aui\tabart.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\aui\tabmdi.h" RelativePath="..\..\include\wx\aui\tabmdi.h"
> >
@@ -1104,6 +1108,10 @@
RelativePath="..\..\src\aui\framemanager.cpp" RelativePath="..\..\src\aui\framemanager.cpp"
> >
</File> </File>
<File
RelativePath="..\..\src\aui\tabart.cpp"
>
</File>
<File <File
RelativePath="..\..\src\aui\tabmdi.cpp" RelativePath="..\..\src\aui\tabmdi.cpp"
> >

4
build/msw/wx_vc8_core.vcproj
View File

@@ -7679,6 +7679,10 @@
RelativePath="..\..\include\wx\stc\stc.h" RelativePath="..\..\include\wx\stc\stc.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\aui\tabart.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\aui\tabmdi.h" RelativePath="..\..\include\wx\aui\tabmdi.h"
> >

8
build/msw/wx_vc9_aui.vcproj
View File

@@ -1070,6 +1070,10 @@
RelativePath="..\..\include\wx\aui\framemanager.h" RelativePath="..\..\include\wx\aui\framemanager.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\aui\tabart.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\aui\tabmdi.h" RelativePath="..\..\include\wx\aui\tabmdi.h"
> >
@@ -1100,6 +1104,10 @@
RelativePath="..\..\src\aui\framemanager.cpp" RelativePath="..\..\src\aui\framemanager.cpp"
> >
</File> </File>
<File
RelativePath="..\..\src\aui\tabart.cpp"
>
</File>
<File <File
RelativePath="..\..\src\aui\tabmdi.cpp" RelativePath="..\..\src\aui\tabmdi.cpp"
> >

4
build/msw/wx_vc9_core.vcproj
View File

@@ -7675,6 +7675,10 @@
RelativePath="..\..\include\wx\stc\stc.h" RelativePath="..\..\include\wx\stc\stc.h"
> >
</File> </File>
<File
RelativePath="..\..\include\wx\aui\tabart.h"
>
</File>
<File <File
RelativePath="..\..\include\wx\aui\tabmdi.h" RelativePath="..\..\include\wx\aui\tabmdi.h"
> >

253
include/wx/aui/auibook.h
View File

@@ -2,7 +2,7 @@
// Name: wx/aui/auibook.h // Name: wx/aui/auibook.h
// Purpose: wxaui: wx advanced user interface - notebook // Purpose: wxaui: wx advanced user interface - notebook
// Author: Benjamin I. Williams // Author: Benjamin I. Williams
// Modified by: // Modified by: Jens Lody
// Created: 2006-06-28 // Created: 2006-06-28
// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved. // Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1 // Licence: wxWindows Library Licence, Version 3.1
@@ -21,9 +21,8 @@
#if wxUSE_AUI #if wxUSE_AUI
#include "wx/aui/tabart.h"
#include "wx/aui/framemanager.h" #include "wx/aui/framemanager.h"
#include "wx/aui/dockart.h"
#include "wx/aui/floatpane.h"
#include "wx/bookctrl.h" #include "wx/bookctrl.h"
@@ -119,254 +118,6 @@ WX_DECLARE_USER_EXPORTED_OBJARRAY(wxAuiTabContainerButton, wxAuiTabContainerButt
#endif #endif
// tab art class
class WXDLLIMPEXP_AUI wxAuiTabArt
{
public:
wxAuiTabArt() { }
virtual ~wxAuiTabArt() { }
virtual wxAuiTabArt* Clone() = 0;
virtual void SetFlags(unsigned int flags) = 0;
virtual void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount) = 0;
virtual void SetNormalFont(const wxFont& font) = 0;
virtual void SetSelectedFont(const wxFont& font) = 0;
virtual void SetMeasuringFont(const wxFont& font) = 0;
virtual void SetColour(const wxColour& colour) = 0;
virtual void SetActiveColour(const wxColour& colour) = 0;
virtual void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect) = 0;
virtual void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& pane,
const wxRect& inRect,
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent) = 0;
virtual void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& inRect,
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect) = 0;
virtual wxSize GetTabSize(
wxDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent) = 0;
virtual int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx) = 0;
virtual int GetIndentSize() = 0;
virtual int GetBestTabCtrlSize(
wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize) = 0;
};
class WXDLLIMPEXP_AUI wxAuiDefaultTabArt : public wxAuiTabArt
{
public:
wxAuiDefaultTabArt();
virtual ~wxAuiDefaultTabArt();
wxAuiTabArt* Clone();
void SetFlags(unsigned int flags);
void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount);
void SetNormalFont(const wxFont& font);
void SetSelectedFont(const wxFont& font);
void SetMeasuringFont(const wxFont& font);
void SetColour(const wxColour& colour);
void SetActiveColour(const wxColour& colour);
void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& pane,
const wxRect& inRect,
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent);
void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& inRect,
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect);
int GetIndentSize();
wxSize GetTabSize(
wxDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent);
int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx);
int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize);
protected:
wxFont m_normalFont;
wxFont m_selectedFont;
wxFont m_measuringFont;
wxColour m_baseColour;
wxPen m_baseColourPen;
wxPen m_borderPen;
wxBrush m_baseColourBrush;
wxColour m_activeColour;
wxBitmap m_activeCloseBmp;
wxBitmap m_disabledCloseBmp;
wxBitmap m_activeLeftBmp;
wxBitmap m_disabledLeftBmp;
wxBitmap m_activeRightBmp;
wxBitmap m_disabledRightBmp;
wxBitmap m_activeWindowListBmp;
wxBitmap m_disabledWindowListBmp;
int m_fixedTabWidth;
int m_tabCtrlHeight;
unsigned int m_flags;
};
class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt
{
public:
wxAuiSimpleTabArt();
virtual ~wxAuiSimpleTabArt();
wxAuiTabArt* Clone();
void SetFlags(unsigned int flags);
void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount);
void SetNormalFont(const wxFont& font);
void SetSelectedFont(const wxFont& font);
void SetMeasuringFont(const wxFont& font);
void SetColour(const wxColour& colour);
void SetActiveColour(const wxColour& colour);
void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& pane,
const wxRect& inRect,
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent);
void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& inRect,
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect);
int GetIndentSize();
wxSize GetTabSize(
wxDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent);
int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx);
int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize);
protected:
wxFont m_normalFont;
wxFont m_selectedFont;
wxFont m_measuringFont;
wxPen m_normalBkPen;
wxPen m_selectedBkPen;
wxBrush m_normalBkBrush;
wxBrush m_selectedBkBrush;
wxBrush m_bkBrush;
wxBitmap m_activeCloseBmp;
wxBitmap m_disabledCloseBmp;
wxBitmap m_activeLeftBmp;
wxBitmap m_disabledLeftBmp;
wxBitmap m_activeRightBmp;
wxBitmap m_disabledRightBmp;
wxBitmap m_activeWindowListBmp;
wxBitmap m_disabledWindowListBmp;
int m_fixedTabWidth;
unsigned int m_flags;
};
class WXDLLIMPEXP_AUI wxAuiTabContainer class WXDLLIMPEXP_AUI wxAuiTabContainer
{ {
public: public:

282
include/wx/aui/tabart.h Normal file
View File

@@ -0,0 +1,282 @@
//////////////////////////////////////////////////////////////////////////////
// Name: wx/aui/tabart.h
// Purpose: wxaui: wx advanced user interface - notebook
// Author: Benjamin I. Williams
// Modified by: Jens Lody (extracted from wx/aui/auibook.h)
// Created: 2012-03-21
// RCS-ID: $Id:$
// Copyright: (C) Copyright 2006, Kirix Corporation, All Rights Reserved.
// Licence: wxWindows Library Licence, Version 3.1
///////////////////////////////////////////////////////////////////////////////
#ifndef _WX_AUI_TABART_H_
#define _WX_AUI_TABART_H_
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
#include "wx/defs.h"
#if wxUSE_AUI
#include "wx/colour.h"
#include "wx/gdicmn.h"
#include "wx/font.h"
#include "wx/pen.h"
#include "wx/brush.h"
#include "wx/bitmap.h"
class wxAuiNotebookPage;
class wxAuiNotebookPageArray;
class wxWindow;
class wxDC;
// tab art class
class WXDLLIMPEXP_AUI wxAuiTabArt
{
public:
wxAuiTabArt() { }
virtual ~wxAuiTabArt() { }
virtual wxAuiTabArt* Clone() = 0;
virtual void SetFlags(unsigned int flags) = 0;
virtual void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount) = 0;
virtual void SetNormalFont(const wxFont& font) = 0;
virtual void SetSelectedFont(const wxFont& font) = 0;
virtual void SetMeasuringFont(const wxFont& font) = 0;
virtual void SetColour(const wxColour& colour) = 0;
virtual void SetActiveColour(const wxColour& colour) = 0;
virtual void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect) = 0;
virtual void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& pane,
const wxRect& inRect,
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent) = 0;
virtual void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& inRect,
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect) = 0;
virtual wxSize GetTabSize(
wxDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent) = 0;
virtual int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx) = 0;
virtual int GetIndentSize() = 0;
virtual int GetBestTabCtrlSize(
wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize) = 0;
};
class WXDLLIMPEXP_AUI wxAuiGenericTabArt : public wxAuiTabArt
{
public:
wxAuiGenericTabArt();
virtual ~wxAuiGenericTabArt();
wxAuiTabArt* Clone();
void SetFlags(unsigned int flags);
void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount);
void SetNormalFont(const wxFont& font);
void SetSelectedFont(const wxFont& font);
void SetMeasuringFont(const wxFont& font);
void SetColour(const wxColour& colour);
void SetActiveColour(const wxColour& colour);
void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& pane,
const wxRect& inRect,
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent);
void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& inRect,
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect);
int GetIndentSize();
wxSize GetTabSize(
wxDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent);
int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx);
int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize);
protected:
wxFont m_normalFont;
wxFont m_selectedFont;
wxFont m_measuringFont;
wxColour m_baseColour;
wxPen m_baseColourPen;
wxPen m_borderPen;
wxBrush m_baseColourBrush;
wxColour m_activeColour;
wxBitmap m_activeCloseBmp;
wxBitmap m_disabledCloseBmp;
wxBitmap m_activeLeftBmp;
wxBitmap m_disabledLeftBmp;
wxBitmap m_activeRightBmp;
wxBitmap m_disabledRightBmp;
wxBitmap m_activeWindowListBmp;
wxBitmap m_disabledWindowListBmp;
int m_fixedTabWidth;
int m_tabCtrlHeight;
unsigned int m_flags;
};
class WXDLLIMPEXP_AUI wxAuiSimpleTabArt : public wxAuiTabArt
{
public:
wxAuiSimpleTabArt();
virtual ~wxAuiSimpleTabArt();
wxAuiTabArt* Clone();
void SetFlags(unsigned int flags);
void SetSizingInfo(const wxSize& tabCtrlSize,
size_t tabCount);
void SetNormalFont(const wxFont& font);
void SetSelectedFont(const wxFont& font);
void SetMeasuringFont(const wxFont& font);
void SetColour(const wxColour& colour);
void SetActiveColour(const wxColour& colour);
void DrawBackground(
wxDC& dc,
wxWindow* wnd,
const wxRect& rect);
void DrawTab(wxDC& dc,
wxWindow* wnd,
const wxAuiNotebookPage& pane,
const wxRect& inRect,
int closeButtonState,
wxRect* outTabRect,
wxRect* outButtonRect,
int* xExtent);
void DrawButton(
wxDC& dc,
wxWindow* wnd,
const wxRect& inRect,
int bitmapId,
int buttonState,
int orientation,
wxRect* outRect);
int GetIndentSize();
wxSize GetTabSize(
wxDC& dc,
wxWindow* wnd,
const wxString& caption,
const wxBitmap& bitmap,
bool active,
int closeButtonState,
int* xExtent);
int ShowDropDown(
wxWindow* wnd,
const wxAuiNotebookPageArray& items,
int activeIdx);
int GetBestTabCtrlSize(wxWindow* wnd,
const wxAuiNotebookPageArray& pages,
const wxSize& requiredBmpSize);
protected:
wxFont m_normalFont;
wxFont m_selectedFont;
wxFont m_measuringFont;
wxPen m_normalBkPen;
wxPen m_selectedBkPen;
wxBrush m_normalBkBrush;
wxBrush m_selectedBkBrush;
wxBrush m_bkBrush;
wxBitmap m_activeCloseBmp;
wxBitmap m_disabledCloseBmp;
wxBitmap m_activeLeftBmp;
wxBitmap m_disabledLeftBmp;
wxBitmap m_activeRightBmp;
wxBitmap m_disabledRightBmp;
wxBitmap m_activeWindowListBmp;
wxBitmap m_disabledWindowListBmp;
int m_fixedTabWidth;
unsigned int m_flags;
};
#define wxAuiDefaultTabArt wxAuiGenericTabArt
#endif // wxUSE_AUI
#endif // _WX_AUI_TABART_H_

1236
src/aui/auibook.cpp
View File

File diff suppressed because it is too large Load Diff

1260
src/aui/tabart.cpp Normal file
View File

File diff suppressed because it is too large Load Diff