Steps towards implementing native-style, non-top-level toolbars on Mac
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:
@@ -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) $<
|
||||
|
||||
|
Reference in New Issue
Block a user