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

Use task dialog for wxProgressDialog implementation in wxMSW.

Browse Source 
If available, the task dialog is now used for the wxProgressDialog under
Windows. This provides a much more native looking dialog which doesn't look
out of place under modern Windows versions, unlike the generic implementation.

The internals of the code had to be significantly changed as the task dialog
can only be shown modally so, to emulate wxProgressDialog modeless nature, a
separate thread is used for the progress dialog management.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65352 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2010-08-18 22:49:02 +00:00
parent c0938d8506
commit c31d9c7f60
18 changed files with 1606 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/files.bkl
View File

@@ -1718,6 +1718,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
src/msw/notebook.cpp
src/msw/ole/access.cpp
src/msw/ownerdrw.cpp
src/msw/progdlg.cpp
src/msw/radiobox.cpp
src/msw/radiobut.cpp
src/msw/richmsgdlg.cpp
@@ -1802,6 +1803,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/msw/pen.h
wx/msw/printdlg.h
wx/msw/printwin.h
wx/msw/progdlg.h
wx/msw/radiobox.h
wx/msw/radiobut.h
wx/msw/region.h

56
build/msw/makefile.bcc
View File

@@ -1750,11 +1750,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_msgdlg.obj \
$(OBJS)\monodll_nativdlg.obj \
$(OBJS)\monodll_nativewin.obj \
$(OBJS)\monodll_msw_notebook.obj \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_ownerdrw.obj \
$(OBJS)\monodll_msw_radiobox.obj \
$(OBJS)\monodll_msw_radiobut.obj \
$(OBJS)\monodll_msw_notebook.obj \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_ownerdrw.obj \
$(OBJS)\monodll_progdlg.obj \
$(OBJS)\monodll_msw_radiobox.obj \
$(OBJS)\monodll_msw_radiobut.obj \
$(OBJS)\monodll_richmsgdlg.obj \
$(OBJS)\monodll_msw_scrolbar.obj \
$(OBJS)\monodll_msw_slider.obj \
@@ -2469,11 +2470,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_msgdlg.obj \
$(OBJS)\monolib_nativdlg.obj \
$(OBJS)\monolib_nativewin.obj \
$(OBJS)\monolib_msw_notebook.obj \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_ownerdrw.obj \
$(OBJS)\monolib_msw_radiobox.obj \
$(OBJS)\monolib_msw_radiobut.obj \
$(OBJS)\monolib_msw_notebook.obj \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_ownerdrw.obj \
$(OBJS)\monolib_progdlg.obj \
$(OBJS)\monolib_msw_radiobox.obj \
$(OBJS)\monolib_msw_radiobut.obj \
$(OBJS)\monolib_richmsgdlg.obj \
$(OBJS)\monolib_msw_scrolbar.obj \
$(OBJS)\monolib_msw_slider.obj \
@@ -3079,11 +3081,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_msgdlg.obj \
$(OBJS)\coredll_nativdlg.obj \
$(OBJS)\coredll_nativewin.obj \
$(OBJS)\coredll_msw_notebook.obj \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_ownerdrw.obj \
$(OBJS)\coredll_msw_radiobox.obj \
$(OBJS)\coredll_msw_radiobut.obj \
$(OBJS)\coredll_msw_notebook.obj \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_ownerdrw.obj \
$(OBJS)\coredll_progdlg.obj \
$(OBJS)\coredll_msw_radiobox.obj \
$(OBJS)\coredll_msw_radiobut.obj \
$(OBJS)\coredll_richmsgdlg.obj \
$(OBJS)\coredll_msw_scrolbar.obj \
$(OBJS)\coredll_msw_slider.obj \
@@ -3581,11 +3584,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_msgdlg.obj \
$(OBJS)\corelib_nativdlg.obj \
$(OBJS)\corelib_nativewin.obj \
$(OBJS)\corelib_msw_notebook.obj \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_ownerdrw.obj \
$(OBJS)\corelib_msw_radiobox.obj \
$(OBJS)\corelib_msw_radiobut.obj \
$(OBJS)\corelib_msw_notebook.obj \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_ownerdrw.obj \
$(OBJS)\corelib_progdlg.obj \
$(OBJS)\corelib_msw_radiobox.obj \
$(OBJS)\corelib_msw_radiobut.obj \
$(OBJS)\corelib_richmsgdlg.obj \
$(OBJS)\corelib_msw_scrolbar.obj \
$(OBJS)\corelib_msw_slider.obj \
@@ -6188,6 +6192,9 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
@@ -8420,6 +8427,9 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
@@ -11060,6 +11070,9 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
@@ -12367,6 +12380,9 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp

