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

3
build/bakefiles/files.bkl
View File

@@ -703,6 +703,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/common/mousemanager.cpp
src/common/nbkbase.cpp
src/common/overlaycmn.cpp
src/common/ownerdrwcmn.cpp
src/common/paper.cpp
src/common/persist.cpp
src/common/pickerbase.cpp
@@ -1770,6 +1771,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/ole/dropsrc.h
wx/msw/ole/droptgt.h
wx/msw/ole/oleutils.h
wx/msw/ownerdrw.h
wx/msw/palette.h
wx/msw/pen.h
wx/msw/printdlg.h
@@ -2150,6 +2152,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/os2/minifram.h
wx/os2/msgdlg.h
wx/os2/notebook.h
wx/os2/ownerdrw.h
wx/os2/palette.h
wx/os2/pen.h
wx/os2/pnghand.h

172
build/msw/makefile.bcc
View File

@@ -1815,12 +1815,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listctrlcmn.obj \
$(OBJS)\monodll_matrix.obj \
$(OBJS)\monodll_menucmn.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_ownerdrwcmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_popupcmn.obj \
$(OBJS)\monodll_prntbase.obj \
$(OBJS)\monodll_quantize.obj \
@@ -2057,12 +2058,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listctrlcmn.obj \
$(OBJS)\monodll_matrix.obj \
$(OBJS)\monodll_menucmn.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_ownerdrwcmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_popupcmn.obj \
$(OBJS)\monodll_prntbase.obj \
$(OBJS)\monodll_quantize.obj \
@@ -2515,12 +2517,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listctrlcmn.obj \
$(OBJS)\monolib_matrix.obj \
$(OBJS)\monolib_menucmn.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_ownerdrwcmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_popupcmn.obj \
$(OBJS)\monolib_prntbase.obj \
$(OBJS)\monolib_quantize.obj \
@@ -2757,12 +2760,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listctrlcmn.obj \
$(OBJS)\monolib_matrix.obj \
$(OBJS)\monolib_menucmn.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_ownerdrwcmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_popupcmn.obj \
$(OBJS)\monolib_prntbase.obj \
$(OBJS)\monolib_quantize.obj \
@@ -3108,12 +3112,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listctrlcmn.obj \
$(OBJS)\coredll_matrix.obj \
$(OBJS)\coredll_menucmn.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_ownerdrwcmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_popupcmn.obj \
$(OBJS)\coredll_prntbase.obj \
$(OBJS)\coredll_quantize.obj \
@@ -3350,12 +3355,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listctrlcmn.obj \
$(OBJS)\coredll_matrix.obj \
$(OBJS)\coredll_menucmn.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_ownerdrwcmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_popupcmn.obj \
$(OBJS)\coredll_prntbase.obj \
$(OBJS)\coredll_quantize.obj \
@@ -3597,12 +3603,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listctrlcmn.obj \
$(OBJS)\corelib_matrix.obj \
$(OBJS)\corelib_menucmn.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_ownerdrwcmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_popupcmn.obj \
$(OBJS)\corelib_prntbase.obj \
$(OBJS)\corelib_quantize.obj \
@@ -3839,12 +3846,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listctrlcmn.obj \
$(OBJS)\corelib_matrix.obj \
$(OBJS)\corelib_menucmn.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_ownerdrwcmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_popupcmn.obj \
$(OBJS)\corelib_prntbase.obj \
$(OBJS)\corelib_quantize.obj \
@@ -7304,12 +7312,17 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
@@ -9481,12 +9494,17 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
@@ -11661,12 +11679,17 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
@@ -12935,12 +12958,17 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp

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

172
build/msw/makefile.vc
View File

