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

Refactor owner-drawing code.

Browse Source 
Only keep common code in the base class and extract all menu/listbox-specific
stuff into derived classes.

This makes the code cleaner and more maintainable but introduces some problems
in wxCheckListBox appearance which will be fixed by the next patch.

Closes #10635.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63220 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-01-23 13:21:12 +00:00
parent 937d5b6075
commit 98fbab9e7b
26 changed files with 1638 additions and 1394 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
build/msw/makefile.gcc
View File

@@ -1842,12 +1842,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listctrlcmn.o \
$(OBJS)\monodll_matrix.o \
$(OBJS)\monodll_menucmn.o \
$(OBJS)\monodll_mousemanager.o \
$(OBJS)\monodll_nbkbase.o \
$(OBJS)\monodll_overlaycmn.o \
$(OBJS)\monodll_paper.o \
$(OBJS)\monodll_persist.o \
$(OBJS)\monodll_pickerbase.o \
$(OBJS)\monodll_mousemanager.o \
$(OBJS)\monodll_nbkbase.o \
$(OBJS)\monodll_overlaycmn.o \
$(OBJS)\monodll_ownerdrwcmn.o \
$(OBJS)\monodll_paper.o \
$(OBJS)\monodll_persist.o \
$(OBJS)\monodll_pickerbase.o \
$(OBJS)\monodll_popupcmn.o \
$(OBJS)\monodll_prntbase.o \
$(OBJS)\monodll_quantize.o \
@@ -2086,12 +2087,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listctrlcmn.o \
$(OBJS)\monodll_matrix.o \
$(OBJS)\monodll_menucmn.o \
$(OBJS)\monodll_mousemanager.o \
$(OBJS)\monodll_nbkbase.o \
$(OBJS)\monodll_overlaycmn.o \
$(OBJS)\monodll_paper.o \
$(OBJS)\monodll_persist.o \
$(OBJS)\monodll_pickerbase.o \
$(OBJS)\monodll_mousemanager.o \
$(OBJS)\monodll_nbkbase.o \
$(OBJS)\monodll_overlaycmn.o \
$(OBJS)\monodll_ownerdrwcmn.o \
$(OBJS)\monodll_paper.o \
$(OBJS)\monodll_persist.o \
$(OBJS)\monodll_pickerbase.o \
$(OBJS)\monodll_popupcmn.o \
$(OBJS)\monodll_prntbase.o \
$(OBJS)\monodll_quantize.o \
@@ -2548,12 +2550,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listctrlcmn.o \
$(OBJS)\monolib_matrix.o \
$(OBJS)\monolib_menucmn.o \
$(OBJS)\monolib_mousemanager.o \
$(OBJS)\monolib_nbkbase.o \
$(OBJS)\monolib_overlaycmn.o \
$(OBJS)\monolib_paper.o \
$(OBJS)\monolib_persist.o \
$(OBJS)\monolib_pickerbase.o \
$(OBJS)\monolib_mousemanager.o \
$(OBJS)\monolib_nbkbase.o \
$(OBJS)\monolib_overlaycmn.o \
$(OBJS)\monolib_ownerdrwcmn.o \
$(OBJS)\monolib_paper.o \
$(OBJS)\monolib_persist.o \
$(OBJS)\monolib_pickerbase.o \
$(OBJS)\monolib_popupcmn.o \
$(OBJS)\monolib_prntbase.o \
$(OBJS)\monolib_quantize.o \
@@ -2792,12 +2795,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listctrlcmn.o \
$(OBJS)\monolib_matrix.o \
$(OBJS)\monolib_menucmn.o \
$(OBJS)\monolib_mousemanager.o \
$(OBJS)\monolib_nbkbase.o \
$(OBJS)\monolib_overlaycmn.o \
$(OBJS)\monolib_paper.o \
$(OBJS)\monolib_persist.o \
$(OBJS)\monolib_pickerbase.o \
$(OBJS)\monolib_mousemanager.o \
$(OBJS)\monolib_nbkbase.o \
$(OBJS)\monolib_overlaycmn.o \
$(OBJS)\monolib_ownerdrwcmn.o \
$(OBJS)\monolib_paper.o \
$(OBJS)\monolib_persist.o \
$(OBJS)\monolib_pickerbase.o \
$(OBJS)\monolib_popupcmn.o \
$(OBJS)\monolib_prntbase.o \
$(OBJS)\monolib_quantize.o \
@@ -3157,12 +3161,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listctrlcmn.o \
$(OBJS)\coredll_matrix.o \
$(OBJS)\coredll_menucmn.o \
$(OBJS)\coredll_mousemanager.o \
$(OBJS)\coredll_nbkbase.o \
$(OBJS)\coredll_overlaycmn.o \
$(OBJS)\coredll_paper.o \
$(OBJS)\coredll_persist.o \
$(OBJS)\coredll_pickerbase.o \
$(OBJS)\coredll_mousemanager.o \
$(OBJS)\coredll_nbkbase.o \
$(OBJS)\coredll_overlaycmn.o \
$(OBJS)\coredll_ownerdrwcmn.o \
$(OBJS)\coredll_paper.o \
$(OBJS)\coredll_persist.o \
$(OBJS)\coredll_pickerbase.o \
$(OBJS)\coredll_popupcmn.o \
$(OBJS)\coredll_prntbase.o \
$(OBJS)\coredll_quantize.o \
@@ -3401,12 +3406,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listctrlcmn.o \
$(OBJS)\coredll_matrix.o \
$(OBJS)\coredll_menucmn.o \
$(OBJS)\coredll_mousemanager.o \
$(OBJS)\coredll_nbkbase.o \
$(OBJS)\coredll_overlaycmn.o \
$(OBJS)\coredll_paper.o \
$(OBJS)\coredll_persist.o \
$(OBJS)\coredll_pickerbase.o \
$(OBJS)\coredll_mousemanager.o \
$(OBJS)\coredll_nbkbase.o \
$(OBJS)\coredll_overlaycmn.o \
$(OBJS)\coredll_ownerdrwcmn.o \
$(OBJS)\coredll_paper.o \
$(OBJS)\coredll_persist.o \
$(OBJS)\coredll_pickerbase.o \
$(OBJS)\coredll_popupcmn.o \
$(OBJS)\coredll_prntbase.o \
$(OBJS)\coredll_quantize.o \
@@ -3654,12 +3660,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listctrlcmn.o \
$(OBJS)\corelib_matrix.o \
$(OBJS)\corelib_menucmn.o \
$(OBJS)\corelib_mousemanager.o \
$(OBJS)\corelib_nbkbase.o \
$(OBJS)\corelib_overlaycmn.o \
$(OBJS)\corelib_paper.o \
$(OBJS)\corelib_persist.o \
$(OBJS)\corelib_pickerbase.o \
$(OBJS)\corelib_mousemanager.o \
$(OBJS)\corelib_nbkbase.o \
$(OBJS)\corelib_overlaycmn.o \
$(OBJS)\corelib_ownerdrwcmn.o \
$(OBJS)\corelib_paper.o \
$(OBJS)\corelib_persist.o \
$(OBJS)\corelib_pickerbase.o \
$(OBJS)\corelib_popupcmn.o \
$(OBJS)\corelib_prntbase.o \
$(OBJS)\corelib_quantize.o \
@@ -3898,12 +3905,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listctrlcmn.o \
$(OBJS)\corelib_matrix.o \
$(OBJS)\corelib_menucmn.o \
$(OBJS)\corelib_mousemanager.o \
$(OBJS)\corelib_nbkbase.o \
$(OBJS)\corelib_overlaycmn.o \
$(OBJS)\corelib_paper.o \
$(OBJS)\corelib_persist.o \
$(OBJS)\corelib_pickerbase.o \
$(OBJS)\corelib_mousemanager.o \
$(OBJS)\corelib_nbkbase.o \
$(OBJS)\corelib_overlaycmn.o \
$(OBJS)\corelib_ownerdrwcmn.o \
$(OBJS)\corelib_paper.o \
$(OBJS)\corelib_persist.o \
$(OBJS)\corelib_pickerbase.o \
$(OBJS)\corelib_popupcmn.o \
$(OBJS)\corelib_prntbase.o \
$(OBJS)\corelib_quantize.o \
@@ -7470,12 +7478,17 @@ endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_overlaycmn.o: ../../src/common/overlaycmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_persist.o: ../../src/common/persist.cpp
@@ -9647,12 +9660,17 @@ endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_overlaycmn.o: ../../src/common/overlaycmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_persist.o: ../../src/common/persist.cpp
@@ -11827,12 +11845,17 @@ endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_overlaycmn.o: ../../src/common/overlaycmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_persist.o: ../../src/common/persist.cpp
@@ -13101,12 +13124,17 @@ endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_overlaycmn.o: ../../src/common/overlaycmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_ownerdrwcmn.o: ../../src/common/ownerdrwcmn.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_paper.o: ../../src/common/paper.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_persist.o: ../../src/common/persist.cpp