56
build/msw/makefile.gcc
View File

@@ -1761,11 +1761,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_msgdlg.o \
$(OBJS)\monodll_nativdlg.o \
$(OBJS)\monodll_nativewin.o \
$(OBJS)\monodll_msw_notebook.o \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_ownerdrw.o \
$(OBJS)\monodll_msw_radiobox.o \
$(OBJS)\monodll_msw_radiobut.o \
$(OBJS)\monodll_msw_notebook.o \
$(OBJS)\monodll_access.o \
$(OBJS)\monodll_ownerdrw.o \
$(OBJS)\monodll_progdlg.o \
$(OBJS)\monodll_msw_radiobox.o \
$(OBJS)\monodll_msw_radiobut.o \
$(OBJS)\monodll_richmsgdlg.o \
$(OBJS)\monodll_msw_scrolbar.o \
$(OBJS)\monodll_msw_slider.o \
@@ -2486,11 +2487,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_msgdlg.o \
$(OBJS)\monolib_nativdlg.o \
$(OBJS)\monolib_nativewin.o \
$(OBJS)\monolib_msw_notebook.o \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_ownerdrw.o \
$(OBJS)\monolib_msw_radiobox.o \
$(OBJS)\monolib_msw_radiobut.o \
$(OBJS)\monolib_msw_notebook.o \
$(OBJS)\monolib_access.o \
$(OBJS)\monolib_ownerdrw.o \
$(OBJS)\monolib_progdlg.o \
$(OBJS)\monolib_msw_radiobox.o \
$(OBJS)\monolib_msw_radiobut.o \
$(OBJS)\monolib_richmsgdlg.o \
$(OBJS)\monolib_msw_scrolbar.o \
$(OBJS)\monolib_msw_slider.o \
@@ -3112,11 +3114,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_msgdlg.o \
$(OBJS)\coredll_nativdlg.o \
$(OBJS)\coredll_nativewin.o \
$(OBJS)\coredll_msw_notebook.o \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_ownerdrw.o \
$(OBJS)\coredll_msw_radiobox.o \
$(OBJS)\coredll_msw_radiobut.o \
$(OBJS)\coredll_msw_notebook.o \
$(OBJS)\coredll_access.o \
$(OBJS)\coredll_ownerdrw.o \
$(OBJS)\coredll_progdlg.o \
$(OBJS)\coredll_msw_radiobox.o \
$(OBJS)\coredll_msw_radiobut.o \
$(OBJS)\coredll_richmsgdlg.o \
$(OBJS)\coredll_msw_scrolbar.o \
$(OBJS)\coredll_msw_slider.o \
@@ -3622,11 +3625,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_msgdlg.o \
$(OBJS)\corelib_nativdlg.o \
$(OBJS)\corelib_nativewin.o \
$(OBJS)\corelib_msw_notebook.o \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_ownerdrw.o \
$(OBJS)\corelib_msw_radiobox.o \
$(OBJS)\corelib_msw_radiobut.o \
$(OBJS)\corelib_msw_notebook.o \
$(OBJS)\corelib_access.o \
$(OBJS)\corelib_ownerdrw.o \
$(OBJS)\corelib_progdlg.o \
$(OBJS)\corelib_msw_radiobox.o \
$(OBJS)\corelib_msw_radiobut.o \
$(OBJS)\corelib_richmsgdlg.o \
$(OBJS)\corelib_msw_scrolbar.o \
$(OBJS)\corelib_msw_slider.o \
@@ -6338,6 +6342,9 @@ $(OBJS)\monodll_access.o: ../../src/msw/ole/access.cpp
$(OBJS)\monodll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_progdlg.o: ../../src/msw/progdlg.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monodll_msw_radiobox.o: ../../src/msw/radiobox.cpp
$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -8570,6 +8577,9 @@ $(OBJS)\monolib_access.o: ../../src/msw/ole/access.cpp
$(OBJS)\monolib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_progdlg.o: ../../src/msw/progdlg.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\monolib_msw_radiobox.o: ../../src/msw/radiobox.cpp
$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -11210,6 +11220,9 @@ $(OBJS)\coredll_access.o: ../../src/msw/ole/access.cpp
$(OBJS)\coredll_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_progdlg.o: ../../src/msw/progdlg.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\coredll_msw_radiobox.o: ../../src/msw/radiobox.cpp
$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -12517,6 +12530,9 @@ $(OBJS)\corelib_access.o: ../../src/msw/ole/access.cpp
$(OBJS)\corelib_ownerdrw.o: ../../src/msw/ownerdrw.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_progdlg.o: ../../src/msw/progdlg.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\corelib_msw_radiobox.o: ../../src/msw/radiobox.cpp
$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<

