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

Add wxPanel::SetBackgroundBitmap().

Browse Source 
This method provides a simple way to set a background bitmap without defining
an EVT_ERASE_BACKGROUND handler and, more importantly, one that works
correctly in wxMSW for a window with children as it paints the background of
transparent children too.

Add a test of this method to the erase sample.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67253 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-03-20 00:00:49 +00:00
parent cf858bab79
commit cd95f7e65c
19 changed files with 509 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
build/msw/makefile.bcc
View File

@@ -1926,11 +1926,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_markuptext.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_panelg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_richmsgdlgg.obj \
$(OBJS)\monodll_scrlwing.obj \
$(OBJS)\monodll_selstore.obj \
@@ -2191,11 +2192,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_markuptext.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_panelg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_richmsgdlgg.obj \
$(OBJS)\monodll_scrlwing.obj \
$(OBJS)\monodll_selstore.obj \
@@ -2687,11 +2689,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_markuptext.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_panelg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_richmsgdlgg.obj \
$(OBJS)\monolib_scrlwing.obj \
$(OBJS)\monolib_selstore.obj \
@@ -2952,11 +2955,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_markuptext.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_panelg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_richmsgdlgg.obj \
$(OBJS)\monolib_scrlwing.obj \
$(OBJS)\monolib_selstore.obj \
@@ -3336,11 +3340,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_markuptext.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_panelg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_richmsgdlgg.obj \
$(OBJS)\coredll_scrlwing.obj \
$(OBJS)\coredll_selstore.obj \
@@ -3601,11 +3606,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_markuptext.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_panelg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_richmsgdlgg.obj \
$(OBJS)\coredll_scrlwing.obj \
$(OBJS)\coredll_selstore.obj \
@@ -3874,11 +3880,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_markuptext.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_panelg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_richmsgdlgg.obj \
$(OBJS)\corelib_scrlwing.obj \
$(OBJS)\corelib_selstore.obj \
@@ -4139,11 +4146,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_markuptext.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_panelg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_richmsgdlgg.obj \
$(OBJS)\corelib_scrlwing.obj \
$(OBJS)\corelib_selstore.obj \
@@ -7961,6 +7969,11 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif
@@ -10303,6 +10316,11 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif
@@ -12639,6 +12657,11 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif
@@ -14036,6 +14059,11 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif

108
build/msw/makefile.gcc
View File