@@ -2040,12 +2040,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listctrlcmn.obj \
$(OBJS)\monodll_matrix.obj \
$(OBJS)\monodll_menucmn.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_ownerdrwcmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_popupcmn.obj \
$(OBJS)\monodll_prntbase.obj \
$(OBJS)\monodll_quantize.obj \
@@ -2282,12 +2283,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listctrlcmn.obj \
$(OBJS)\monodll_matrix.obj \
$(OBJS)\monodll_menucmn.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_mousemanager.obj \
$(OBJS)\monodll_nbkbase.obj \
$(OBJS)\monodll_overlaycmn.obj \
$(OBJS)\monodll_ownerdrwcmn.obj \
$(OBJS)\monodll_paper.obj \
$(OBJS)\monodll_persist.obj \
$(OBJS)\monodll_pickerbase.obj \
$(OBJS)\monodll_popupcmn.obj \
$(OBJS)\monodll_prntbase.obj \
$(OBJS)\monodll_quantize.obj \
@@ -2746,12 +2748,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listctrlcmn.obj \
$(OBJS)\monolib_matrix.obj \
$(OBJS)\monolib_menucmn.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_ownerdrwcmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_popupcmn.obj \
$(OBJS)\monolib_prntbase.obj \
$(OBJS)\monolib_quantize.obj \
@@ -2988,12 +2991,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listctrlcmn.obj \
$(OBJS)\monolib_matrix.obj \
$(OBJS)\monolib_menucmn.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_mousemanager.obj \
$(OBJS)\monolib_nbkbase.obj \
$(OBJS)\monolib_overlaycmn.obj \
$(OBJS)\monolib_ownerdrwcmn.obj \
$(OBJS)\monolib_paper.obj \
$(OBJS)\monolib_persist.obj \
$(OBJS)\monolib_pickerbase.obj \
$(OBJS)\monolib_popupcmn.obj \
$(OBJS)\monolib_prntbase.obj \
$(OBJS)\monolib_quantize.obj \
@@ -3405,12 +3409,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listctrlcmn.obj \
$(OBJS)\coredll_matrix.obj \
$(OBJS)\coredll_menucmn.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_ownerdrwcmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_popupcmn.obj \
$(OBJS)\coredll_prntbase.obj \
$(OBJS)\coredll_quantize.obj \
@@ -3647,12 +3652,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listctrlcmn.obj \
$(OBJS)\coredll_matrix.obj \
$(OBJS)\coredll_menucmn.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_mousemanager.obj \
$(OBJS)\coredll_nbkbase.obj \
$(OBJS)\coredll_overlaycmn.obj \
$(OBJS)\coredll_ownerdrwcmn.obj \
$(OBJS)\coredll_paper.obj \
$(OBJS)\coredll_persist.obj \
$(OBJS)\coredll_pickerbase.obj \
$(OBJS)\coredll_popupcmn.obj \
$(OBJS)\coredll_prntbase.obj \
$(OBJS)\coredll_quantize.obj \
@@ -3900,12 +3906,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listctrlcmn.obj \
$(OBJS)\corelib_matrix.obj \
$(OBJS)\corelib_menucmn.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_ownerdrwcmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_popupcmn.obj \
$(OBJS)\corelib_prntbase.obj \
$(OBJS)\corelib_quantize.obj \
@@ -4142,12 +4149,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listctrlcmn.obj \
$(OBJS)\corelib_matrix.obj \
$(OBJS)\corelib_menucmn.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_mousemanager.obj \
$(OBJS)\corelib_nbkbase.obj \
$(OBJS)\corelib_overlaycmn.obj \
$(OBJS)\corelib_ownerdrwcmn.obj \
$(OBJS)\corelib_paper.obj \
$(OBJS)\corelib_persist.obj \
$(OBJS)\corelib_pickerbase.obj \
$(OBJS)\corelib_popupcmn.obj \
$(OBJS)\corelib_prntbase.obj \
$(OBJS)\corelib_quantize.obj \
@@ -7901,12 +7909,17 @@ $(OBJS)\monodll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_persist.obj: ..\..\src\common\persist.cpp
@@ -10078,12 +10091,17 @@ $(OBJS)\monolib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_persist.obj: ..\..\src\common\persist.cpp
@@ -12258,12 +12276,17 @@ $(OBJS)\coredll_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_persist.obj: ..\..\src\common\persist.cpp
@@ -13532,12 +13555,17 @@ $(OBJS)\corelib_nbkbase.obj: ..\..\src\common\nbkbase.cpp
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_overlaycmn.obj: ..\..\src\common\overlaycmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\overlaycmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_ownerdrwcmn.obj: ..\..\src\common\ownerdrwcmn.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\ownerdrwcmn.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_paper.obj: ..\..\src\common\paper.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\paper.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_persist.obj: ..\..\src\common\persist.cpp

