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

Allow using wxCollapsibleHeaderCtrl in wxGTK too

Browse Source 
The implementation file for this control somehow wasn't used in wxGTK build,
fix this and, in fact, include it in common sources as there is only a generic
implementation of this control so far.

Closes #17309.
This commit is contained in:
Vadim Zeitlin
2016-02-08 01:00:57 +01:00
parent 2fe6f9ea59
commit f0da6aa0ae
6 changed files with 118 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
build/msw/makefile.vc
View File

@@ -2188,7 +2188,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_msw_tglbtn.obj \
$(OBJS)\monodll_treectrl.obj \
$(OBJS)\monodll_systhemectrl.obj \
$(OBJS)\monodll_collheaderctrlg.obj \
$(OBJS)\monodll_msw_checklst.obj \
$(OBJS)\monodll_msw_fdrepdlg.obj \
$(OBJS)\monodll_fontdlg.obj \
@@ -2324,6 +2323,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_generic_buttonbar.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
$(OBJS)\monodll_collheaderctrlg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
@@ -2465,7 +2465,6 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_univ_toolbar.obj \
$(OBJS)\monodll_topluniv.obj \
$(OBJS)\monodll_winuniv.obj \
$(OBJS)\monodll_collheaderctrlg.obj \
$(OBJS)\monodll_gtk.obj \
$(OBJS)\monodll_metal.obj \
$(OBJS)\monodll_mono.obj \
@@ -2602,6 +2601,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_generic_buttonbar.obj \
$(OBJS)\monodll_choicdgg.obj \
$(OBJS)\monodll_choicbkg.obj \
$(OBJS)\monodll_collheaderctrlg.obj \
$(OBJS)\monodll_combog.obj \
$(OBJS)\monodll_dcpsg.obj \
$(OBJS)\monodll_dirctrlg.obj \
@@ -3016,7 +3016,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_msw_tglbtn.obj \
$(OBJS)\monolib_treectrl.obj \
$(OBJS)\monolib_systhemectrl.obj \
$(OBJS)\monolib_collheaderctrlg.obj \
$(OBJS)\monolib_msw_checklst.obj \
$(OBJS)\monolib_msw_fdrepdlg.obj \
$(OBJS)\monolib_fontdlg.obj \
@@ -3152,6 +3151,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_generic_buttonbar.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
$(OBJS)\monolib_collheaderctrlg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
@@ -3293,7 +3293,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_univ_toolbar.obj \
$(OBJS)\monolib_topluniv.obj \
$(OBJS)\monolib_winuniv.obj \
$(OBJS)\monolib_collheaderctrlg.obj \
$(OBJS)\monolib_gtk.obj \
$(OBJS)\monolib_metal.obj \
$(OBJS)\monolib_mono.obj \
@@ -3430,6 +3429,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_generic_buttonbar.obj \
$(OBJS)\monolib_choicdgg.obj \
$(OBJS)\monolib_choicbkg.obj \
$(OBJS)\monolib_collheaderctrlg.obj \
$(OBJS)\monolib_combog.obj \
$(OBJS)\monolib_dcpsg.obj \
$(OBJS)\monolib_dirctrlg.obj \
@@ -3777,7 +3777,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_msw_tglbtn.obj \
$(OBJS)\coredll_treectrl.obj \
$(OBJS)\coredll_systhemectrl.obj \
$(OBJS)\coredll_collheaderctrlg.obj \
$(OBJS)\coredll_msw_checklst.obj \
$(OBJS)\coredll_msw_fdrepdlg.obj \
$(OBJS)\coredll_fontdlg.obj \
@@ -3913,6 +3912,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
$(OBJS)\coredll_collheaderctrlg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
@@ -4054,7 +4054,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_univ_toolbar.obj \
$(OBJS)\coredll_topluniv.obj \
$(OBJS)\coredll_winuniv.obj \
$(OBJS)\coredll_collheaderctrlg.obj \
$(OBJS)\coredll_gtk.obj \
$(OBJS)\coredll_metal.obj \
$(OBJS)\coredll_mono.obj \
@@ -4191,6 +4190,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_buttonbar.obj \
$(OBJS)\coredll_choicdgg.obj \
$(OBJS)\coredll_choicbkg.obj \
$(OBJS)\coredll_collheaderctrlg.obj \
$(OBJS)\coredll_combog.obj \
$(OBJS)\coredll_dcpsg.obj \
$(OBJS)\coredll_dirctrlg.obj \
@@ -4351,7 +4351,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_msw_tglbtn.obj \
$(OBJS)\corelib_treectrl.obj \
$(OBJS)\corelib_systhemectrl.obj \
$(OBJS)\corelib_collheaderctrlg.obj \
$(OBJS)\corelib_msw_checklst.obj \
$(OBJS)\corelib_msw_fdrepdlg.obj \
$(OBJS)\corelib_fontdlg.obj \
@@ -4487,6 +4486,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
$(OBJS)\corelib_collheaderctrlg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
@@ -4628,7 +4628,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_univ_toolbar.obj \
$(OBJS)\corelib_topluniv.obj \
$(OBJS)\corelib_winuniv.obj \
$(OBJS)\corelib_collheaderctrlg.obj \
$(OBJS)\corelib_gtk.obj \
$(OBJS)\corelib_metal.obj \
$(OBJS)\corelib_mono.obj \
@@ -4765,6 +4764,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_buttonbar.obj \
$(OBJS)\corelib_choicdgg.obj \
$(OBJS)\corelib_choicbkg.obj \
$(OBJS)\corelib_collheaderctrlg.obj \
$(OBJS)\corelib_combog.obj \
$(OBJS)\corelib_dcpsg.obj \
$(OBJS)\corelib_dirctrlg.obj \
@@ -8498,11 +8498,6 @@ $(OBJS)\monodll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
@@ -9163,6 +9158,11 @@ $(OBJS)\monodll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\combog.cpp
@@ -11008,11 +11008,6 @@ $(OBJS)\monolib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
@@ -11673,6 +11668,11 @@ $(OBJS)\monolib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\combog.cpp
@@ -13452,11 +13452,6 @@ $(OBJS)\coredll_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\evtloop.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_accelcmn.obj: ..\..\src\common\accelcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\accelcmn.cpp
@@ -14117,6 +14112,11 @@ $(OBJS)\coredll_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\combog.cpp
@@ -14921,11 +14921,6 @@ $(OBJS)\corelib_evtloop.obj: ..\..\src\msw\evtloop.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\evtloop.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_accelcmn.obj: ..\..\src\common\accelcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\accelcmn.cpp
@@ -15586,6 +15581,11 @@ $(OBJS)\corelib_choicbkg.obj: ..\..\src\generic\choicbkg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\choicbkg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_collheaderctrlg.obj: ..\..\src\generic\collheaderctrlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\collheaderctrlg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_combog.obj: ..\..\src\generic\combog.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\combog.cpp