56
build/msw/makefile.vc
View File

@@ -1958,11 +1958,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = \
$(OBJS)\monodll_msgdlg.obj \
$(OBJS)\monodll_nativdlg.obj \
$(OBJS)\monodll_nativewin.obj \
$(OBJS)\monodll_msw_notebook.obj \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_ownerdrw.obj \
$(OBJS)\monodll_msw_radiobox.obj \
$(OBJS)\monodll_msw_radiobut.obj \
$(OBJS)\monodll_msw_notebook.obj \
$(OBJS)\monodll_access.obj \
$(OBJS)\monodll_ownerdrw.obj \
$(OBJS)\monodll_progdlg.obj \
$(OBJS)\monodll_msw_radiobox.obj \
$(OBJS)\monodll_msw_radiobut.obj \
$(OBJS)\monodll_richmsgdlg.obj \
$(OBJS)\monodll_msw_scrolbar.obj \
$(OBJS)\monodll_msw_slider.obj \
@@ -2683,11 +2684,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = \
$(OBJS)\monolib_msgdlg.obj \
$(OBJS)\monolib_nativdlg.obj \
$(OBJS)\monolib_nativewin.obj \
$(OBJS)\monolib_msw_notebook.obj \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_ownerdrw.obj \
$(OBJS)\monolib_msw_radiobox.obj \
$(OBJS)\monolib_msw_radiobut.obj \
$(OBJS)\monolib_msw_notebook.obj \
$(OBJS)\monolib_access.obj \
$(OBJS)\monolib_ownerdrw.obj \
$(OBJS)\monolib_progdlg.obj \
$(OBJS)\monolib_msw_radiobox.obj \
$(OBJS)\monolib_msw_radiobut.obj \
$(OBJS)\monolib_richmsgdlg.obj \
$(OBJS)\monolib_msw_scrolbar.obj \
$(OBJS)\monolib_msw_slider.obj \
@@ -3359,11 +3361,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = \
$(OBJS)\coredll_msgdlg.obj \
$(OBJS)\coredll_nativdlg.obj \
$(OBJS)\coredll_nativewin.obj \
$(OBJS)\coredll_msw_notebook.obj \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_ownerdrw.obj \
$(OBJS)\coredll_msw_radiobox.obj \
$(OBJS)\coredll_msw_radiobut.obj \
$(OBJS)\coredll_msw_notebook.obj \
$(OBJS)\coredll_access.obj \
$(OBJS)\coredll_ownerdrw.obj \
$(OBJS)\coredll_progdlg.obj \
$(OBJS)\coredll_msw_radiobox.obj \
$(OBJS)\coredll_msw_radiobut.obj \
$(OBJS)\coredll_richmsgdlg.obj \
$(OBJS)\coredll_msw_scrolbar.obj \
$(OBJS)\coredll_msw_slider.obj \
@@ -3867,11 +3870,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = \
$(OBJS)\corelib_msgdlg.obj \
$(OBJS)\corelib_nativdlg.obj \
$(OBJS)\corelib_nativewin.obj \
$(OBJS)\corelib_msw_notebook.obj \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_ownerdrw.obj \
$(OBJS)\corelib_msw_radiobox.obj \
$(OBJS)\corelib_msw_radiobut.obj \
$(OBJS)\corelib_msw_notebook.obj \
$(OBJS)\corelib_access.obj \
$(OBJS)\corelib_ownerdrw.obj \
$(OBJS)\corelib_progdlg.obj \
$(OBJS)\corelib_msw_radiobox.obj \
$(OBJS)\corelib_msw_radiobut.obj \
$(OBJS)\corelib_richmsgdlg.obj \
$(OBJS)\corelib_msw_scrolbar.obj \
$(OBJS)\corelib_msw_slider.obj \
@@ -6768,6 +6772,9 @@ $(OBJS)\monodll_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\monodll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\monodll_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\monodll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
@@ -9000,6 +9007,9 @@ $(OBJS)\monolib_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\monolib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\monolib_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\monolib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp
@@ -11640,6 +11650,9 @@ $(OBJS)\coredll_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\coredll_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\coredll_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\coredll_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\msw\radiobox.cpp
@@ -12947,6 +12960,9 @@ $(OBJS)\corelib_access.obj: ..\..\src\msw\ole\access.cpp
$(OBJS)\corelib_ownerdrw.obj: ..\..\src\msw\ownerdrw.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\ownerdrw.cpp
$(OBJS)\corelib_progdlg.obj: ..\..\src\msw\progdlg.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\progdlg.cpp
$(OBJS)\corelib_msw_radiobox.obj: ..\..\src\msw\radiobox.cpp
$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\msw\radiobox.cpp