172
build/msw/makefile.wat
View File

@@ -408,12 +408,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_listctrlcmn.obj &
$(OBJS)\monodll_matrix.obj &
$(OBJS)\monodll_menucmn.obj &
$(OBJS)\monodll_mousemanager.obj &
$(OBJS)\monodll_nbkbase.obj &
$(OBJS)\monodll_overlaycmn.obj &
$(OBJS)\monodll_paper.obj &
$(OBJS)\monodll_persist.obj &
$(OBJS)\monodll_pickerbase.obj &
$(OBJS)\monodll_mousemanager.obj &
$(OBJS)\monodll_nbkbase.obj &
$(OBJS)\monodll_overlaycmn.obj &
$(OBJS)\monodll_ownerdrwcmn.obj &
$(OBJS)\monodll_paper.obj &
$(OBJS)\monodll_persist.obj &
$(OBJS)\monodll_pickerbase.obj &
$(OBJS)\monodll_popupcmn.obj &
$(OBJS)\monodll_prntbase.obj &
$(OBJS)\monodll_quantize.obj &
@@ -652,12 +653,13 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_listctrlcmn.obj &
$(OBJS)\monodll_matrix.obj &
$(OBJS)\monodll_menucmn.obj &
$(OBJS)\monodll_mousemanager.obj &
$(OBJS)\monodll_nbkbase.obj &
$(OBJS)\monodll_overlaycmn.obj &
$(OBJS)\monodll_paper.obj &
$(OBJS)\monodll_persist.obj &
$(OBJS)\monodll_pickerbase.obj &
$(OBJS)\monodll_mousemanager.obj &
$(OBJS)\monodll_nbkbase.obj &
$(OBJS)\monodll_overlaycmn.obj &
$(OBJS)\monodll_ownerdrwcmn.obj &
$(OBJS)\monodll_paper.obj &
$(OBJS)\monodll_persist.obj &
$(OBJS)\monodll_pickerbase.obj &
$(OBJS)\monodll_popupcmn.obj &
$(OBJS)\monodll_prntbase.obj &
$(OBJS)\monodll_quantize.obj &
@@ -1119,12 +1121,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_listctrlcmn.obj &
$(OBJS)\monolib_matrix.obj &
$(OBJS)\monolib_menucmn.obj &
$(OBJS)\monolib_mousemanager.obj &
$(OBJS)\monolib_nbkbase.obj &
$(OBJS)\monolib_overlaycmn.obj &
$(OBJS)\monolib_paper.obj &
$(OBJS)\monolib_persist.obj &
$(OBJS)\monolib_pickerbase.obj &
$(OBJS)\monolib_mousemanager.obj &
$(OBJS)\monolib_nbkbase.obj &
$(OBJS)\monolib_overlaycmn.obj &
$(OBJS)\monolib_ownerdrwcmn.obj &
$(OBJS)\monolib_paper.obj &
$(OBJS)\monolib_persist.obj &
$(OBJS)\monolib_pickerbase.obj &
$(OBJS)\monolib_popupcmn.obj &
$(OBJS)\monolib_prntbase.obj &
$(OBJS)\monolib_quantize.obj &
@@ -1363,12 +1366,13 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_listctrlcmn.obj &
$(OBJS)\monolib_matrix.obj &
$(OBJS)\monolib_menucmn.obj &
$(OBJS)\monolib_mousemanager.obj &
$(OBJS)\monolib_nbkbase.obj &
$(OBJS)\monolib_overlaycmn.obj &
$(OBJS)\monolib_paper.obj &
$(OBJS)\monolib_persist.obj &
$(OBJS)\monolib_pickerbase.obj &
$(OBJS)\monolib_mousemanager.obj &
$(OBJS)\monolib_nbkbase.obj &
$(OBJS)\monolib_overlaycmn.obj &
$(OBJS)\monolib_ownerdrwcmn.obj &
$(OBJS)\monolib_paper.obj &
$(OBJS)\monolib_persist.obj &
$(OBJS)\monolib_pickerbase.obj &
$(OBJS)\monolib_popupcmn.obj &
$(OBJS)\monolib_prntbase.obj &
$(OBJS)\monolib_quantize.obj &
@@ -1739,12 +1743,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_listctrlcmn.obj &
$(OBJS)\coredll_matrix.obj &
$(OBJS)\coredll_menucmn.obj &
$(OBJS)\coredll_mousemanager.obj &
$(OBJS)\coredll_nbkbase.obj &
$(OBJS)\coredll_overlaycmn.obj &
$(OBJS)\coredll_paper.obj &
$(OBJS)\coredll_persist.obj &
$(OBJS)\coredll_pickerbase.obj &
$(OBJS)\coredll_mousemanager.obj &
$(OBJS)\coredll_nbkbase.obj &
$(OBJS)\coredll_overlaycmn.obj &
$(OBJS)\coredll_ownerdrwcmn.obj &
$(OBJS)\coredll_paper.obj &
$(OBJS)\coredll_persist.obj &
$(OBJS)\coredll_pickerbase.obj &
$(OBJS)\coredll_popupcmn.obj &
$(OBJS)\coredll_prntbase.obj &
$(OBJS)\coredll_quantize.obj &
@@ -1983,12 +1988,13 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_listctrlcmn.obj &
$(OBJS)\coredll_matrix.obj &
$(OBJS)\coredll_menucmn.obj &
$(OBJS)\coredll_mousemanager.obj &
$(OBJS)\coredll_nbkbase.obj &
$(OBJS)\coredll_overlaycmn.obj &
$(OBJS)\coredll_paper.obj &
$(OBJS)\coredll_persist.obj &
$(OBJS)\coredll_pickerbase.obj &
$(OBJS)\coredll_mousemanager.obj &
$(OBJS)\coredll_nbkbase.obj &
$(OBJS)\coredll_overlaycmn.obj &
$(OBJS)\coredll_ownerdrwcmn.obj &
$(OBJS)\coredll_paper.obj &
$(OBJS)\coredll_persist.obj &
$(OBJS)\coredll_pickerbase.obj &
$(OBJS)\coredll_popupcmn.obj &
$(OBJS)\coredll_prntbase.obj &
$(OBJS)\coredll_quantize.obj &
@@ -2238,12 +2244,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_listctrlcmn.obj &
$(OBJS)\corelib_matrix.obj &
$(OBJS)\corelib_menucmn.obj &
$(OBJS)\corelib_mousemanager.obj &
$(OBJS)\corelib_nbkbase.obj &
$(OBJS)\corelib_overlaycmn.obj &
$(OBJS)\corelib_paper.obj &
$(OBJS)\corelib_persist.obj &
$(OBJS)\corelib_pickerbase.obj &
$(OBJS)\corelib_mousemanager.obj &
$(OBJS)\corelib_nbkbase.obj &
$(OBJS)\corelib_overlaycmn.obj &
$(OBJS)\corelib_ownerdrwcmn.obj &
$(OBJS)\corelib_paper.obj &
$(OBJS)\corelib_persist.obj &
$(OBJS)\corelib_pickerbase.obj &
$(OBJS)\corelib_popupcmn.obj &
$(OBJS)\corelib_prntbase.obj &
$(OBJS)\corelib_quantize.obj &
@@ -2482,12 +2489,13 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_listctrlcmn.obj &
$(OBJS)\corelib_matrix.obj &
$(OBJS)\corelib_menucmn.obj &
$(OBJS)\corelib_mousemanager.obj &
$(OBJS)\corelib_nbkbase.obj &
$(OBJS)\corelib_overlaycmn.obj &
$(OBJS)\corelib_paper.obj &
$(OBJS)\corelib_persist.obj &
$(OBJS)\corelib_pickerbase.obj &
$(OBJS)\corelib_mousemanager.obj &
$(OBJS)\corelib_nbkbase.obj &
$(OBJS)\corelib_overlaycmn.obj &
$(OBJS)\corelib_ownerdrwcmn.obj &
$(OBJS)\corelib_paper.obj &
$(OBJS)\corelib_persist.obj &
$(OBJS)\corelib_pickerbase.obj &
$(OBJS)\corelib_popupcmn.obj &
$(OBJS)\corelib_prntbase.obj &
$(OBJS)\corelib_quantize.obj &
@@ -7729,12 +7737,17 @@ $(OBJS)\monodll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp
!ifeq USE_GUI 1
$(OBJS)\monodll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
@@ -9906,12 +9919,17 @@ $(OBJS)\monolib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp
!ifeq USE_GUI 1
$(OBJS)\monolib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
@@ -12086,12 +12104,17 @@ $(OBJS)\coredll_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp
!ifeq USE_GUI 1
$(OBJS)\coredll_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp
@@ -13360,12 +13383,17 @@ $(OBJS)\corelib_nbkbase.obj : .AUTODEPEND ..\..\src\common\nbkbase.cpp
!ifeq USE_GUI 1
$(OBJS)\corelib_overlaycmn.obj : .AUTODEPEND ..\..\src\common\overlaycmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_ownerdrwcmn.obj : .AUTODEPEND ..\..\src\common\ownerdrwcmn.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_paper.obj : .AUTODEPEND ..\..\src\common\paper.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_persist.obj : .AUTODEPEND ..\..\src\common\persist.cpp

