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

Steps towards implementing native-style, non-top-level toolbars on Mac

Browse Source 
by implementing a toolbar class that uses native buttons.
Ultimately this should allow wxToolbook and wxPropertySheetDialog
classes to look native, when we complete the button API improvements
to combine text, bitmaps and toggling.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38703 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2006-04-14 09:15:10 +00:00
parent 44c930ebba
commit 64d3ed176d
16 changed files with 718 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/files.bkl
View File

@@ -2516,6 +2516,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
<set var="ADVANCED_CMN_SRC" hints="files">
src/common/datavcmn.cpp
src/generic/buttonbar.cpp
src/generic/calctrl.cpp
src/generic/datavgen.cpp
src/generic/datectlg.cpp
@@ -2541,6 +2542,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/dataview.h
wx/dateevt.h
wx/dcbuffer.h
wx/generic/buttonbar.h
wx/generic/calctrl.h
wx/generic/datectrl.h
wx/generic/dataview.h

24
build/msw/makefile.bcc
View File

@@ -1545,6 +1545,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavcmn.obj \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_datectlg.obj \
@@ -1572,6 +1573,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavcmn.obj \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_datectlg.obj \
@@ -2082,6 +2084,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavcmn.obj \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_datectlg.obj \
@@ -2109,6 +2112,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavcmn.obj \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_datectlg.obj \
@@ -2957,6 +2961,7 @@ __advdll___depname = \
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_datavcmn.obj \
$(OBJS)\advdll_buttonbar.obj \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_datavgen.obj \
$(OBJS)\advdll_datectlg.obj \
@@ -2984,6 +2989,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_datavcmn.obj \
$(OBJS)\advdll_buttonbar.obj \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_datavgen.obj \
$(OBJS)\advdll_datectlg.obj \
@@ -3014,6 +3020,7 @@ __advlib___depname = \
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_datavcmn.obj \
$(OBJS)\advlib_buttonbar.obj \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_datavgen.obj \
$(OBJS)\advlib_datectlg.obj \
@@ -3041,6 +3048,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_datavcmn.obj \
$(OBJS)\advlib_buttonbar.obj \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_datavgen.obj \
$(OBJS)\advlib_datectlg.obj \
@@ -5688,6 +5696,11 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -7444,6 +7457,11 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10425,6 +10443,9 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) -q -c -P -o$@ $(ADVDLL_CXXFLAGS) $**
@@ -10500,6 +10521,9 @@ $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) -q -c -P -o$@ $(ADVLIB_CXXFLAGS) $**

24
build/msw/makefile.gcc
View File

