Implement native wxAuiTabArt for MSW
This wxAuiTabArt implementation uses Windows uxtheme API to draw AUI tabs. A fallback to generic tab art is implemented for the bottom tabs or if uxtheme is not available (disabled by user or no manifest file). Closes https://github.com/wxWidgets/wxWidgets/pull/105
This commit is contained in:
Vadim Zeitlin
parent
1a8bcd4d88
commit
de96b0dae7
19 changed files with 731 additions and 9 deletions
26
Makefile.in
26
Makefile.in
|
|
@ -1883,7 +1883,8 @@ AUIDLL_OBJECTS = \
|
|||
auidll_tabart.o \
|
||||
auidll_xh_auinotbk.o \
|
||||
auidll_xh_auitoolb.o \
|
||||
$(__AUI_GTK_SRC_OBJECTS_2)
|
||||
$(__AUI_GTK_SRC_OBJECTS_2) \
|
||||
$(__AUI_PLATFORM_SRC_OBJECTS_2)
|
||||
AUIDLL_ODEP = $(_____pch_wxprec_auidll_wx_wxprec_h_gch___depname)
|
||||
AUILIB_CXXFLAGS = $(__auilib_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
|
||||
|
|
@ -1900,7 +1901,8 @@ AUILIB_OBJECTS = \
|
|||
auilib_tabart.o \
|
||||
auilib_xh_auinotbk.o \
|
||||
auilib_xh_auitoolb.o \
|
||||
$(__AUI_GTK_SRC_OBJECTS_3)
|
||||
$(__AUI_GTK_SRC_OBJECTS_3) \
|
||||
$(__AUI_PLATFORM_SRC_OBJECTS_3)
|
||||
AUILIB_ODEP = $(_____pch_wxprec_auilib_wx_wxprec_h_gch___depname)
|
||||
RIBBONDLL_CXXFLAGS = $(__ribbondll_PCH_INC) -D__WX$(TOOLKIT)__ \
|
||||
$(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
|
||||
|
|
@ -2226,6 +2228,7 @@ COND_TOOLKIT_MSW_WEBVIEW_HDR_PLATFORM = \
|
|||
@COND_TOOLKIT_Qt@OPENGL_HDR_PLATFORM = wx/qt/glcanvas.h
|
||||
@COND_TOOLKIT_X11@OPENGL_HDR_PLATFORM = wx/x11/glcanvas.h wx/unix/glx11.h
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@AUI_GTK_HDR = wx/aui/tabartgtk.h
|
||||
@COND_TOOLKIT_MSW@AUI_PLATFORM_HDR = wx/aui/tabartmsw.h
|
||||
COND_TOOLKIT_OSX_CARBON_BASE_OSX_SRC = \
|
||||
src/osx/core/mimetype.cpp \
|
||||
src/osx/core/cfstring.cpp \
|
||||
|
|
@ -4247,6 +4250,7 @@ COND_USE_GUI_1_ALL_GUI_HEADERS = \
|
|||
wx/xrc/xh_auinotbk.h \
|
||||
wx/xrc/xh_auitoolb.h \
|
||||
$(AUI_GTK_HDR) \
|
||||
$(AUI_PLATFORM_HDR) \
|
||||
wx/propgrid/advprops.h \
|
||||
wx/propgrid/editors.h \
|
||||
wx/propgrid/manager.h \
|
||||
|
|
@ -4554,6 +4558,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS = \
|
|||
monodll_xh_auinotbk.o \
|
||||
monodll_xh_auitoolb.o \
|
||||
$(__AUI_GTK_SRC_OBJECTS) \
|
||||
$(__AUI_PLATFORM_SRC_OBJECTS) \
|
||||
monodll_advprops.o \
|
||||
monodll_editors.o \
|
||||
monodll_manager.o \
|
||||
|
|
@ -6505,6 +6510,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_1 = \
|
|||
@COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS = monodll_webview_ie.o
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS \
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monodll_tabartgtk.o
|
||||
@COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS = monodll_tabartmsw.o
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS \
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monodll_sound_sdl.o
|
||||
@COND_PLATFORM_WIN32_1@__monodll___win32rc = monodll_version_rc.o
|
||||
|
|
@ -6716,6 +6722,7 @@ COND_USE_GUI_1___MONOLIB_GUI_SRC_OBJECTS_1 = \
|
|||
monolib_xh_auinotbk.o \
|
||||
monolib_xh_auitoolb.o \
|
||||
$(__AUI_GTK_SRC_OBJECTS_1) \
|
||||
$(__AUI_PLATFORM_SRC_OBJECTS_1) \
|
||||
monolib_advprops.o \
|
||||
monolib_editors.o \
|
||||
monolib_manager.o \
|
||||
|
|
@ -8669,6 +8676,7 @@ COND_TOOLKIT_X11___ADVANCED_PLATFORM_SRC_OBJECTS_3 = \
|
|||
@COND_TOOLKIT_MSW@__WEBVIEW_SRC_PLATFORM_OBJECTS_1 = monolib_webview_ie.o
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_1 \
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = monolib_tabartgtk.o
|
||||
@COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_1 = monolib_tabartmsw.o
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@__PLUGIN_ADV_SRC_OBJECTS_1 \
|
||||
@COND_PLATFORM_UNIX_1_USE_PLUGINS_0@ = monolib_sound_sdl.o
|
||||
COND_MONOLITHIC_0_SHARED_1___basedll___depname = \
|
||||
|
|
@ -13565,6 +13573,7 @@ COND_USE_SOVERSOLARIS_1___auidll___so_symlinks_uninst_cmd = rm -f \
|
|||
@COND_PLATFORM_WIN32_1@__auidll___win32rc = auidll_version_rc.o
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_2 \
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = auidll_tabartgtk.o
|
||||
@COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_2 = auidll_tabartmsw.o
|
||||
COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
|
||||
$(LIBDIRNAME)/$(LIBPREFIX)wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
|
||||
@COND_MONOLITHIC_0_SHARED_0_USE_AUI_1@__auilib___depname = $(COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname)
|
||||
|
|
@ -13579,6 +13588,7 @@ COND_MONOLITHIC_0_SHARED_0_USE_AUI_1___auilib___depname = \
|
|||
@COND_USE_PCH_1@ = ./.pch/wxprec_auilib/wx/wxprec.h.gch
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@__AUI_GTK_SRC_OBJECTS_3 \
|
||||
@COND_TOOLKIT_GTK_TOOLKIT_VERSION_2@ = auilib_tabartgtk.o
|
||||
@COND_TOOLKIT_MSW@__AUI_PLATFORM_SRC_OBJECTS_3 = auilib_tabartmsw.o
|
||||
@COND_SHARED_1@____wxaui_namedll_DEP = $(__auidll___depname)
|
||||
@COND_SHARED_0@____wxaui_namelib_DEP = $(__auilib___depname)
|
||||
COND_MONOLITHIC_0_SHARED_1_USE_RIBBON_1___ribbondll___depname = \
|
||||
|
|
@ -18252,6 +18262,9 @@ monodll_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(MONODLL_ODEP)
|
|||
monodll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
|
||||
|
||||
monodll_tabartmsw.o: $(srcdir)/src/aui/tabartmsw.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/aui/tabartmsw.cpp
|
||||
|
||||
monodll_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONODLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
|
||||
|
||||
|
|
@ -23766,6 +23779,9 @@ monolib_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(MONOLIB_ODEP)
|
|||
monolib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
|
||||
|
||||
monolib_tabartmsw.o: $(srcdir)/src/aui/tabartmsw.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/aui/tabartmsw.cpp
|
||||
|
||||
monolib_advprops.o: $(srcdir)/src/propgrid/advprops.cpp $(MONOLIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/propgrid/advprops.cpp
|
||||
|
||||
|
|
@ -38346,6 +38362,9 @@ auidll_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(AUIDLL_ODEP)
|
|||
auidll_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUIDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
|
||||
|
||||
auidll_tabartmsw.o: $(srcdir)/src/aui/tabartmsw.cpp $(AUIDLL_ODEP)
|
||||
$(CXXC) -c -o $@ $(AUIDLL_CXXFLAGS) $(srcdir)/src/aui/tabartmsw.cpp
|
||||
|
||||
auilib_framemanager.o: $(srcdir)/src/aui/framemanager.cpp $(AUILIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/framemanager.cpp
|
||||
|
||||
|
|
@ -38376,6 +38395,9 @@ auilib_xh_auitoolb.o: $(srcdir)/src/xrc/xh_auitoolb.cpp $(AUILIB_ODEP)
|
|||
auilib_tabartgtk.o: $(srcdir)/src/aui/tabartgtk.cpp $(AUILIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabartgtk.cpp
|
||||
|
||||
auilib_tabartmsw.o: $(srcdir)/src/aui/tabartmsw.cpp $(AUILIB_ODEP)
|
||||
$(CXXC) -c -o $@ $(AUILIB_CXXFLAGS) $(srcdir)/src/aui/tabartmsw.cpp
|
||||
|
||||
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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue