Call wxTLW::SetDefaultItem() from wxButtonBase::SetDefault() instead of doing
it in wxButton implementations in (almost) all ports; changed its return type to "wxWindow *" from "void" to accommodate the ports needing the old default item (replaces part of patch 1696563) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45338 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1581,6 +1581,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_artstd.o \
|
||||
$(OBJS)\monodll_bmpbase.o \
|
||||
$(OBJS)\monodll_bookctrl.o \
|
||||
$(OBJS)\monodll_btncmn.o \
|
||||
$(OBJS)\monodll_choiccmn.o \
|
||||
$(OBJS)\monodll_clipcmn.o \
|
||||
$(OBJS)\monodll_clrpickercmn.o \
|
||||
@@ -1812,6 +1813,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
|
||||
$(OBJS)\monodll_artstd.o \
|
||||
$(OBJS)\monodll_bmpbase.o \
|
||||
$(OBJS)\monodll_bookctrl.o \
|
||||
$(OBJS)\monodll_btncmn.o \
|
||||
$(OBJS)\monodll_choiccmn.o \
|
||||
$(OBJS)\monodll_clipcmn.o \
|
||||
$(OBJS)\monodll_clrpickercmn.o \
|
||||
@@ -2216,6 +2218,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_artstd.o \
|
||||
$(OBJS)\monolib_bmpbase.o \
|
||||
$(OBJS)\monolib_bookctrl.o \
|
||||
$(OBJS)\monolib_btncmn.o \
|
||||
$(OBJS)\monolib_choiccmn.o \
|
||||
$(OBJS)\monolib_clipcmn.o \
|
||||
$(OBJS)\monolib_clrpickercmn.o \
|
||||
@@ -2447,6 +2450,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
|
||||
$(OBJS)\monolib_artstd.o \
|
||||
$(OBJS)\monolib_bmpbase.o \
|
||||
$(OBJS)\monolib_bookctrl.o \
|
||||
$(OBJS)\monolib_btncmn.o \
|
||||
$(OBJS)\monolib_choiccmn.o \
|
||||
$(OBJS)\monolib_clipcmn.o \
|
||||
$(OBJS)\monolib_clrpickercmn.o \
|
||||
@@ -2778,6 +2782,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_artstd.o \
|
||||
$(OBJS)\coredll_bmpbase.o \
|
||||
$(OBJS)\coredll_bookctrl.o \
|
||||
$(OBJS)\coredll_btncmn.o \
|
||||
$(OBJS)\coredll_choiccmn.o \
|
||||
$(OBJS)\coredll_clipcmn.o \
|
||||
$(OBJS)\coredll_clrpickercmn.o \
|
||||
@@ -3009,6 +3014,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
|
||||
$(OBJS)\coredll_artstd.o \
|
||||
$(OBJS)\coredll_bmpbase.o \
|
||||
$(OBJS)\coredll_bookctrl.o \
|
||||
$(OBJS)\coredll_btncmn.o \
|
||||
$(OBJS)\coredll_choiccmn.o \
|
||||
$(OBJS)\coredll_clipcmn.o \
|
||||
$(OBJS)\coredll_clrpickercmn.o \
|
||||
@@ -3245,6 +3251,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_artstd.o \
|
||||
$(OBJS)\corelib_bmpbase.o \
|
||||
$(OBJS)\corelib_bookctrl.o \
|
||||
$(OBJS)\corelib_btncmn.o \
|
||||
$(OBJS)\corelib_choiccmn.o \
|
||||
$(OBJS)\corelib_clipcmn.o \
|
||||
$(OBJS)\corelib_clrpickercmn.o \
|
||||
@@ -3476,6 +3483,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
|
||||
$(OBJS)\corelib_artstd.o \
|
||||
$(OBJS)\corelib_bmpbase.o \
|
||||
$(OBJS)\corelib_bookctrl.o \
|
||||
$(OBJS)\corelib_btncmn.o \
|
||||
$(OBJS)\corelib_choiccmn.o \
|
||||
$(OBJS)\corelib_clipcmn.o \
|
||||
$(OBJS)\corelib_clrpickercmn.o \
|
||||
@@ -6726,6 +6734,11 @@ $(OBJS)\monodll_bookctrl.o: ../../src/common/bookctrl.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_btncmn.o: ../../src/common/btncmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monodll_choiccmn.o: ../../src/common/choiccmn.cpp
|
||||
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -8875,6 +8888,11 @@ $(OBJS)\monolib_bookctrl.o: ../../src/common/bookctrl.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_btncmn.o: ../../src/common/btncmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\monolib_choiccmn.o: ../../src/common/choiccmn.cpp
|
||||
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -11051,6 +11069,11 @@ $(OBJS)\coredll_bookctrl.o: ../../src/common/bookctrl.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_btncmn.o: ../../src/common/btncmn.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\coredll_choiccmn.o: ../../src/common/choiccmn.cpp
|
||||
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
|
||||
@@ -12446,6 +12469,11 @@ $(OBJS)\corelib_bookctrl.o: ../../src/common/bookctrl.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_btncmn.o: ../../src/common/btncmn.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
endif
|
||||
|
||||
ifeq ($(USE_GUI),1)
|
||||
$(OBJS)\corelib_choiccmn.o: ../../src/common/choiccmn.cpp
|
||||
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
|
||||
|
Reference in New Issue
Block a user