@@ -1559,6 +1559,7 @@ endif
ifeq ($(WXUNIV),0)
____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavcmn.o \
$(OBJS)\monodll_buttonbar.o \
$(OBJS)\monodll_calctrl.o \
$(OBJS)\monodll_datavgen.o \
$(OBJS)\monodll_datectlg.o \
@@ -1586,6 +1587,7 @@ endif
ifeq ($(WXUNIV),1)
____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavcmn.o \
$(OBJS)\monodll_buttonbar.o \
$(OBJS)\monodll_calctrl.o \
$(OBJS)\monodll_datavgen.o \
$(OBJS)\monodll_datectlg.o \
@@ -2102,6 +2104,7 @@ endif
ifeq ($(WXUNIV),0)
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavcmn.o \
$(OBJS)\monolib_buttonbar.o \
$(OBJS)\monolib_calctrl.o \
$(OBJS)\monolib_datavgen.o \
$(OBJS)\monolib_datectlg.o \
@@ -2129,6 +2132,7 @@ endif
ifeq ($(WXUNIV),1)
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavcmn.o \
$(OBJS)\monolib_buttonbar.o \
$(OBJS)\monolib_calctrl.o \
$(OBJS)\monolib_datavgen.o \
$(OBJS)\monolib_datectlg.o \
@@ -3005,6 +3009,7 @@ endif
ifeq ($(WXUNIV),0)
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_datavcmn.o \
$(OBJS)\advdll_buttonbar.o \
$(OBJS)\advdll_calctrl.o \
$(OBJS)\advdll_datavgen.o \
$(OBJS)\advdll_datectlg.o \
@@ -3032,6 +3037,7 @@ endif
ifeq ($(WXUNIV),1)
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_datavcmn.o \
$(OBJS)\advdll_buttonbar.o \
$(OBJS)\advdll_calctrl.o \
$(OBJS)\advdll_datavgen.o \
$(OBJS)\advdll_datectlg.o \
@@ -3066,6 +3072,7 @@ endif
ifeq ($(WXUNIV),0)
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_datavcmn.o \
$(OBJS)\advlib_buttonbar.o \
$(OBJS)\advlib_calctrl.o \
$(OBJS)\advlib_datavgen.o \
$(OBJS)\advlib_datectlg.o \
@@ -3093,6 +3100,7 @@ endif
ifeq ($(WXUNIV),1)
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_datavcmn.o \
$(OBJS)\advlib_buttonbar.o \
$(OBJS)\advlib_calctrl.o \
$(OBJS)\advlib_datavgen.o \
$(OBJS)\advlib_datectlg.o \
@@ -5892,6 +5900,11 @@ $(OBJS)\monodll_datavcmn.o: ../../src/common/datavcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_buttonbar.o: ../../src/generic/buttonbar.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_calctrl.o: ../../src/generic/calctrl.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -7748,6 +7761,11 @@ $(OBJS)\monolib_datavcmn.o: ../../src/common/datavcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_buttonbar.o: ../../src/generic/buttonbar.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_calctrl.o: ../../src/generic/calctrl.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -10929,6 +10947,9 @@ $(OBJS)\advdll_datectrl.o: ../../src/msw/datectrl.cpp
$(OBJS)\advdll_datavcmn.o: ../../src/common/datavcmn.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_buttonbar.o: ../../src/generic/buttonbar.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advdll_calctrl.o: ../../src/generic/calctrl.cpp
$(CXX) -c -o $@ $(ADVDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -11004,6 +11025,9 @@ $(OBJS)\advlib_datectrl.o: ../../src/msw/datectrl.cpp
$(OBJS)\advlib_datavcmn.o: ../../src/common/datavcmn.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_buttonbar.o: ../../src/generic/buttonbar.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\advlib_calctrl.o: ../../src/generic/calctrl.cpp
$(CXX) -c -o $@ $(ADVLIB_CXXFLAGS) $(CPPDEPS) $<

24
build/msw/makefile.vc
View File

@@ -1704,6 +1704,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavcmn.obj \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_datectlg.obj \
@@ -1731,6 +1732,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_datavcmn.obj \
$(OBJS)\monodll_buttonbar.obj \
$(OBJS)\monodll_calctrl.obj \
$(OBJS)\monodll_datavgen.obj \
$(OBJS)\monodll_datectlg.obj \
@@ -2247,6 +2249,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavcmn.obj \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_datectlg.obj \
@@ -2274,6 +2277,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_datavcmn.obj \
$(OBJS)\monolib_buttonbar.obj \
$(OBJS)\monolib_calctrl.obj \
$(OBJS)\monolib_datavgen.obj \
$(OBJS)\monolib_datectlg.obj \
@@ -3164,6 +3168,7 @@ __RUNTIME_LIBS_195 = $(__THREADSFLAG)
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_datavcmn.obj \
$(OBJS)\advdll_buttonbar.obj \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_datavgen.obj \
$(OBJS)\advdll_datectlg.obj \
@@ -3191,6 +3196,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\advdll_datavcmn.obj \
$(OBJS)\advdll_buttonbar.obj \
$(OBJS)\advdll_calctrl.obj \
$(OBJS)\advdll_datavgen.obj \
$(OBJS)\advdll_datectlg.obj \
@@ -3227,6 +3233,7 @@ __RUNTIME_LIBS_208 = $(__THREADSFLAG)
!if "$(WXUNIV)" == "0"
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_datavcmn.obj \
$(OBJS)\advlib_buttonbar.obj \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_datavgen.obj \
$(OBJS)\advlib_datectlg.obj \
@@ -3254,6 +3261,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
!if "$(WXUNIV)" == "1"
____ADVANCED_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\advlib_datavcmn.obj \
$(OBJS)\advlib_buttonbar.obj \
$(OBJS)\advlib_calctrl.obj \
$(OBJS)\advlib_datavgen.obj \
$(OBJS)\advlib_datectlg.obj \
@@ -5997,6 +6005,11 @@ $(OBJS)\monodll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
@@ -7753,6 +7766,11 @@ $(OBJS)\monolib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
@@ -10734,6 +10752,9 @@ $(OBJS)\advdll_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\advdll_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
$(OBJS)\advdll_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVDLL_CXXFLAGS) $**
@@ -10809,6 +10830,9 @@ $(OBJS)\advlib_datectrl.obj: ..\..\src\msw\datectrl.cpp
$(OBJS)\advlib_datavcmn.obj: ..\..\src\common\datavcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_buttonbar.obj: ..\..\src\generic\buttonbar.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**
$(OBJS)\advlib_calctrl.obj: ..\..\src\generic\calctrl.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ADVLIB_CXXFLAGS) $**

