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:
Vadim Zeitlin
2007-04-08 22:18:35 +00:00
parent a78a8f7fd5
commit 94aff5ff86
34 changed files with 252 additions and 110 deletions

View File

@@ -1571,6 +1571,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artstd.obj \
$(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_bookctrl.obj \
$(OBJS)\monodll_btncmn.obj \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_clrpickercmn.obj \
@@ -1800,6 +1801,7 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_artstd.obj \
$(OBJS)\monodll_bmpbase.obj \
$(OBJS)\monodll_bookctrl.obj \
$(OBJS)\monodll_btncmn.obj \
$(OBJS)\monodll_choiccmn.obj \
$(OBJS)\monodll_clipcmn.obj \
$(OBJS)\monodll_clrpickercmn.obj \
@@ -2200,6 +2202,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artstd.obj \
$(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_bookctrl.obj \
$(OBJS)\monolib_btncmn.obj \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_clrpickercmn.obj \
@@ -2429,6 +2432,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_artstd.obj \
$(OBJS)\monolib_bmpbase.obj \
$(OBJS)\monolib_bookctrl.obj \
$(OBJS)\monolib_btncmn.obj \
$(OBJS)\monolib_choiccmn.obj \
$(OBJS)\monolib_clipcmn.obj \
$(OBJS)\monolib_clrpickercmn.obj \
@@ -2746,6 +2750,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artstd.obj \
$(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_bookctrl.obj \
$(OBJS)\coredll_btncmn.obj \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_clrpickercmn.obj \
@@ -2975,6 +2980,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_artstd.obj \
$(OBJS)\coredll_bmpbase.obj \
$(OBJS)\coredll_bookctrl.obj \
$(OBJS)\coredll_btncmn.obj \
$(OBJS)\coredll_choiccmn.obj \
$(OBJS)\coredll_clipcmn.obj \
$(OBJS)\coredll_clrpickercmn.obj \
@@ -3205,6 +3211,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artstd.obj \
$(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_bookctrl.obj \
$(OBJS)\corelib_btncmn.obj \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_clrpickercmn.obj \
@@ -3434,6 +3441,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_artstd.obj \
$(OBJS)\corelib_bmpbase.obj \
$(OBJS)\corelib_bookctrl.obj \
$(OBJS)\corelib_btncmn.obj \
$(OBJS)\corelib_choiccmn.obj \
$(OBJS)\corelib_clipcmn.obj \
$(OBJS)\corelib_clrpickercmn.obj \
@@ -6467,6 +6475,11 @@ $(OBJS)\monodll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_btncmn.obj: ..\..\src\common\btncmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
@@ -8516,6 +8529,11 @@ $(OBJS)\monolib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_btncmn.obj: ..\..\src\common\btncmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
@@ -10592,6 +10610,11 @@ $(OBJS)\coredll_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_btncmn.obj: ..\..\src\common\btncmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_choiccmn.obj: ..\..\src\common\choiccmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
@@ -11887,6 +11910,11 @@ $(OBJS)\corelib_bookctrl.obj: ..\..\src\common\bookctrl.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_btncmn.obj: ..\..\src\common\btncmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_choiccmn.obj: ..\..\src\common\choiccmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**