8
build/msw/wx_core.dsp
View File

@@ -562,6 +562,10 @@ SOURCE=..\..\src\common\overlaycmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\ownerdrwcmn.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\common\paper.cpp
# End Source File
# Begin Source File
@@ -5071,6 +5075,10 @@ SOURCE=..\..\include\wx\msw\ole\oleutils.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\ownerdrw.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\palette.h
# End Source File
# Begin Source File

6
build/msw/wx_vc7_core.vcproj
View File

@@ -814,6 +814,9 @@
RelativePath="..\..\src\common\overlaycmn.cpp">
</File>
<File
RelativePath="..\..\src\common\ownerdrwcmn.cpp">
</File>
<File
RelativePath="..\..\src\common\paper.cpp">
</File>
<File
@@ -4417,6 +4420,9 @@
RelativePath="..\..\include\wx\msw\ole\oleutils.h">
</File>
<File
RelativePath="..\..\include\wx\msw\ownerdrw.h">
</File>
<File
RelativePath="..\..\include\wx\msw\palette.h">
</File>
<File

8
build/msw/wx_vc8_core.vcproj
View File

@@ -1119,6 +1119,10 @@
>
</File>
<File
RelativePath="..\..\src\common\ownerdrwcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\paper.cpp"
>
</File>
@@ -5908,6 +5912,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\msw\ownerdrw.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\palette.h"
>
</File>

8
build/msw/wx_vc9_core.vcproj
View File

@@ -1115,6 +1115,10 @@
>
</File>
<File
RelativePath="..\..\src\common\ownerdrwcmn.cpp"
>
</File>
<File
RelativePath="..\..\src\common\paper.cpp"
>
</File>
@@ -5904,6 +5908,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\msw\ownerdrw.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\palette.h"
>
</File>