24
build/msw/makefile.wat
View File

@@ -585,6 +585,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_datavcmn.obj &
$(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datavgen.obj &
$(OBJS)\monodll_datectlg.obj &
@@ -612,6 +613,7 @@ ____ADVANCED_SRC_FILENAMES_OBJECTS = &
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_datavcmn.obj &
$(OBJS)\monodll_buttonbar.obj &
$(OBJS)\monodll_calctrl.obj &
$(OBJS)\monodll_datavgen.obj &
$(OBJS)\monodll_datectlg.obj &
@@ -1132,6 +1134,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_datavcmn.obj &
$(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datavgen.obj &
$(OBJS)\monolib_datectlg.obj &
@@ -1159,6 +1162,7 @@ ____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_datavcmn.obj &
$(OBJS)\monolib_buttonbar.obj &
$(OBJS)\monolib_calctrl.obj &
$(OBJS)\monolib_datavgen.obj &
$(OBJS)\monolib_datectlg.obj &
@@ -2045,6 +2049,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_datavcmn.obj &
$(OBJS)\advdll_buttonbar.obj &
$(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datavgen.obj &
$(OBJS)\advdll_datectlg.obj &
@@ -2072,6 +2077,7 @@ ____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\advdll_datavcmn.obj &
$(OBJS)\advdll_buttonbar.obj &
$(OBJS)\advdll_calctrl.obj &
$(OBJS)\advdll_datavgen.obj &
$(OBJS)\advdll_datectlg.obj &
@@ -2108,6 +2114,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS =
!ifeq WXUNIV 0
____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_datavcmn.obj &
$(OBJS)\advlib_buttonbar.obj &
$(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datavgen.obj &
$(OBJS)\advlib_datectlg.obj &
@@ -2135,6 +2142,7 @@ ____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
!ifeq WXUNIV 1
____ADVANCED_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\advlib_datavcmn.obj &
$(OBJS)\advlib_buttonbar.obj &
$(OBJS)\advlib_calctrl.obj &
$(OBJS)\advlib_datavgen.obj &
$(OBJS)\advlib_datectlg.obj &
@@ -6092,6 +6100,11 @@ $(OBJS)\monodll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -7948,6 +7961,11 @@ $(OBJS)\monolib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11129,6 +11147,9 @@ $(OBJS)\advdll_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp
$(OBJS)\advdll_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
$(OBJS)\advdll_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVDLL_CXXFLAGS) $<
@@ -11204,6 +11225,9 @@ $(OBJS)\advlib_datectrl.obj : .AUTODEPEND ..\..\src\msw\datectrl.cpp
$(OBJS)\advlib_datavcmn.obj : .AUTODEPEND ..\..\src\common\datavcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_buttonbar.obj : .AUTODEPEND ..\..\src\generic\buttonbar.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<
$(OBJS)\advlib_calctrl.obj : .AUTODEPEND ..\..\src\generic\calctrl.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(ADVLIB_CXXFLAGS) $<

8
build/msw/wx_adv.dsp
View File

@@ -612,6 +612,10 @@ SOURCE=..\..\src\msw\version.rc
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\src\generic\buttonbar.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\calctrl.cpp
# End Source File
# Begin Source File
@@ -1113,6 +1117,10 @@ SOURCE=..\..\include\wx\msw\taskbar.h
# PROP Default_Filter ""
# Begin Source File
SOURCE=..\..\include\wx\generic\buttonbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\calctrl.h
# End Source File
# Begin Source File

4
build/msw/wx_core.dsp
View File

@@ -7971,6 +7971,10 @@ SOURCE=..\..\include\wx\generic\busyinfo.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\buttonbar.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\generic\calctrl.h
# End Source File
# Begin Source File