56
build/msw/makefile.wat
View File

@@ -321,11 +321,12 @@ ____CORE_SRC_FILENAMES_OBJECTS = &
$(OBJS)\monodll_msgdlg.obj &
$(OBJS)\monodll_nativdlg.obj &
$(OBJS)\monodll_nativewin.obj &
$(OBJS)\monodll_msw_notebook.obj &
$(OBJS)\monodll_access.obj &
$(OBJS)\monodll_ownerdrw.obj &
$(OBJS)\monodll_msw_radiobox.obj &
$(OBJS)\monodll_msw_radiobut.obj &
$(OBJS)\monodll_msw_notebook.obj &
$(OBJS)\monodll_access.obj &
$(OBJS)\monodll_ownerdrw.obj &
$(OBJS)\monodll_progdlg.obj &
$(OBJS)\monodll_msw_radiobox.obj &
$(OBJS)\monodll_msw_radiobut.obj &
$(OBJS)\monodll_richmsgdlg.obj &
$(OBJS)\monodll_msw_scrolbar.obj &
$(OBJS)\monodll_msw_slider.obj &
@@ -1051,11 +1052,12 @@ ____CORE_SRC_FILENAMES_1_OBJECTS = &
$(OBJS)\monolib_msgdlg.obj &
$(OBJS)\monolib_nativdlg.obj &
$(OBJS)\monolib_nativewin.obj &
$(OBJS)\monolib_msw_notebook.obj &
$(OBJS)\monolib_access.obj &
$(OBJS)\monolib_ownerdrw.obj &
$(OBJS)\monolib_msw_radiobox.obj &
$(OBJS)\monolib_msw_radiobut.obj &
$(OBJS)\monolib_msw_notebook.obj &
$(OBJS)\monolib_access.obj &
$(OBJS)\monolib_ownerdrw.obj &
$(OBJS)\monolib_progdlg.obj &
$(OBJS)\monolib_msw_radiobox.obj &
$(OBJS)\monolib_msw_radiobut.obj &
$(OBJS)\monolib_richmsgdlg.obj &
$(OBJS)\monolib_msw_scrolbar.obj &
$(OBJS)\monolib_msw_slider.obj &
@@ -1688,11 +1690,12 @@ ____CORE_SRC_FILENAMES_2_OBJECTS = &
$(OBJS)\coredll_msgdlg.obj &
$(OBJS)\coredll_nativdlg.obj &
$(OBJS)\coredll_nativewin.obj &
$(OBJS)\coredll_msw_notebook.obj &
$(OBJS)\coredll_access.obj &
$(OBJS)\coredll_ownerdrw.obj &
$(OBJS)\coredll_msw_radiobox.obj &
$(OBJS)\coredll_msw_radiobut.obj &
$(OBJS)\coredll_msw_notebook.obj &
$(OBJS)\coredll_access.obj &
$(OBJS)\coredll_ownerdrw.obj &
$(OBJS)\coredll_progdlg.obj &
$(OBJS)\coredll_msw_radiobox.obj &
$(OBJS)\coredll_msw_radiobut.obj &
$(OBJS)\coredll_richmsgdlg.obj &
$(OBJS)\coredll_msw_scrolbar.obj &
$(OBJS)\coredll_msw_slider.obj &
@@ -2200,11 +2203,12 @@ ____CORE_SRC_FILENAMES_3_OBJECTS = &
$(OBJS)\corelib_msgdlg.obj &
$(OBJS)\corelib_nativdlg.obj &
$(OBJS)\corelib_nativewin.obj &
$(OBJS)\corelib_msw_notebook.obj &
$(OBJS)\corelib_access.obj &
$(OBJS)\corelib_ownerdrw.obj &
$(OBJS)\corelib_msw_radiobox.obj &
$(OBJS)\corelib_msw_radiobut.obj &
$(OBJS)\corelib_msw_notebook.obj &
$(OBJS)\corelib_access.obj &
$(OBJS)\corelib_ownerdrw.obj &
$(OBJS)\corelib_progdlg.obj &
$(OBJS)\corelib_msw_radiobox.obj &
$(OBJS)\corelib_msw_radiobut.obj &
$(OBJS)\corelib_richmsgdlg.obj &
$(OBJS)\corelib_msw_scrolbar.obj &
$(OBJS)\corelib_msw_slider.obj &
@@ -6597,6 +6601,9 @@ $(OBJS)\monodll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(OBJS)\monodll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
$(OBJS)\monodll_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -8829,6 +8836,9 @@ $(OBJS)\monolib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(OBJS)\monolib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
$(OBJS)\monolib_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -11469,6 +11479,9 @@ $(OBJS)\coredll_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(OBJS)\coredll_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
$(OBJS)\coredll_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -12776,6 +12789,9 @@ $(OBJS)\corelib_access.obj : .AUTODEPEND ..\..\src\msw\ole\access.cpp
$(OBJS)\corelib_ownerdrw.obj : .AUTODEPEND ..\..\src\msw\ownerdrw.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_progdlg.obj : .AUTODEPEND ..\..\src\msw\progdlg.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
$(OBJS)\corelib_msw_radiobox.obj : .AUTODEPEND ..\..\src\msw\radiobox.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<