@@ -1937,11 +1937,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listbkg.o \
$(OBJS)\monodll_logg.o \
$(OBJS)\monodll_markuptext.o \
$(OBJS)\monodll_msgdlgg.o \
$(OBJS)\monodll_numdlgg.o \
$(OBJS)\monodll_progdlgg.o \
$(OBJS)\monodll_printps.o \
$(OBJS)\monodll_renderg.o \
$(OBJS)\monodll_msgdlgg.o \
$(OBJS)\monodll_numdlgg.o \
$(OBJS)\monodll_panelg.o \
$(OBJS)\monodll_progdlgg.o \
$(OBJS)\monodll_printps.o \
$(OBJS)\monodll_renderg.o \
$(OBJS)\monodll_richmsgdlgg.o \
$(OBJS)\monodll_scrlwing.o \
$(OBJS)\monodll_selstore.o \
@@ -2204,11 +2205,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listbkg.o \
$(OBJS)\monodll_logg.o \
$(OBJS)\monodll_markuptext.o \
$(OBJS)\monodll_msgdlgg.o \
$(OBJS)\monodll_numdlgg.o \
$(OBJS)\monodll_progdlgg.o \
$(OBJS)\monodll_printps.o \
$(OBJS)\monodll_renderg.o \
$(OBJS)\monodll_msgdlgg.o \
$(OBJS)\monodll_numdlgg.o \
$(OBJS)\monodll_panelg.o \
$(OBJS)\monodll_progdlgg.o \
$(OBJS)\monodll_printps.o \
$(OBJS)\monodll_renderg.o \
$(OBJS)\monodll_richmsgdlgg.o \
$(OBJS)\monodll_scrlwing.o \
$(OBJS)\monodll_selstore.o \
@@ -2704,11 +2706,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listbkg.o \
$(OBJS)\monolib_logg.o \
$(OBJS)\monolib_markuptext.o \
$(OBJS)\monolib_msgdlgg.o \
$(OBJS)\monolib_numdlgg.o \
$(OBJS)\monolib_progdlgg.o \
$(OBJS)\monolib_printps.o \
$(OBJS)\monolib_renderg.o \
$(OBJS)\monolib_msgdlgg.o \
$(OBJS)\monolib_numdlgg.o \
$(OBJS)\monolib_panelg.o \
$(OBJS)\monolib_progdlgg.o \
$(OBJS)\monolib_printps.o \
$(OBJS)\monolib_renderg.o \
$(OBJS)\monolib_richmsgdlgg.o \
$(OBJS)\monolib_scrlwing.o \
$(OBJS)\monolib_selstore.o \
@@ -2971,11 +2974,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listbkg.o \
$(OBJS)\monolib_logg.o \
$(OBJS)\monolib_markuptext.o \
$(OBJS)\monolib_msgdlgg.o \
$(OBJS)\monolib_numdlgg.o \
$(OBJS)\monolib_progdlgg.o \
$(OBJS)\monolib_printps.o \
$(OBJS)\monolib_renderg.o \
$(OBJS)\monolib_msgdlgg.o \
$(OBJS)\monolib_numdlgg.o \
$(OBJS)\monolib_panelg.o \
$(OBJS)\monolib_progdlgg.o \
$(OBJS)\monolib_printps.o \
$(OBJS)\monolib_renderg.o \
$(OBJS)\monolib_richmsgdlgg.o \
$(OBJS)\monolib_scrlwing.o \
$(OBJS)\monolib_selstore.o \
@@ -3369,11 +3373,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listbkg.o \
$(OBJS)\coredll_logg.o \
$(OBJS)\coredll_markuptext.o \
$(OBJS)\coredll_msgdlgg.o \
$(OBJS)\coredll_numdlgg.o \
$(OBJS)\coredll_progdlgg.o \
$(OBJS)\coredll_printps.o \
$(OBJS)\coredll_renderg.o \
$(OBJS)\coredll_msgdlgg.o \
$(OBJS)\coredll_numdlgg.o \
$(OBJS)\coredll_panelg.o \
$(OBJS)\coredll_progdlgg.o \
$(OBJS)\coredll_printps.o \
$(OBJS)\coredll_renderg.o \
$(OBJS)\coredll_richmsgdlgg.o \
$(OBJS)\coredll_scrlwing.o \
$(OBJS)\coredll_selstore.o \
@@ -3636,11 +3641,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listbkg.o \
$(OBJS)\coredll_logg.o \
$(OBJS)\coredll_markuptext.o \
$(OBJS)\coredll_msgdlgg.o \
$(OBJS)\coredll_numdlgg.o \
$(OBJS)\coredll_progdlgg.o \
$(OBJS)\coredll_printps.o \
$(OBJS)\coredll_renderg.o \
$(OBJS)\coredll_msgdlgg.o \
$(OBJS)\coredll_numdlgg.o \
$(OBJS)\coredll_panelg.o \
$(OBJS)\coredll_progdlgg.o \
$(OBJS)\coredll_printps.o \
$(OBJS)\coredll_renderg.o \
$(OBJS)\coredll_richmsgdlgg.o \
$(OBJS)\coredll_scrlwing.o \
$(OBJS)\coredll_selstore.o \
@@ -3915,11 +3921,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listbkg.o \
$(OBJS)\corelib_logg.o \
$(OBJS)\corelib_markuptext.o \
$(OBJS)\corelib_msgdlgg.o \
$(OBJS)\corelib_numdlgg.o \
$(OBJS)\corelib_progdlgg.o \
$(OBJS)\corelib_printps.o \
$(OBJS)\corelib_renderg.o \
$(OBJS)\corelib_msgdlgg.o \
$(OBJS)\corelib_numdlgg.o \
$(OBJS)\corelib_panelg.o \
$(OBJS)\corelib_progdlgg.o \
$(OBJS)\corelib_printps.o \
$(OBJS)\corelib_renderg.o \
$(OBJS)\corelib_richmsgdlgg.o \
$(OBJS)\corelib_scrlwing.o \
$(OBJS)\corelib_selstore.o \
@@ -4182,11 +4189,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listbkg.o \
$(OBJS)\corelib_logg.o \
$(OBJS)\corelib_markuptext.o \
$(OBJS)\corelib_msgdlgg.o \
$(OBJS)\corelib_numdlgg.o \
$(OBJS)\corelib_progdlgg.o \
$(OBJS)\corelib_printps.o \
$(OBJS)\corelib_renderg.o \
$(OBJS)\corelib_msgdlgg.o \
$(OBJS)\corelib_numdlgg.o \
$(OBJS)\corelib_panelg.o \
$(OBJS)\corelib_progdlgg.o \
$(OBJS)\corelib_printps.o \
$(OBJS)\corelib_renderg.o \
$(OBJS)\corelib_richmsgdlgg.o \
$(OBJS)\corelib_scrlwing.o \
$(OBJS)\corelib_selstore.o \
@@ -8111,6 +8119,11 @@ $(OBJS)\monodll_numdlgg.o: ../../src/generic/numdlgg.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_panelg.o: ../../src/generic/panelg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
endif
@@ -10453,6 +10466,11 @@ $(OBJS)\monolib_numdlgg.o: ../../src/generic/numdlgg.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_panelg.o: ../../src/generic/panelg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\monolib_progdlgg.o: ../../src/generic/progdlgg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
endif
@@ -12789,6 +12807,11 @@ $(OBJS)\coredll_numdlgg.o: ../../src/generic/numdlgg.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_panelg.o: ../../src/generic/panelg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
endif
@@ -14186,6 +14209,11 @@ $(OBJS)\corelib_numdlgg.o: ../../src/generic/numdlgg.cpp
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_panelg.o: ../../src/generic/panelg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif
ifeq ($(USE_GUI),1)
$(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
endif

108
build/msw/makefile.vc
View File

@@ -2134,11 +2134,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_markuptext.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_panelg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_richmsgdlgg.obj \
$(OBJS)\monodll_scrlwing.obj \
$(OBJS)\monodll_selstore.obj \
@@ -2399,11 +2400,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_listbkg.obj \
$(OBJS)\monodll_logg.obj \
$(OBJS)\monodll_markuptext.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_msgdlgg.obj \
$(OBJS)\monodll_numdlgg.obj \
$(OBJS)\monodll_panelg.obj \
$(OBJS)\monodll_progdlgg.obj \
$(OBJS)\monodll_printps.obj \
$(OBJS)\monodll_renderg.obj \
$(OBJS)\monodll_richmsgdlgg.obj \
$(OBJS)\monodll_scrlwing.obj \
$(OBJS)\monodll_selstore.obj \
@@ -2901,11 +2903,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_markuptext.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_panelg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_richmsgdlgg.obj \
$(OBJS)\monolib_scrlwing.obj \
$(OBJS)\monolib_selstore.obj \
@@ -3166,11 +3169,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_listbkg.obj \
$(OBJS)\monolib_logg.obj \
$(OBJS)\monolib_markuptext.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_msgdlgg.obj \
$(OBJS)\monolib_numdlgg.obj \
$(OBJS)\monolib_panelg.obj \
$(OBJS)\monolib_progdlgg.obj \
$(OBJS)\monolib_printps.obj \
$(OBJS)\monolib_renderg.obj \
$(OBJS)\monolib_richmsgdlgg.obj \
$(OBJS)\monolib_scrlwing.obj \
$(OBJS)\monolib_selstore.obj \
@@ -3616,11 +3620,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_markuptext.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_panelg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_richmsgdlgg.obj \
$(OBJS)\coredll_scrlwing.obj \
$(OBJS)\coredll_selstore.obj \
@@ -3881,11 +3886,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_listbkg.obj \
$(OBJS)\coredll_logg.obj \
$(OBJS)\coredll_markuptext.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_msgdlgg.obj \
$(OBJS)\coredll_numdlgg.obj \
$(OBJS)\coredll_panelg.obj \
$(OBJS)\coredll_progdlgg.obj \
$(OBJS)\coredll_printps.obj \
$(OBJS)\coredll_renderg.obj \
$(OBJS)\coredll_richmsgdlgg.obj \
$(OBJS)\coredll_scrlwing.obj \
$(OBJS)\coredll_selstore.obj \
@@ -4160,11 +4166,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_markuptext.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_panelg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_richmsgdlgg.obj \
$(OBJS)\corelib_scrlwing.obj \
$(OBJS)\corelib_selstore.obj \
@@ -4425,11 +4432,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_listbkg.obj \
$(OBJS)\corelib_logg.obj \
$(OBJS)\corelib_markuptext.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_msgdlgg.obj \
$(OBJS)\corelib_numdlgg.obj \
$(OBJS)\corelib_panelg.obj \
$(OBJS)\corelib_progdlgg.obj \
$(OBJS)\corelib_printps.obj \
$(OBJS)\corelib_renderg.obj \
$(OBJS)\corelib_richmsgdlgg.obj \
$(OBJS)\corelib_scrlwing.obj \
$(OBJS)\corelib_selstore.obj \
@@ -8541,6 +8549,11 @@ $(OBJS)\monodll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif
@@ -10883,6 +10896,11 @@ $(OBJS)\monolib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif
@@ -13219,6 +13237,11 @@ $(OBJS)\coredll_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif
@@ -14616,6 +14639,11 @@ $(OBJS)\corelib_numdlgg.obj: ..\..\src\generic\numdlgg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_panelg.obj: ..\..\src\generic\panelg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\panelg.cpp
!endif
!if "$(USE_GUI)" == "1"
$(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
!endif

108
build/msw/makefile.wat
View File

@@ -488,11 +488,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_markuptext.obj &
$(OBJS)\monodll_msgdlgg.obj &
$(OBJS)\monodll_numdlgg.obj &
$(OBJS)\monodll_progdlgg.obj &
$(OBJS)\monodll_printps.obj &
$(OBJS)\monodll_renderg.obj &
$(OBJS)\monodll_msgdlgg.obj &
$(OBJS)\monodll_numdlgg.obj &
$(OBJS)\monodll_panelg.obj &
$(OBJS)\monodll_progdlgg.obj &
$(OBJS)\monodll_printps.obj &
$(OBJS)\monodll_renderg.obj &
$(OBJS)\monodll_richmsgdlgg.obj &
$(OBJS)\monodll_scrlwing.obj &
$(OBJS)\monodll_selstore.obj &
@@ -755,11 +756,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_listbkg.obj &
$(OBJS)\monodll_logg.obj &
$(OBJS)\monodll_markuptext.obj &
$(OBJS)\monodll_msgdlgg.obj &
$(OBJS)\monodll_numdlgg.obj &
$(OBJS)\monodll_progdlgg.obj &
$(OBJS)\monodll_printps.obj &
$(OBJS)\monodll_renderg.obj &
$(OBJS)\monodll_msgdlgg.obj &
$(OBJS)\monodll_numdlgg.obj &
$(OBJS)\monodll_panelg.obj &
$(OBJS)\monodll_progdlgg.obj &
$(OBJS)\monodll_printps.obj &
$(OBJS)\monodll_renderg.obj &
$(OBJS)\monodll_richmsgdlgg.obj &
$(OBJS)\monodll_scrlwing.obj &
$(OBJS)\monodll_selstore.obj &
@@ -1260,11 +1262,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_markuptext.obj &
$(OBJS)\monolib_msgdlgg.obj &
$(OBJS)\monolib_numdlgg.obj &
$(OBJS)\monolib_progdlgg.obj &
$(OBJS)\monolib_printps.obj &
$(OBJS)\monolib_renderg.obj &
$(OBJS)\monolib_msgdlgg.obj &
$(OBJS)\monolib_numdlgg.obj &
$(OBJS)\monolib_panelg.obj &
$(OBJS)\monolib_progdlgg.obj &
$(OBJS)\monolib_printps.obj &
$(OBJS)\monolib_renderg.obj &
$(OBJS)\monolib_richmsgdlgg.obj &
$(OBJS)\monolib_scrlwing.obj &
$(OBJS)\monolib_selstore.obj &
@@ -1527,11 +1530,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_listbkg.obj &
$(OBJS)\monolib_logg.obj &
$(OBJS)\monolib_markuptext.obj &
$(OBJS)\monolib_msgdlgg.obj &
$(OBJS)\monolib_numdlgg.obj &
$(OBJS)\monolib_progdlgg.obj &
$(OBJS)\monolib_printps.obj &
$(OBJS)\monolib_renderg.obj &
$(OBJS)\monolib_msgdlgg.obj &
$(OBJS)\monolib_numdlgg.obj &
$(OBJS)\monolib_panelg.obj &
$(OBJS)\monolib_progdlgg.obj &
$(OBJS)\monolib_printps.obj &
$(OBJS)\monolib_renderg.obj &
$(OBJS)\monolib_richmsgdlgg.obj &
$(OBJS)\monolib_scrlwing.obj &
$(OBJS)\monolib_selstore.obj &
@@ -1936,11 +1940,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_markuptext.obj &
$(OBJS)\coredll_msgdlgg.obj &
$(OBJS)\coredll_numdlgg.obj &
$(OBJS)\coredll_progdlgg.obj &
$(OBJS)\coredll_printps.obj &
$(OBJS)\coredll_renderg.obj &
$(OBJS)\coredll_msgdlgg.obj &
$(OBJS)\coredll_numdlgg.obj &
$(OBJS)\coredll_panelg.obj &
$(OBJS)\coredll_progdlgg.obj &
$(OBJS)\coredll_printps.obj &
$(OBJS)\coredll_renderg.obj &
$(OBJS)\coredll_richmsgdlgg.obj &
$(OBJS)\coredll_scrlwing.obj &
$(OBJS)\coredll_selstore.obj &
@@ -2203,11 +2208,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_listbkg.obj &
$(OBJS)\coredll_logg.obj &
$(OBJS)\coredll_markuptext.obj &
$(OBJS)\coredll_msgdlgg.obj &
$(OBJS)\coredll_numdlgg.obj &
$(OBJS)\coredll_progdlgg.obj &
$(OBJS)\coredll_printps.obj &
$(OBJS)\coredll_renderg.obj &
$(OBJS)\coredll_msgdlgg.obj &
$(OBJS)\coredll_numdlgg.obj &
$(OBJS)\coredll_panelg.obj &
$(OBJS)\coredll_progdlgg.obj &
$(OBJS)\coredll_printps.obj &
$(OBJS)\coredll_renderg.obj &
$(OBJS)\coredll_richmsgdlgg.obj &
$(OBJS)\coredll_scrlwing.obj &
$(OBJS)\coredll_selstore.obj &
@@ -2484,11 +2490,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_markuptext.obj &
$(OBJS)\corelib_msgdlgg.obj &
$(OBJS)\corelib_numdlgg.obj &
$(OBJS)\corelib_progdlgg.obj &
$(OBJS)\corelib_printps.obj &
$(OBJS)\corelib_renderg.obj &
$(OBJS)\corelib_msgdlgg.obj &
$(OBJS)\corelib_numdlgg.obj &
$(OBJS)\corelib_panelg.obj &
$(OBJS)\corelib_progdlgg.obj &
$(OBJS)\corelib_printps.obj &
$(OBJS)\corelib_renderg.obj &
$(OBJS)\corelib_richmsgdlgg.obj &
$(OBJS)\corelib_scrlwing.obj &
$(OBJS)\corelib_selstore.obj &
@@ -2751,11 +2758,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_listbkg.obj &
$(OBJS)\corelib_logg.obj &
$(OBJS)\corelib_markuptext.obj &
$(OBJS)\corelib_msgdlgg.obj &
$(OBJS)\corelib_numdlgg.obj &
$(OBJS)\corelib_progdlgg.obj &
$(OBJS)\corelib_printps.obj &
$(OBJS)\corelib_renderg.obj &
$(OBJS)\corelib_msgdlgg.obj &
$(OBJS)\corelib_numdlgg.obj &
$(OBJS)\corelib_panelg.obj &
$(OBJS)\corelib_progdlgg.obj &
$(OBJS)\corelib_printps.obj &
$(OBJS)\corelib_renderg.obj &
$(OBJS)\corelib_richmsgdlgg.obj &
$(OBJS)\corelib_scrlwing.obj &
$(OBJS)\corelib_selstore.obj &
@@ -8370,6 +8378,11 @@ $(OBJS)\monodll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monodll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
!endif
@@ -10712,6 +10725,11 @@ $(OBJS)\monolib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\monolib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
!endif
@@ -13048,6 +13066,11 @@ $(OBJS)\coredll_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\coredll_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
!endif
@@ -14445,6 +14468,11 @@ $(OBJS)\corelib_numdlgg.obj : .AUTODEPEND ..\..\src\generic\numdlgg.cpp
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_panelg.obj : .AUTODEPEND ..\..\src\generic\panelg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif
!ifeq USE_GUI 1
$(OBJS)\corelib_progdlgg.obj : .AUTODEPEND ..\..\src\generic\progdlgg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
!endif

4
build/msw/wx_core.dsp
View File

@@ -3170,6 +3170,10 @@ SOURCE=..\..\src\generic\numdlgg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\panelg.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\generic\printps.cpp
# End Source File
# Begin Source File

3
build/msw/wx_vc7_core.vcproj
View File

@@ -2817,6 +2817,9 @@
RelativePath="..\..\src\generic\numdlgg.cpp">
</File>
<File
RelativePath="..\..\src\generic\panelg.cpp">
</File>
<File
RelativePath="..\..\src\generic\printps.cpp">
</File>
<File

4
build/msw/wx_vc8_core.vcproj
View File

@@ -3789,6 +3789,10 @@
>
</File>
<File
RelativePath="..\..\src\generic\panelg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\printps.cpp"
>
</File>

4
build/msw/wx_vc9_core.vcproj
View File

@@ -3785,6 +3785,10 @@
>
</File>
<File
RelativePath="..\..\src\generic\panelg.cpp"
>
</File>
<File
RelativePath="..\..\src\generic\printps.cpp"
>
</File>