39
build/msw/wx_core.dsp
View File

@@ -2025,6 +2025,41 @@ SOURCE=..\..\src\msw\printwin.cpp
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\progdlg.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 DLL Release"
!ELSEIF "$(CFG)" == "core - Win32 DLL Debug"
!ELSEIF "$(CFG)" == "core - Win32 Universal Release"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Universal Debug"
# PROP Exclude_From_Build 1
!ELSEIF "$(CFG)" == "core - Win32 Release"
!ELSEIF "$(CFG)" == "core - Win32 Debug"
!ENDIF
# End Source File
# Begin Source File
SOURCE=..\..\src\msw\radiobox.cpp
!IF "$(CFG)" == "core - Win32 DLL Universal Release"
@@ -5162,6 +5197,10 @@ SOURCE=..\..\include\wx\msw\printwin.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\progdlg.h
# End Source File
# Begin Source File
SOURCE=..\..\include\wx\msw\radiobox.h
# End Source File
# Begin Source File

18
build/msw/wx_vc7_core.vcproj
View File

@@ -1901,6 +1901,21 @@
RelativePath="..\..\src\msw\printwin.cpp">
</File>
<File
RelativePath="..\..\src\msw\progdlg.cpp">
<FileConfiguration
Name="Universal Debug|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="Universal Release|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
ExcludedFromBuild="TRUE"/>
<FileConfiguration
Name="DLL Universal Release|Win32"
ExcludedFromBuild="TRUE"/>
</File>
<File
RelativePath="..\..\src\msw\radiobox.cpp">
<FileConfiguration
Name="Debug|Win32">
@@ -4474,6 +4489,9 @@
RelativePath="..\..\include\wx\msw\printwin.h">
</File>
<File
RelativePath="..\..\include\wx\msw\progdlg.h">
</File>
<File
RelativePath="..\..\include\wx\msw\radiobox.h">
</File>
<File

24
build/msw/wx_vc8_core.vcproj
View File

@@ -2568,6 +2568,26 @@
>
</File>
<File
RelativePath="..\..\src\msw\progdlg.cpp"
>
<FileConfiguration
Name="Universal Debug|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="Universal Release|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="DLL Universal Release|Win32"
ExcludedFromBuild="true"
/>
</File>
<File
RelativePath="..\..\src\msw\radiobox.cpp"
>
<FileConfiguration
@@ -5984,6 +6004,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\msw\progdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\radiobox.h"
>
</File>

24
build/msw/wx_vc9_core.vcproj
View File

@@ -2564,6 +2564,26 @@
>
</File>
<File
RelativePath="..\..\src\msw\progdlg.cpp"
>
<FileConfiguration
Name="Universal Debug|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="Universal Release|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="DLL Universal Debug|Win32"
ExcludedFromBuild="true"
/>
<FileConfiguration
Name="DLL Universal Release|Win32"
ExcludedFromBuild="true"
/>
</File>
<File
RelativePath="..\..\src\msw\radiobox.cpp"
>
<FileConfiguration
@@ -5980,6 +6000,10 @@
>
</File>
<File
RelativePath="..\..\include\wx\msw\progdlg.h"
>
</File>
<File
RelativePath="..\..\include\wx\msw\radiobox.h"
>
</File>