Add wxPreferencesEditor class.

Implements native UI for preferences editing. In particular, the API handles the differences between modal (Windows) and non-modal (OS X) preferences windows and provides platform's native look. Currently implemented natively for wxOSX/Cocoa, wxGTK and Windows (the latter is used as a fallback generic implementation as well). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73576 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2013-02-28 16:29:05 +00:00
parent d52a1abad3
commit 2aab96f58d
16 changed files with 4401 additions and 3173 deletions
--- a/Makefile.in
+++ b/Makefile.in
@@ -4818,6 +4818,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_persist.o \
 	monodll_pickerbase.o \
 	monodll_popupcmn.o \
 	monodll_preferencescmn.o \
 	monodll_prntbase.o \
 	monodll_quantize.o \
 	monodll_radiobtncmn.o \
@@ -4870,6 +4871,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS =  \
 	monodll_msgdlgg.o \
 	monodll_numdlgg.o \
 	monodll_progdlgg.o \
 	monodll_preferencesg.o \
 	monodll_printps.o \
 	monodll_renderg.o \
 	monodll_richmsgdlgg.o \
@@ -5037,6 +5039,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_persist.o \
 	monodll_pickerbase.o \
 	monodll_popupcmn.o \
 	monodll_preferencescmn.o \
 	monodll_prntbase.o \
 	monodll_quantize.o \
 	monodll_radiobtncmn.o \
@@ -5089,6 +5092,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS =  \
 	monodll_msgdlgg.o \
 	monodll_numdlgg.o \
 	monodll_progdlgg.o \
 	monodll_preferencesg.o \
 	monodll_printps.o \
 	monodll_renderg.o \
 	monodll_richmsgdlgg.o \
@@ -5863,6 +5867,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS =  \
 	monodll_cocoa_nonownedwnd.o \
 	monodll_osx_cocoa_notebook.o \
 	monodll_osx_cocoa_radiobut.o \
 	monodll_preferences.o \
 	monodll_cocoa_printdlg.o \
 	monodll_osx_cocoa_scrolbar.o \
 	monodll_osx_cocoa_slider.o \
@@ -7057,6 +7062,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_persist.o \
 	monolib_pickerbase.o \
 	monolib_popupcmn.o \
 	monolib_preferencescmn.o \
 	monolib_prntbase.o \
 	monolib_quantize.o \
 	monolib_radiobtncmn.o \
@@ -7109,6 +7115,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_1 =  \
 	monolib_msgdlgg.o \
 	monolib_numdlgg.o \
 	monolib_progdlgg.o \
 	monolib_preferencesg.o \
 	monolib_printps.o \
 	monolib_renderg.o \
 	monolib_richmsgdlgg.o \
@@ -7276,6 +7283,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_persist.o \
 	monolib_pickerbase.o \
 	monolib_popupcmn.o \
 	monolib_preferencescmn.o \
 	monolib_prntbase.o \
 	monolib_quantize.o \
 	monolib_radiobtncmn.o \
@@ -7328,6 +7336,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_1 =  \
 	monolib_msgdlgg.o \
 	monolib_numdlgg.o \
 	monolib_progdlgg.o \
 	monolib_preferencesg.o \
 	monolib_printps.o \
 	monolib_renderg.o \
 	monolib_richmsgdlgg.o \
@@ -8102,6 +8111,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_1 =  \
 	monolib_cocoa_nonownedwnd.o \
 	monolib_osx_cocoa_notebook.o \
 	monolib_osx_cocoa_radiobut.o \
 	monolib_preferences.o \
 	monolib_cocoa_printdlg.o \
 	monolib_osx_cocoa_scrolbar.o \
 	monolib_osx_cocoa_slider.o \
@@ -9468,6 +9478,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_persist.o \
 	coredll_pickerbase.o \
 	coredll_popupcmn.o \
 	coredll_preferencescmn.o \
 	coredll_prntbase.o \
 	coredll_quantize.o \
 	coredll_radiobtncmn.o \
@@ -9520,6 +9531,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_2 =  \
 	coredll_msgdlgg.o \
 	coredll_numdlgg.o \
 	coredll_progdlgg.o \
 	coredll_preferencesg.o \
 	coredll_printps.o \
 	coredll_renderg.o \
 	coredll_richmsgdlgg.o \
@@ -9687,6 +9699,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_persist.o \
 	coredll_pickerbase.o \
 	coredll_popupcmn.o \
 	coredll_preferencescmn.o \
 	coredll_prntbase.o \
 	coredll_quantize.o \
 	coredll_radiobtncmn.o \
@@ -9739,6 +9752,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_2 =  \
 	coredll_msgdlgg.o \
 	coredll_numdlgg.o \
 	coredll_progdlgg.o \
 	coredll_preferencesg.o \
 	coredll_printps.o \
 	coredll_renderg.o \
 	coredll_richmsgdlgg.o \
@@ -10513,6 +10527,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_2 =  \
 	coredll_cocoa_nonownedwnd.o \
 	coredll_osx_cocoa_notebook.o \
 	coredll_osx_cocoa_radiobut.o \
 	coredll_preferences.o \
 	coredll_cocoa_printdlg.o \
 	coredll_osx_cocoa_scrolbar.o \
 	coredll_osx_cocoa_slider.o \
@@ -11139,6 +11154,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_persist.o \
 	corelib_pickerbase.o \
 	corelib_popupcmn.o \
 	corelib_preferencescmn.o \
 	corelib_prntbase.o \
 	corelib_quantize.o \
 	corelib_radiobtncmn.o \
@@ -11191,6 +11207,7 @@ COND_USE_GUI_1_WXUNIV_0___CORE_SRC_OBJECTS_3 =  \
 	corelib_msgdlgg.o \
 	corelib_numdlgg.o \
 	corelib_progdlgg.o \
 	corelib_preferencesg.o \
 	corelib_printps.o \
 	corelib_renderg.o \
 	corelib_richmsgdlgg.o \
@@ -11358,6 +11375,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_persist.o \
 	corelib_pickerbase.o \
 	corelib_popupcmn.o \
 	corelib_preferencescmn.o \
 	corelib_prntbase.o \
 	corelib_quantize.o \
 	corelib_radiobtncmn.o \
@@ -11410,6 +11428,7 @@ COND_USE_GUI_1_WXUNIV_1___CORE_SRC_OBJECTS_3 =  \
 	corelib_msgdlgg.o \
 	corelib_numdlgg.o \
 	corelib_progdlgg.o \
 	corelib_preferencesg.o \
 	corelib_printps.o \
 	corelib_renderg.o \
 	corelib_richmsgdlgg.o \
@@ -12184,6 +12203,7 @@ COND_TOOLKIT_OSX_COCOA___GUI_SRC_OBJECTS_3 =  \
 	corelib_cocoa_nonownedwnd.o \
 	corelib_osx_cocoa_notebook.o \
 	corelib_osx_cocoa_radiobut.o \
 	corelib_preferences.o \
 	corelib_cocoa_printdlg.o \
 	corelib_osx_cocoa_scrolbar.o \
 	corelib_osx_cocoa_slider.o \
@@ -17716,6 +17736,9 @@ monodll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONODLL_ODEP
 monodll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
 monodll_preferences.o: $(srcdir)/src/osx/cocoa/preferences.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/preferences.mm
 monodll_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(MONODLL_ODEP)
 	$(CXXC) -c -o $@ $(MONODLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
@@ -21952,6 +21975,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@monodll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
@COND_USE_GUI_1@monodll_preferencescmn.o: $(srcdir)/src/common/preferencescmn.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/preferencescmn.cpp
@COND_USE_GUI_1@monodll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
@@ -22108,6 +22134,9 @@ monodll_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@monodll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
@COND_USE_GUI_1@monodll_preferencesg.o: $(srcdir)/src/generic/preferencesg.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/preferencesg.cpp
@COND_USE_GUI_1@monodll_printps.o: $(srcdir)/src/generic/printps.cpp $(MONODLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONODLL_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
@@ -23563,6 +23592,9 @@ monolib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(MONOLIB_ODEP
 monolib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
 monolib_preferences.o: $(srcdir)/src/osx/cocoa/preferences.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/preferences.mm
 monolib_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(MONOLIB_ODEP)
 	$(CXXC) -c -o $@ $(MONOLIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
@@ -27799,6 +27831,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@monolib_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
@COND_USE_GUI_1@monolib_preferencescmn.o: $(srcdir)/src/common/preferencescmn.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/preferencescmn.cpp
@COND_USE_GUI_1@monolib_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
@@ -27955,6 +27990,9 @@ monolib_sound_sdl.o: $(srcdir)/src/unix/sound_sdl.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@monolib_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
@COND_USE_GUI_1@monolib_preferencesg.o: $(srcdir)/src/generic/preferencesg.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/preferencesg.cpp
@COND_USE_GUI_1@monolib_printps.o: $(srcdir)/src/generic/printps.cpp $(MONOLIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(MONOLIB_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
@@ -30130,6 +30168,9 @@ coredll_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(COREDLL_ODEP
 coredll_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
 coredll_preferences.o: $(srcdir)/src/osx/cocoa/preferences.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/preferences.mm
 coredll_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(COREDLL_ODEP)
 	$(CXXC) -c -o $@ $(COREDLL_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
@@ -33802,6 +33843,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@coredll_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
@COND_USE_GUI_1@coredll_preferencescmn.o: $(srcdir)/src/common/preferencescmn.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/preferencescmn.cpp
@COND_USE_GUI_1@coredll_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
@@ -33958,6 +34002,9 @@ coredll_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@coredll_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
@COND_USE_GUI_1@coredll_preferencesg.o: $(srcdir)/src/generic/preferencesg.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/preferencesg.cpp
@COND_USE_GUI_1@coredll_printps.o: $(srcdir)/src/generic/printps.cpp $(COREDLL_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(COREDLL_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
@@ -34498,6 +34545,9 @@ corelib_osx_cocoa_notebook.o: $(srcdir)/src/osx/cocoa/notebook.mm $(CORELIB_ODEP
 corelib_osx_cocoa_radiobut.o: $(srcdir)/src/osx/cocoa/radiobut.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/radiobut.mm
 corelib_preferences.o: $(srcdir)/src/osx/cocoa/preferences.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/preferences.mm
 corelib_cocoa_printdlg.o: $(srcdir)/src/osx/cocoa/printdlg.mm $(CORELIB_ODEP)
 	$(CXXC) -c -o $@ $(CORELIB_OBJCXXFLAGS) $(srcdir)/src/osx/cocoa/printdlg.mm
@@ -38170,6 +38220,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@corelib_popupcmn.o: $(srcdir)/src/common/popupcmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/popupcmn.cpp
@COND_USE_GUI_1@corelib_preferencescmn.o: $(srcdir)/src/common/preferencescmn.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/preferencescmn.cpp
@COND_USE_GUI_1@corelib_prntbase.o: $(srcdir)/src/common/prntbase.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/common/prntbase.cpp
@@ -38326,6 +38379,9 @@ corelib_win32.o: $(srcdir)/src/univ/themes/win32.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@corelib_progdlgg.o: $(srcdir)/src/generic/progdlgg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/progdlgg.cpp
@COND_USE_GUI_1@corelib_preferencesg.o: $(srcdir)/src/generic/preferencesg.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/preferencesg.cpp
@COND_USE_GUI_1@corelib_printps.o: $(srcdir)/src/generic/printps.cpp $(CORELIB_ODEP)
@COND_USE_GUI_1@	$(CXXC) -c -o $@ $(CORELIB_CXXFLAGS) $(srcdir)/src/generic/printps.cpp
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -718,6 +718,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/common/persist.cpp
    src/common/pickerbase.cpp
    src/common/popupcmn.cpp
    src/common/preferencescmn.cpp
    src/common/prntbase.cpp
    src/common/quantize.cpp
    src/common/radiobtncmn.cpp
@@ -770,6 +771,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/generic/msgdlgg.cpp
    src/generic/numdlgg.cpp
    src/generic/progdlgg.cpp
    src/generic/preferencesg.cpp
    src/generic/printps.cpp
    src/generic/renderg.cpp
    src/generic/richmsgdlgg.cpp
@@ -2540,6 +2542,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
    src/osx/cocoa/nonownedwnd.mm
    src/osx/cocoa/notebook.mm
    src/osx/cocoa/radiobut.mm
    src/osx/cocoa/preferences.mm
    src/osx/cocoa/printdlg.mm
    src/osx/cocoa/scrolbar.mm
    src/osx/cocoa/slider.mm
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -1929,6 +1929,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_persist.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
 	$(OBJS)\monodll_preferencescmn.obj \
 	$(OBJS)\monodll_prntbase.obj \
 	$(OBJS)\monodll_quantize.obj \
 	$(OBJS)\monodll_radiobtncmn.obj \
@@ -1981,6 +1982,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msgdlgg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
 	$(OBJS)\monodll_preferencesg.obj \
 	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_richmsgdlgg.obj \
@@ -2148,6 +2150,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_persist.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
 	$(OBJS)\monodll_preferencescmn.obj \
 	$(OBJS)\monodll_prntbase.obj \
 	$(OBJS)\monodll_quantize.obj \
 	$(OBJS)\monodll_radiobtncmn.obj \
@@ -2200,6 +2203,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msgdlgg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
 	$(OBJS)\monodll_preferencesg.obj \
 	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_richmsgdlgg.obj \
@@ -2662,6 +2666,7 @@ ____GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cocoa_nonownedwnd.obj \
 	$(OBJS)\monodll_osx_cocoa_notebook.obj \
 	$(OBJS)\monodll_osx_cocoa_radiobut.obj \
 	$(OBJS)\monodll_preferences.obj \
 	$(OBJS)\monodll_cocoa_printdlg.obj \
 	$(OBJS)\monodll_osx_cocoa_scrolbar.obj \
 	$(OBJS)\monodll_osx_cocoa_slider.obj \
@@ -3314,6 +3319,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_persist.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
 	$(OBJS)\monolib_preferencescmn.obj \
 	$(OBJS)\monolib_prntbase.obj \
 	$(OBJS)\monolib_quantize.obj \
 	$(OBJS)\monolib_radiobtncmn.obj \
@@ -3366,6 +3372,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msgdlgg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
 	$(OBJS)\monolib_preferencesg.obj \
 	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_richmsgdlgg.obj \
@@ -3533,6 +3540,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_persist.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
 	$(OBJS)\monolib_preferencescmn.obj \
 	$(OBJS)\monolib_prntbase.obj \
 	$(OBJS)\monolib_quantize.obj \
 	$(OBJS)\monolib_radiobtncmn.obj \
@@ -3585,6 +3593,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msgdlgg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
 	$(OBJS)\monolib_preferencesg.obj \
 	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_richmsgdlgg.obj \
@@ -4047,6 +4056,7 @@ ____GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cocoa_nonownedwnd.obj \
 	$(OBJS)\monolib_osx_cocoa_notebook.obj \
 	$(OBJS)\monolib_osx_cocoa_radiobut.obj \
 	$(OBJS)\monolib_preferences.obj \
 	$(OBJS)\monolib_cocoa_printdlg.obj \
 	$(OBJS)\monolib_osx_cocoa_scrolbar.obj \
 	$(OBJS)\monolib_osx_cocoa_slider.obj \
@@ -4604,6 +4614,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_persist.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
 	$(OBJS)\coredll_preferencescmn.obj \
 	$(OBJS)\coredll_prntbase.obj \
 	$(OBJS)\coredll_quantize.obj \
 	$(OBJS)\coredll_radiobtncmn.obj \
@@ -4656,6 +4667,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msgdlgg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
 	$(OBJS)\coredll_preferencesg.obj \
 	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_richmsgdlgg.obj \
@@ -4823,6 +4835,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_persist.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
 	$(OBJS)\coredll_preferencescmn.obj \
 	$(OBJS)\coredll_prntbase.obj \
 	$(OBJS)\coredll_quantize.obj \
 	$(OBJS)\coredll_radiobtncmn.obj \
@@ -4875,6 +4888,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msgdlgg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
 	$(OBJS)\coredll_preferencesg.obj \
 	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_richmsgdlgg.obj \
@@ -5337,6 +5351,7 @@ ____GUI_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cocoa_nonownedwnd.obj \
 	$(OBJS)\coredll_osx_cocoa_notebook.obj \
 	$(OBJS)\coredll_osx_cocoa_radiobut.obj \
 	$(OBJS)\coredll_preferences.obj \
 	$(OBJS)\coredll_cocoa_printdlg.obj \
 	$(OBJS)\coredll_osx_cocoa_scrolbar.obj \
 	$(OBJS)\coredll_osx_cocoa_slider.obj \
@@ -5644,6 +5659,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_persist.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
 	$(OBJS)\corelib_preferencescmn.obj \
 	$(OBJS)\corelib_prntbase.obj \
 	$(OBJS)\corelib_quantize.obj \
 	$(OBJS)\corelib_radiobtncmn.obj \
@@ -5696,6 +5712,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msgdlgg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
 	$(OBJS)\corelib_preferencesg.obj \
 	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_richmsgdlgg.obj \
@@ -5863,6 +5880,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_persist.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
 	$(OBJS)\corelib_preferencescmn.obj \
 	$(OBJS)\corelib_prntbase.obj \
 	$(OBJS)\corelib_quantize.obj \
 	$(OBJS)\corelib_radiobtncmn.obj \
@@ -5915,6 +5933,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msgdlgg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
 	$(OBJS)\corelib_preferencesg.obj \
 	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_richmsgdlgg.obj \
@@ -6377,6 +6396,7 @@ ____GUI_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cocoa_nonownedwnd.obj \
 	$(OBJS)\corelib_osx_cocoa_notebook.obj \
 	$(OBJS)\corelib_osx_cocoa_radiobut.obj \
 	$(OBJS)\corelib_preferences.obj \
 	$(OBJS)\corelib_cocoa_printdlg.obj \
 	$(OBJS)\corelib_osx_cocoa_scrolbar.obj \
 	$(OBJS)\corelib_osx_cocoa_slider.obj \
@@ -11435,6 +11455,8 @@ $(OBJS)\monodll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\monodll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\monodll_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\monodll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\monodll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -15129,6 +15151,11 @@ $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -15389,6 +15416,11 @@ $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp
@@ -16948,6 +16980,8 @@ $(OBJS)\monolib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\monolib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\monolib_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\monolib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\monolib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -20642,6 +20676,11 @@ $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -20902,6 +20941,11 @@ $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp
@@ -22894,6 +22938,8 @@ $(OBJS)\coredll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\coredll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\coredll_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\coredll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\coredll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -26152,6 +26198,11 @@ $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -26412,6 +26463,11 @@ $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp
@@ -26971,6 +27027,8 @@ $(OBJS)\corelib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\corelib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\corelib_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\corelib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\corelib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -30229,6 +30287,11 @@ $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -30489,6 +30552,11 @@ $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp
--- a/build/msw/makefile.gcc
+++ b/build/msw/makefile.gcc
@@ -1953,6 +1953,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_persist.o \
 	$(OBJS)\monodll_pickerbase.o \
 	$(OBJS)\monodll_popupcmn.o \
 	$(OBJS)\monodll_preferencescmn.o \
 	$(OBJS)\monodll_prntbase.o \
 	$(OBJS)\monodll_quantize.o \
 	$(OBJS)\monodll_radiobtncmn.o \
@@ -2005,6 +2006,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msgdlgg.o \
 	$(OBJS)\monodll_numdlgg.o \
 	$(OBJS)\monodll_progdlgg.o \
 	$(OBJS)\monodll_preferencesg.o \
 	$(OBJS)\monodll_printps.o \
 	$(OBJS)\monodll_renderg.o \
 	$(OBJS)\monodll_richmsgdlgg.o \
@@ -2174,6 +2176,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_persist.o \
 	$(OBJS)\monodll_pickerbase.o \
 	$(OBJS)\monodll_popupcmn.o \
 	$(OBJS)\monodll_preferencescmn.o \
 	$(OBJS)\monodll_prntbase.o \
 	$(OBJS)\monodll_quantize.o \
 	$(OBJS)\monodll_radiobtncmn.o \
@@ -2226,6 +2229,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msgdlgg.o \
 	$(OBJS)\monodll_numdlgg.o \
 	$(OBJS)\monodll_progdlgg.o \
 	$(OBJS)\monodll_preferencesg.o \
 	$(OBJS)\monodll_printps.o \
 	$(OBJS)\monodll_renderg.o \
 	$(OBJS)\monodll_richmsgdlgg.o \
@@ -2695,6 +2699,7 @@ ____GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cocoa_nonownedwnd.o \
 	$(OBJS)\monodll_osx_cocoa_notebook.o \
 	$(OBJS)\monodll_osx_cocoa_radiobut.o \
 	$(OBJS)\monodll_preferences.o \
 	$(OBJS)\monodll_cocoa_printdlg.o \
 	$(OBJS)\monodll_osx_cocoa_scrolbar.o \
 	$(OBJS)\monodll_osx_cocoa_slider.o \
@@ -3358,6 +3363,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_persist.o \
 	$(OBJS)\monolib_pickerbase.o \
 	$(OBJS)\monolib_popupcmn.o \
 	$(OBJS)\monolib_preferencescmn.o \
 	$(OBJS)\monolib_prntbase.o \
 	$(OBJS)\monolib_quantize.o \
 	$(OBJS)\monolib_radiobtncmn.o \
@@ -3410,6 +3416,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msgdlgg.o \
 	$(OBJS)\monolib_numdlgg.o \
 	$(OBJS)\monolib_progdlgg.o \
 	$(OBJS)\monolib_preferencesg.o \
 	$(OBJS)\monolib_printps.o \
 	$(OBJS)\monolib_renderg.o \
 	$(OBJS)\monolib_richmsgdlgg.o \
@@ -3579,6 +3586,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_persist.o \
 	$(OBJS)\monolib_pickerbase.o \
 	$(OBJS)\monolib_popupcmn.o \
 	$(OBJS)\monolib_preferencescmn.o \
 	$(OBJS)\monolib_prntbase.o \
 	$(OBJS)\monolib_quantize.o \
 	$(OBJS)\monolib_radiobtncmn.o \
@@ -3631,6 +3639,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msgdlgg.o \
 	$(OBJS)\monolib_numdlgg.o \
 	$(OBJS)\monolib_progdlgg.o \
 	$(OBJS)\monolib_preferencesg.o \
 	$(OBJS)\monolib_printps.o \
 	$(OBJS)\monolib_renderg.o \
 	$(OBJS)\monolib_richmsgdlgg.o \
@@ -4100,6 +4109,7 @@ ____GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cocoa_nonownedwnd.o \
 	$(OBJS)\monolib_osx_cocoa_notebook.o \
 	$(OBJS)\monolib_osx_cocoa_radiobut.o \
 	$(OBJS)\monolib_preferences.o \
 	$(OBJS)\monolib_cocoa_printdlg.o \
 	$(OBJS)\monolib_osx_cocoa_scrolbar.o \
 	$(OBJS)\monolib_osx_cocoa_slider.o \
@@ -4678,6 +4688,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_persist.o \
 	$(OBJS)\coredll_pickerbase.o \
 	$(OBJS)\coredll_popupcmn.o \
 	$(OBJS)\coredll_preferencescmn.o \
 	$(OBJS)\coredll_prntbase.o \
 	$(OBJS)\coredll_quantize.o \
 	$(OBJS)\coredll_radiobtncmn.o \
@@ -4730,6 +4741,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msgdlgg.o \
 	$(OBJS)\coredll_numdlgg.o \
 	$(OBJS)\coredll_progdlgg.o \
 	$(OBJS)\coredll_preferencesg.o \
 	$(OBJS)\coredll_printps.o \
 	$(OBJS)\coredll_renderg.o \
 	$(OBJS)\coredll_richmsgdlgg.o \
@@ -4899,6 +4911,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_persist.o \
 	$(OBJS)\coredll_pickerbase.o \
 	$(OBJS)\coredll_popupcmn.o \
 	$(OBJS)\coredll_preferencescmn.o \
 	$(OBJS)\coredll_prntbase.o \
 	$(OBJS)\coredll_quantize.o \
 	$(OBJS)\coredll_radiobtncmn.o \
@@ -4951,6 +4964,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msgdlgg.o \
 	$(OBJS)\coredll_numdlgg.o \
 	$(OBJS)\coredll_progdlgg.o \
 	$(OBJS)\coredll_preferencesg.o \
 	$(OBJS)\coredll_printps.o \
 	$(OBJS)\coredll_renderg.o \
 	$(OBJS)\coredll_richmsgdlgg.o \
@@ -5420,6 +5434,7 @@ ____GUI_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cocoa_nonownedwnd.o \
 	$(OBJS)\coredll_osx_cocoa_notebook.o \
 	$(OBJS)\coredll_osx_cocoa_radiobut.o \
 	$(OBJS)\coredll_preferences.o \
 	$(OBJS)\coredll_cocoa_printdlg.o \
 	$(OBJS)\coredll_osx_cocoa_scrolbar.o \
 	$(OBJS)\coredll_osx_cocoa_slider.o \
@@ -5732,6 +5747,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_persist.o \
 	$(OBJS)\corelib_pickerbase.o \
 	$(OBJS)\corelib_popupcmn.o \
 	$(OBJS)\corelib_preferencescmn.o \
 	$(OBJS)\corelib_prntbase.o \
 	$(OBJS)\corelib_quantize.o \
 	$(OBJS)\corelib_radiobtncmn.o \
@@ -5784,6 +5800,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msgdlgg.o \
 	$(OBJS)\corelib_numdlgg.o \
 	$(OBJS)\corelib_progdlgg.o \
 	$(OBJS)\corelib_preferencesg.o \
 	$(OBJS)\corelib_printps.o \
 	$(OBJS)\corelib_renderg.o \
 	$(OBJS)\corelib_richmsgdlgg.o \
@@ -5953,6 +5970,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_persist.o \
 	$(OBJS)\corelib_pickerbase.o \
 	$(OBJS)\corelib_popupcmn.o \
 	$(OBJS)\corelib_preferencescmn.o \
 	$(OBJS)\corelib_prntbase.o \
 	$(OBJS)\corelib_quantize.o \
 	$(OBJS)\corelib_radiobtncmn.o \
@@ -6005,6 +6023,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msgdlgg.o \
 	$(OBJS)\corelib_numdlgg.o \
 	$(OBJS)\corelib_progdlgg.o \
 	$(OBJS)\corelib_preferencesg.o \
 	$(OBJS)\corelib_printps.o \
 	$(OBJS)\corelib_renderg.o \
 	$(OBJS)\corelib_richmsgdlgg.o \
@@ -6474,6 +6493,7 @@ ____GUI_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cocoa_nonownedwnd.o \
 	$(OBJS)\corelib_osx_cocoa_notebook.o \
 	$(OBJS)\corelib_osx_cocoa_radiobut.o \
 	$(OBJS)\corelib_preferences.o \
 	$(OBJS)\corelib_cocoa_printdlg.o \
 	$(OBJS)\corelib_osx_cocoa_scrolbar.o \
 	$(OBJS)\corelib_osx_cocoa_slider.o \
@@ -11727,6 +11747,8 @@ $(OBJS)\monodll_osx_cocoa_notebook.o: ../../src/osx/cocoa/notebook.mm
 $(OBJS)\monodll_osx_cocoa_radiobut.o: ../../src/osx/cocoa/radiobut.mm
 $(OBJS)\monodll_preferences.o: ../../src/osx/cocoa/preferences.mm
 $(OBJS)\monodll_cocoa_printdlg.o: ../../src/osx/cocoa/printdlg.mm
 $(OBJS)\monodll_osx_cocoa_scrolbar.o: ../../src/osx/cocoa/scrolbar.mm
@@ -16639,6 +16661,11 @@ $(OBJS)\monodll_popupcmn.o: ../../src/common/popupcmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_preferencescmn.o: ../../src/common/preferencescmn.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_prntbase.o: ../../src/common/prntbase.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -16899,6 +16926,11 @@ $(OBJS)\monodll_progdlgg.o: ../../src/generic/progdlgg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_preferencesg.o: ../../src/generic/preferencesg.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monodll_printps.o: ../../src/generic/printps.cpp
 	$(CXX) -c -o $@ $(MONODLL_CXXFLAGS) $(CPPDEPS) $<
@@ -18684,6 +18716,8 @@ $(OBJS)\monolib_osx_cocoa_notebook.o: ../../src/osx/cocoa/notebook.mm
 $(OBJS)\monolib_osx_cocoa_radiobut.o: ../../src/osx/cocoa/radiobut.mm
 $(OBJS)\monolib_preferences.o: ../../src/osx/cocoa/preferences.mm
 $(OBJS)\monolib_cocoa_printdlg.o: ../../src/osx/cocoa/printdlg.mm
 $(OBJS)\monolib_osx_cocoa_scrolbar.o: ../../src/osx/cocoa/scrolbar.mm
@@ -23596,6 +23630,11 @@ $(OBJS)\monolib_popupcmn.o: ../../src/common/popupcmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_preferencescmn.o: ../../src/common/preferencescmn.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_prntbase.o: ../../src/common/prntbase.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -23856,6 +23895,11 @@ $(OBJS)\monolib_progdlgg.o: ../../src/generic/progdlgg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_preferencesg.o: ../../src/generic/preferencesg.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\monolib_printps.o: ../../src/generic/printps.cpp
 	$(CXX) -c -o $@ $(MONOLIB_CXXFLAGS) $(CPPDEPS) $<
@@ -26074,6 +26118,8 @@ $(OBJS)\coredll_osx_cocoa_notebook.o: ../../src/osx/cocoa/notebook.mm
 $(OBJS)\coredll_osx_cocoa_radiobut.o: ../../src/osx/cocoa/radiobut.mm
 $(OBJS)\coredll_preferences.o: ../../src/osx/cocoa/preferences.mm
 $(OBJS)\coredll_cocoa_printdlg.o: ../../src/osx/cocoa/printdlg.mm
 $(OBJS)\coredll_osx_cocoa_scrolbar.o: ../../src/osx/cocoa/scrolbar.mm
@@ -30550,6 +30596,11 @@ $(OBJS)\coredll_popupcmn.o: ../../src/common/popupcmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_preferencescmn.o: ../../src/common/preferencescmn.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_prntbase.o: ../../src/common/prntbase.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -30810,6 +30861,11 @@ $(OBJS)\coredll_progdlgg.o: ../../src/generic/progdlgg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_preferencesg.o: ../../src/generic/preferencesg.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\coredll_printps.o: ../../src/generic/printps.cpp
 	$(CXX) -c -o $@ $(COREDLL_CXXFLAGS) $(CPPDEPS) $<
@@ -31369,6 +31425,8 @@ $(OBJS)\corelib_osx_cocoa_notebook.o: ../../src/osx/cocoa/notebook.mm
 $(OBJS)\corelib_osx_cocoa_radiobut.o: ../../src/osx/cocoa/radiobut.mm
 $(OBJS)\corelib_preferences.o: ../../src/osx/cocoa/preferences.mm
 $(OBJS)\corelib_cocoa_printdlg.o: ../../src/osx/cocoa/printdlg.mm
 $(OBJS)\corelib_osx_cocoa_scrolbar.o: ../../src/osx/cocoa/scrolbar.mm
@@ -35845,6 +35903,11 @@ $(OBJS)\corelib_popupcmn.o: ../../src/common/popupcmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_preferencescmn.o: ../../src/common/preferencescmn.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_prntbase.o: ../../src/common/prntbase.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
@@ -36105,6 +36168,11 @@ $(OBJS)\corelib_progdlgg.o: ../../src/generic/progdlgg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_preferencesg.o: ../../src/generic/preferencesg.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
 endif
 ifeq ($(USE_GUI),1)
 $(OBJS)\corelib_printps.o: ../../src/generic/printps.cpp
 	$(CXX) -c -o $@ $(CORELIB_CXXFLAGS) $(CPPDEPS) $<
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -2257,6 +2257,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_persist.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
 	$(OBJS)\monodll_preferencescmn.obj \
 	$(OBJS)\monodll_prntbase.obj \
 	$(OBJS)\monodll_quantize.obj \
 	$(OBJS)\monodll_radiobtncmn.obj \
@@ -2309,6 +2310,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msgdlgg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
 	$(OBJS)\monodll_preferencesg.obj \
 	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_richmsgdlgg.obj \
@@ -2476,6 +2478,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_persist.obj \
 	$(OBJS)\monodll_pickerbase.obj \
 	$(OBJS)\monodll_popupcmn.obj \
 	$(OBJS)\monodll_preferencescmn.obj \
 	$(OBJS)\monodll_prntbase.obj \
 	$(OBJS)\monodll_quantize.obj \
 	$(OBJS)\monodll_radiobtncmn.obj \
@@ -2528,6 +2531,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_msgdlgg.obj \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
 	$(OBJS)\monodll_preferencesg.obj \
 	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_richmsgdlgg.obj \
@@ -2990,6 +2994,7 @@ ____GUI_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_cocoa_nonownedwnd.obj \
 	$(OBJS)\monodll_osx_cocoa_notebook.obj \
 	$(OBJS)\monodll_osx_cocoa_radiobut.obj \
 	$(OBJS)\monodll_preferences.obj \
 	$(OBJS)\monodll_cocoa_printdlg.obj \
 	$(OBJS)\monodll_osx_cocoa_scrolbar.obj \
 	$(OBJS)\monodll_osx_cocoa_slider.obj \
@@ -3648,6 +3653,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_persist.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
 	$(OBJS)\monolib_preferencescmn.obj \
 	$(OBJS)\monolib_prntbase.obj \
 	$(OBJS)\monolib_quantize.obj \
 	$(OBJS)\monolib_radiobtncmn.obj \
@@ -3700,6 +3706,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msgdlgg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
 	$(OBJS)\monolib_preferencesg.obj \
 	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_richmsgdlgg.obj \
@@ -3867,6 +3874,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_persist.obj \
 	$(OBJS)\monolib_pickerbase.obj \
 	$(OBJS)\monolib_popupcmn.obj \
 	$(OBJS)\monolib_preferencescmn.obj \
 	$(OBJS)\monolib_prntbase.obj \
 	$(OBJS)\monolib_quantize.obj \
 	$(OBJS)\monolib_radiobtncmn.obj \
@@ -3919,6 +3927,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_msgdlgg.obj \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
 	$(OBJS)\monolib_preferencesg.obj \
 	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_richmsgdlgg.obj \
@@ -4381,6 +4390,7 @@ ____GUI_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_cocoa_nonownedwnd.obj \
 	$(OBJS)\monolib_osx_cocoa_notebook.obj \
 	$(OBJS)\monolib_osx_cocoa_radiobut.obj \
 	$(OBJS)\monolib_preferences.obj \
 	$(OBJS)\monolib_cocoa_printdlg.obj \
 	$(OBJS)\monolib_osx_cocoa_scrolbar.obj \
 	$(OBJS)\monolib_osx_cocoa_slider.obj \
@@ -5004,6 +5014,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_persist.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
 	$(OBJS)\coredll_preferencescmn.obj \
 	$(OBJS)\coredll_prntbase.obj \
 	$(OBJS)\coredll_quantize.obj \
 	$(OBJS)\coredll_radiobtncmn.obj \
@@ -5056,6 +5067,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msgdlgg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
 	$(OBJS)\coredll_preferencesg.obj \
 	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_richmsgdlgg.obj \
@@ -5223,6 +5235,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_persist.obj \
 	$(OBJS)\coredll_pickerbase.obj \
 	$(OBJS)\coredll_popupcmn.obj \
 	$(OBJS)\coredll_preferencescmn.obj \
 	$(OBJS)\coredll_prntbase.obj \
 	$(OBJS)\coredll_quantize.obj \
 	$(OBJS)\coredll_radiobtncmn.obj \
@@ -5275,6 +5288,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_msgdlgg.obj \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
 	$(OBJS)\coredll_preferencesg.obj \
 	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_richmsgdlgg.obj \
@@ -5737,6 +5751,7 @@ ____GUI_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_cocoa_nonownedwnd.obj \
 	$(OBJS)\coredll_osx_cocoa_notebook.obj \
 	$(OBJS)\coredll_osx_cocoa_radiobut.obj \
 	$(OBJS)\coredll_preferences.obj \
 	$(OBJS)\coredll_cocoa_printdlg.obj \
 	$(OBJS)\coredll_osx_cocoa_scrolbar.obj \
 	$(OBJS)\coredll_osx_cocoa_slider.obj \
@@ -6050,6 +6065,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_persist.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
 	$(OBJS)\corelib_preferencescmn.obj \
 	$(OBJS)\corelib_prntbase.obj \
 	$(OBJS)\corelib_quantize.obj \
 	$(OBJS)\corelib_radiobtncmn.obj \
@@ -6102,6 +6118,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msgdlgg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
 	$(OBJS)\corelib_preferencesg.obj \
 	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_richmsgdlgg.obj \
@@ -6269,6 +6286,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_persist.obj \
 	$(OBJS)\corelib_pickerbase.obj \
 	$(OBJS)\corelib_popupcmn.obj \
 	$(OBJS)\corelib_preferencescmn.obj \
 	$(OBJS)\corelib_prntbase.obj \
 	$(OBJS)\corelib_quantize.obj \
 	$(OBJS)\corelib_radiobtncmn.obj \
@@ -6321,6 +6339,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_msgdlgg.obj \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
 	$(OBJS)\corelib_preferencesg.obj \
 	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_richmsgdlgg.obj \
@@ -6783,6 +6802,7 @@ ____GUI_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_cocoa_nonownedwnd.obj \
 	$(OBJS)\corelib_osx_cocoa_notebook.obj \
 	$(OBJS)\corelib_osx_cocoa_radiobut.obj \
 	$(OBJS)\corelib_preferences.obj \
 	$(OBJS)\corelib_cocoa_printdlg.obj \
 	$(OBJS)\corelib_osx_cocoa_scrolbar.obj \
 	$(OBJS)\corelib_osx_cocoa_slider.obj \
@@ -12155,6 +12175,8 @@ $(OBJS)\monodll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\monodll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\monodll_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\monodll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\monodll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -15849,6 +15871,11 @@ $(OBJS)\monodll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -16109,6 +16136,11 @@ $(OBJS)\monodll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) ..\..\src\generic\printps.cpp
@@ -17668,6 +17700,8 @@ $(OBJS)\monolib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\monolib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\monolib_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\monolib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\monolib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -21362,6 +21396,11 @@ $(OBJS)\monolib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -21622,6 +21661,11 @@ $(OBJS)\monolib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) ..\..\src\generic\printps.cpp
@@ -23614,6 +23658,8 @@ $(OBJS)\coredll_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\coredll_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\coredll_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\coredll_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\coredll_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -26872,6 +26918,11 @@ $(OBJS)\coredll_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -27132,6 +27183,11 @@ $(OBJS)\coredll_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) ..\..\src\generic\printps.cpp
@@ -27691,6 +27747,8 @@ $(OBJS)\corelib_osx_cocoa_notebook.obj: ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\corelib_osx_cocoa_radiobut.obj: ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\corelib_preferences.obj: ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\corelib_cocoa_printdlg.obj: ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\corelib_osx_cocoa_scrolbar.obj: ..\..\src\osx\cocoa\scrolbar.mm
@@ -30949,6 +31007,11 @@ $(OBJS)\corelib_popupcmn.obj: ..\..\src\common\popupcmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\popupcmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_preferencescmn.obj: ..\..\src\common\preferencescmn.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\preferencescmn.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\common\prntbase.cpp
@@ -31209,6 +31272,11 @@ $(OBJS)\corelib_progdlgg.obj: ..\..\src\generic\progdlgg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\progdlgg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_preferencesg.obj: ..\..\src\generic\preferencesg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\preferencesg.cpp
 !endif
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) ..\..\src\generic\printps.cpp
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -391,6 +391,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_persist.obj &
 	$(OBJS)\monodll_pickerbase.obj &
 	$(OBJS)\monodll_popupcmn.obj &
 	$(OBJS)\monodll_preferencescmn.obj &
 	$(OBJS)\monodll_prntbase.obj &
 	$(OBJS)\monodll_quantize.obj &
 	$(OBJS)\monodll_radiobtncmn.obj &
@@ -443,6 +444,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_msgdlgg.obj &
 	$(OBJS)\monodll_numdlgg.obj &
 	$(OBJS)\monodll_progdlgg.obj &
 	$(OBJS)\monodll_preferencesg.obj &
 	$(OBJS)\monodll_printps.obj &
 	$(OBJS)\monodll_renderg.obj &
 	$(OBJS)\monodll_richmsgdlgg.obj &
@@ -612,6 +614,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_persist.obj &
 	$(OBJS)\monodll_pickerbase.obj &
 	$(OBJS)\monodll_popupcmn.obj &
 	$(OBJS)\monodll_preferencescmn.obj &
 	$(OBJS)\monodll_prntbase.obj &
 	$(OBJS)\monodll_quantize.obj &
 	$(OBJS)\monodll_radiobtncmn.obj &
@@ -664,6 +667,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_msgdlgg.obj &
 	$(OBJS)\monodll_numdlgg.obj &
 	$(OBJS)\monodll_progdlgg.obj &
 	$(OBJS)\monodll_preferencesg.obj &
 	$(OBJS)\monodll_printps.obj &
 	$(OBJS)\monodll_renderg.obj &
 	$(OBJS)\monodll_richmsgdlgg.obj &
@@ -1134,6 +1138,7 @@ ____GUI_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_cocoa_nonownedwnd.obj &
 	$(OBJS)\monodll_osx_cocoa_notebook.obj &
 	$(OBJS)\monodll_osx_cocoa_radiobut.obj &
 	$(OBJS)\monodll_preferences.obj &
 	$(OBJS)\monodll_cocoa_printdlg.obj &
 	$(OBJS)\monodll_osx_cocoa_scrolbar.obj &
 	$(OBJS)\monodll_osx_cocoa_slider.obj &
@@ -1812,6 +1817,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_persist.obj &
 	$(OBJS)\monolib_pickerbase.obj &
 	$(OBJS)\monolib_popupcmn.obj &
 	$(OBJS)\monolib_preferencescmn.obj &
 	$(OBJS)\monolib_prntbase.obj &
 	$(OBJS)\monolib_quantize.obj &
 	$(OBJS)\monolib_radiobtncmn.obj &
@@ -1864,6 +1870,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_msgdlgg.obj &
 	$(OBJS)\monolib_numdlgg.obj &
 	$(OBJS)\monolib_progdlgg.obj &
 	$(OBJS)\monolib_preferencesg.obj &
 	$(OBJS)\monolib_printps.obj &
 	$(OBJS)\monolib_renderg.obj &
 	$(OBJS)\monolib_richmsgdlgg.obj &
@@ -2033,6 +2040,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_persist.obj &
 	$(OBJS)\monolib_pickerbase.obj &
 	$(OBJS)\monolib_popupcmn.obj &
 	$(OBJS)\monolib_preferencescmn.obj &
 	$(OBJS)\monolib_prntbase.obj &
 	$(OBJS)\monolib_quantize.obj &
 	$(OBJS)\monolib_radiobtncmn.obj &
@@ -2085,6 +2093,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_msgdlgg.obj &
 	$(OBJS)\monolib_numdlgg.obj &
 	$(OBJS)\monolib_progdlgg.obj &
 	$(OBJS)\monolib_preferencesg.obj &
 	$(OBJS)\monolib_printps.obj &
 	$(OBJS)\monolib_renderg.obj &
 	$(OBJS)\monolib_richmsgdlgg.obj &
@@ -2555,6 +2564,7 @@ ____GUI_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_cocoa_nonownedwnd.obj &
 	$(OBJS)\monolib_osx_cocoa_notebook.obj &
 	$(OBJS)\monolib_osx_cocoa_radiobut.obj &
 	$(OBJS)\monolib_preferences.obj &
 	$(OBJS)\monolib_cocoa_printdlg.obj &
 	$(OBJS)\monolib_osx_cocoa_scrolbar.obj &
 	$(OBJS)\monolib_osx_cocoa_slider.obj &
@@ -3158,6 +3168,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_persist.obj &
 	$(OBJS)\coredll_pickerbase.obj &
 	$(OBJS)\coredll_popupcmn.obj &
 	$(OBJS)\coredll_preferencescmn.obj &
 	$(OBJS)\coredll_prntbase.obj &
 	$(OBJS)\coredll_quantize.obj &
 	$(OBJS)\coredll_radiobtncmn.obj &
@@ -3210,6 +3221,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_msgdlgg.obj &
 	$(OBJS)\coredll_numdlgg.obj &
 	$(OBJS)\coredll_progdlgg.obj &
 	$(OBJS)\coredll_preferencesg.obj &
 	$(OBJS)\coredll_printps.obj &
 	$(OBJS)\coredll_renderg.obj &
 	$(OBJS)\coredll_richmsgdlgg.obj &
@@ -3379,6 +3391,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_persist.obj &
 	$(OBJS)\coredll_pickerbase.obj &
 	$(OBJS)\coredll_popupcmn.obj &
 	$(OBJS)\coredll_preferencescmn.obj &
 	$(OBJS)\coredll_prntbase.obj &
 	$(OBJS)\coredll_quantize.obj &
 	$(OBJS)\coredll_radiobtncmn.obj &
@@ -3431,6 +3444,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_msgdlgg.obj &
 	$(OBJS)\coredll_numdlgg.obj &
 	$(OBJS)\coredll_progdlgg.obj &
 	$(OBJS)\coredll_preferencesg.obj &
 	$(OBJS)\coredll_printps.obj &
 	$(OBJS)\coredll_renderg.obj &
 	$(OBJS)\coredll_richmsgdlgg.obj &
@@ -3901,6 +3915,7 @@ ____GUI_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_cocoa_nonownedwnd.obj &
 	$(OBJS)\coredll_osx_cocoa_notebook.obj &
 	$(OBJS)\coredll_osx_cocoa_radiobut.obj &
 	$(OBJS)\coredll_preferences.obj &
 	$(OBJS)\coredll_cocoa_printdlg.obj &
 	$(OBJS)\coredll_osx_cocoa_scrolbar.obj &
 	$(OBJS)\coredll_osx_cocoa_slider.obj &
@@ -4217,6 +4232,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_persist.obj &
 	$(OBJS)\corelib_pickerbase.obj &
 	$(OBJS)\corelib_popupcmn.obj &
 	$(OBJS)\corelib_preferencescmn.obj &
 	$(OBJS)\corelib_prntbase.obj &
 	$(OBJS)\corelib_quantize.obj &
 	$(OBJS)\corelib_radiobtncmn.obj &
@@ -4269,6 +4285,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_msgdlgg.obj &
 	$(OBJS)\corelib_numdlgg.obj &
 	$(OBJS)\corelib_progdlgg.obj &
 	$(OBJS)\corelib_preferencesg.obj &
 	$(OBJS)\corelib_printps.obj &
 	$(OBJS)\corelib_renderg.obj &
 	$(OBJS)\corelib_richmsgdlgg.obj &
@@ -4438,6 +4455,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_persist.obj &
 	$(OBJS)\corelib_pickerbase.obj &
 	$(OBJS)\corelib_popupcmn.obj &
 	$(OBJS)\corelib_preferencescmn.obj &
 	$(OBJS)\corelib_prntbase.obj &
 	$(OBJS)\corelib_quantize.obj &
 	$(OBJS)\corelib_radiobtncmn.obj &
@@ -4490,6 +4508,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_msgdlgg.obj &
 	$(OBJS)\corelib_numdlgg.obj &
 	$(OBJS)\corelib_progdlgg.obj &
 	$(OBJS)\corelib_preferencesg.obj &
 	$(OBJS)\corelib_printps.obj &
 	$(OBJS)\corelib_renderg.obj &
 	$(OBJS)\corelib_richmsgdlgg.obj &
@@ -4960,6 +4979,7 @@ ____GUI_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_cocoa_nonownedwnd.obj &
 	$(OBJS)\corelib_osx_cocoa_notebook.obj &
 	$(OBJS)\corelib_osx_cocoa_radiobut.obj &
 	$(OBJS)\corelib_preferences.obj &
 	$(OBJS)\corelib_cocoa_printdlg.obj &
 	$(OBJS)\corelib_osx_cocoa_scrolbar.obj &
 	$(OBJS)\corelib_osx_cocoa_slider.obj &
@@ -12076,6 +12096,8 @@ $(OBJS)\monodll_osx_cocoa_notebook.obj :  ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\monodll_osx_cocoa_radiobut.obj :  ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\monodll_preferences.obj :  ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\monodll_cocoa_printdlg.obj :  ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\monodll_osx_cocoa_scrolbar.obj :  ..\..\src\osx\cocoa\scrolbar.mm
@@ -16988,6 +17010,11 @@ $(OBJS)\monodll_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monodll_preferencescmn.obj :  .AUTODEPEND ..\..\src\common\preferencescmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monodll_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -17248,6 +17275,11 @@ $(OBJS)\monodll_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monodll_preferencesg.obj :  .AUTODEPEND ..\..\src\generic\preferencesg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monodll_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
@@ -19033,6 +19065,8 @@ $(OBJS)\monolib_osx_cocoa_notebook.obj :  ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\monolib_osx_cocoa_radiobut.obj :  ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\monolib_preferences.obj :  ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\monolib_cocoa_printdlg.obj :  ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\monolib_osx_cocoa_scrolbar.obj :  ..\..\src\osx\cocoa\scrolbar.mm
@@ -23945,6 +23979,11 @@ $(OBJS)\monolib_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monolib_preferencescmn.obj :  .AUTODEPEND ..\..\src\common\preferencescmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monolib_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -24205,6 +24244,11 @@ $(OBJS)\monolib_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monolib_preferencesg.obj :  .AUTODEPEND ..\..\src\generic\preferencesg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\monolib_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
@@ -26423,6 +26467,8 @@ $(OBJS)\coredll_osx_cocoa_notebook.obj :  ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\coredll_osx_cocoa_radiobut.obj :  ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\coredll_preferences.obj :  ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\coredll_cocoa_printdlg.obj :  ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\coredll_osx_cocoa_scrolbar.obj :  ..\..\src\osx\cocoa\scrolbar.mm
@@ -30899,6 +30945,11 @@ $(OBJS)\coredll_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\coredll_preferencescmn.obj :  .AUTODEPEND ..\..\src\common\preferencescmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\coredll_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -31159,6 +31210,11 @@ $(OBJS)\coredll_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\coredll_preferencesg.obj :  .AUTODEPEND ..\..\src\generic\preferencesg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\coredll_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
@@ -31718,6 +31774,8 @@ $(OBJS)\corelib_osx_cocoa_notebook.obj :  ..\..\src\osx\cocoa\notebook.mm
 $(OBJS)\corelib_osx_cocoa_radiobut.obj :  ..\..\src\osx\cocoa\radiobut.mm
 $(OBJS)\corelib_preferences.obj :  ..\..\src\osx\cocoa\preferences.mm
 $(OBJS)\corelib_cocoa_printdlg.obj :  ..\..\src\osx\cocoa\printdlg.mm
 $(OBJS)\corelib_osx_cocoa_scrolbar.obj :  ..\..\src\osx\cocoa\scrolbar.mm
@@ -36194,6 +36252,11 @@ $(OBJS)\corelib_popupcmn.obj :  .AUTODEPEND ..\..\src\common\popupcmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\corelib_preferencescmn.obj :  .AUTODEPEND ..\..\src\common\preferencescmn.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\corelib_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
@@ -36454,6 +36517,11 @@ $(OBJS)\corelib_progdlgg.obj :  .AUTODEPEND ..\..\src\generic\progdlgg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\corelib_preferencesg.obj :  .AUTODEPEND ..\..\src\generic\preferencesg.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 !ifeq USE_GUI 1
 $(OBJS)\corelib_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
--- a/build/msw/wx_vc7_core.vcproj
+++ b/build/msw/wx_vc7_core.vcproj
@@ -582,6 +582,9 @@
 			<File
 				RelativePath="..\..\src\common\popupcmn.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\preferencescmn.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\common\prntbase.cpp">
 			</File>
@@ -1103,6 +1106,9 @@
 			<File
 				RelativePath="..\..\src\generic\numdlgg.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\generic\preferencesg.cpp">
 			</File>
 			<File
 				RelativePath="..\..\src\generic\printps.cpp">
 			</File>
--- a/build/msw/wx_vc8_core.vcproj
+++ b/build/msw/wx_vc8_core.vcproj
@@ -792,6 +792,10 @@
 				RelativePath="..\..\src\common\popupcmn.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\preferencescmn.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\prntbase.cpp"
 				>
@@ -1486,6 +1490,10 @@
 				RelativePath="..\..\src\generic\numdlgg.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\preferencesg.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\printps.cpp"
 				>
--- a/build/msw/wx_vc9_core.vcproj
+++ b/build/msw/wx_vc9_core.vcproj
@@ -790,6 +790,10 @@
 				RelativePath="..\..\src\common\popupcmn.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\preferencescmn.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\common\prntbase.cpp"
 				>
@@ -1484,6 +1488,10 @@
 				RelativePath="..\..\src\generic\numdlgg.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\preferencesg.cpp"
 				>
 			</File>
 			<File
 				RelativePath="..\..\src\generic\printps.cpp"
 				>
--- a/include/wx/preferences.h
+++ b/include/wx/preferences.h
@@ -0,0 +1,125 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/preferences.h
 // Purpose:     Declaration of wxPreferencesEditor class.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_PREFERENCES_H_
 #define _WX_PREFERENCES_H_
 #include "wx/defs.h"
 #include "wx/bitmap.h"
 #include "wx/vector.h"
 class WXDLLIMPEXP_FWD_CORE wxWindow;
 class wxPreferencesEditorImpl;
 #if defined(__WXOSX_COCOA__)
    // GetLargeIcon() is used
    #define wxHAS_PREF_EDITOR_ICONS
    // Changes should be applied immediately
    #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
 #elif defined(__WXGTK__)
    // Changes should be applied immediately
    #define wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
 #endif
 // ----------------------------------------------------------------------------
 // wxPreferencesEditor: Native preferences editing
 // ----------------------------------------------------------------------------
 // One page of a preferences window
 class WXDLLIMPEXP_CORE wxPreferencesPage
 {
 public:
    virtual ~wxPreferencesPage() {}
    // Name of the page, used e.g. for tabs
    virtual wxString GetName() const = 0;
    // Return 32x32 icon used for the page. Currently only used on OS X, where
    // implementation is required; unused on other platforms. Because of this,
    // the method is only pure virtual on platforms that use it.
 #ifdef wxHAS_PREF_EDITOR_ICONS
    virtual wxBitmap GetLargeIcon() const = 0;
 #else
    virtual wxBitmap GetLargeIcon() const { return wxBitmap(); }
 #endif
    // Create a window (usually a wxPanel) for this page. The caller takes
    // ownership of the returned window.
    virtual wxWindow *CreateWindow(wxWindow *parent) = 0;
    wxDECLARE_NO_COPY_CLASS(wxPreferencesPage);
 };
 // Helper for implementing some common pages (General, Advanced)
 class WXDLLIMPEXP_CORE wxStockPreferencesPage : public wxPreferencesPage
 {
 public:
    enum Kind
    {
        Kind_General,
        Kind_Advanced
    };
    wxStockPreferencesPage(Kind kind) : m_kind(kind) {}
    Kind GetKind() const { return m_kind; }
    virtual wxString GetName() const;
 #ifdef __WXOSX_COCOA__
    virtual wxBitmap GetLargeIcon() const;
 #endif
 private:
    Kind m_kind;
 };
 // Notice that this class does not inherit from wxWindow.
 class WXDLLIMPEXP_CORE wxPreferencesEditor
 {
 public:
    // Ctor creates an empty editor, use AddPage() to add controls to it.
    wxPreferencesEditor();
    ~wxPreferencesEditor();
    // Add a new page to the editor. The editor takes ownership of the page
    // and won't delete it until it is destroyed itself.
    void AddPage(wxPreferencesPage *page);
    // Show the preferences dialog or bring it to the top if it's already
    // shown. Notice that this method may or may not block depending on the
    // platform, i.e. depending on whether the dialog is modal or not.
    void Show(wxWindow* parent);
    // Hide the currently shown dialog, if any. This doesn't do anything on the
    // platforms using modal preferences dialogs but should be called to
    // dismiss the dialog if the object whose preferences it is editing was
    // closed.
    void Dismiss();
    // Whether changes to values in the pages should be applied immediately
    // (OS X, GTK+) or only when the user clicks OK/Apply (Windows)
    static bool ShouldApplyChangesImmediately()
    {
 #ifdef wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY
        return true;
 #else
        return false;
 #endif
    }
 private:
    wxPreferencesEditorImpl* m_impl;
    wxDECLARE_NO_COPY_CLASS(wxPreferencesEditor);
 };
 #endif // _WX_PREFERENCES_H_
--- a/include/wx/private/preferences.h
+++ b/include/wx/private/preferences.h
@@ -0,0 +1,45 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        wx/private/preferences.h
 // Purpose:     wxPreferencesEditorImpl declaration.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 #ifndef _WX_PRIVATE_PREFERENCES_H_
 #define _WX_PRIVATE_PREFERENCES_H_
 #include "wx/preferences.h"
 #if wxUSE_TOOLBAR && defined(__WXOSX_COCOA__) && wxOSX_USE_NATIVE_TOOLBAR
    #define wxHAS_PREF_EDITOR_NATIVE
 #endif
 #if defined(__WXOSX__) || defined(__WXGTK__)
    #define wxHAS_PREF_EDITOR_MODELESS
 #endif
 // ----------------------------------------------------------------------------
 // wxPreferencesEditorImpl: defines wxPreferencesEditor implementation.
 // ----------------------------------------------------------------------------
 class wxPreferencesEditorImpl
 {
 public:
    // This is implemented in a platform-specific way.
    static wxPreferencesEditorImpl* Create();
    // These methods simply mirror the public wxPreferencesEditor ones.
    virtual void AddPage(wxPreferencesPage* page) = 0;
    virtual void Show(wxWindow* parent) = 0;
    virtual void Dismiss() = 0;
    virtual ~wxPreferencesEditorImpl() {}
 protected:
    wxPreferencesEditorImpl() {}
 };
 #endif // _WX_PRIVATE_PREFERENCES_H_
--- a/interface/wx/preferences.h
+++ b/interface/wx/preferences.h
@@ -0,0 +1,196 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        interface/wx/preferences.h
 // Purpose:     wxPreferencesEditor class documentation.
 // Author:      Vaclav Slavik
 // Created:     2013-02-26
 // RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 /**
    Manage preferences dialog.
    This class encapsulates the differences -- both in appearance and
    behaviour -- between preferences dialogs on different platforms.  In
    particular, OS X preferences look very different from the typical notebook
    control used on other platforms, and both OS X and GTK+ preferences windows
    are modeless unlike Windows options dialogs that are typically modal.
    wxPreferencesEditor is able to hide the differences by hiding the creation
    of preferences window from the API. Instead, you create an instance of
    wxPreferencesEditor and add page descriptions in the form of
    wxPreferencesPage using its AddPage() method. After setting up the editor
    object, you must call Show() to present preferences to the user.
    @note Notice that this class is not derived from wxWindow and hence
          doesn't represent a window, even if its Show() method does create one
          internally.
    @library{wxcore}
    @since 2.9.5
 */
 class wxPreferencesEditor
 {
 public:
    /**
        Constructor.
        Creates an empty editor, use AddPage() to add controls to it.
     */
    wxPreferencesEditor();
    /**
        Destructor.
        Destroying this object hides the associated preferences window if it is
        open at the moment.
        The destructor is non-virtual as this class is not supposed to be
        derived from.
     */
    ~wxPreferencesEditor();
    /**
        Add a new page to the editor.
        The editor takes ownership of the page and will delete it from its
        destructor (but not sooner).
        @see wxPreferencesPage, wxStockPreferencesPage
     */
    void AddPage(wxPreferencesPage *page);
    /**
        Show the preferences dialog or bring it to the top if it's already
        shown.
        Notice that this method may or may not block depending on the platform,
        i.e. depending on whether the dialog is modal or not.
        @param parent The window that invokes the preferences.
                      Call Dismiss() before it's destroyed.
     */
    void Show(wxWindow* parent);
    /**
        Hide the currently shown dialog, if any.
        This doesn't do anything on the platforms using modal preferences
        dialogs (e.g. Windows) but should be called to dismiss the dialog if
        the object whose preferences it is editing was closed.
     */
    void Dismiss();
    /**
        Returns whether changes to values in preferences pages should be
        applied immediately or only when the user clicks the OK button.
        Currently, changes are applied immediately on OS X and GTK+.
        The preprocessor macro `wxHAS_PREF_EDITOR_APPLY_IMMEDIATELY` is defined
        in this case as well.
     */
    static bool ShouldApplyChangesImmediately()
 };
 /**
    One page of preferences dialog.
    This is the base class for implementation of application's preferences. Its
    methods return various properties of the page, such as title or icon. The
    actual page is created by CreateWindow().
    @see wxStockPreferencesPage
    @library{wxcore}
    @since 2.9.5
 */
 class wxPreferencesPage
 {
 public:
    /// Destructor.
    virtual ~wxPreferencesPage() {}
    /**
        Return name of the page.
        The name is used for notebook tab's label, icon label etc., depending
        on the platform.
     */
    virtual wxString GetName() const = 0;
    /**
        Return 32x32 icon used for the page on some platforms.
        Currently only used on OS X.
        @note This method is only pure virtual on platforms that require it
              (OS X). On other platforms, it has default implementation that
              returns an invalid bitmap. The preprocessor symbol
              `wxHAS_PREF_EDITOR_ICONS` is defined if this method must be
              implemented.
     */
    virtual wxBitmap GetLargeIcon() const = 0;
    /**
        Create a window for this page.
        The window will be placed into the preferences dialog in
        platform-specific manner. Depending on the platform, this method may
        be called before showing the preferences window, when switching to its
        tab or even more than once. Don't make assumptions about the number of
        times or the specific time when it is called.
        The caller takes ownership of the window.
        wxPanel is usually used, but doesn't have to be.
        @param parent Parent window to use.
     */
    virtual wxWindow *CreateWindow(wxWindow *parent) = 0;
 };
 /**
    Specialization of wxPreferencesPage useful for certain commonly used
    preferences page.
    On OS X, preferences pages named "General" and "Advanced" are commonly used
    in apps and the OS provides stock icons for them that should be used.
    Instead of reimplementing this behavior yourself, you can inherit from
    wxStockPreferencesPage and get correct title and icon.
    Notice that this class only implements GetName() and GetLargeIcon(), you
    still have to provide the rest of wxPreferencesPage implementation.
    @library{wxcore}
    @since 2.9.5
 */
 class wxStockPreferencesPage : public wxPreferencesPage
 {
 public:
    /// Kinds of stock pages.
    enum Kind
    {
        /// The "General" page
        Kind_General,
        /// The "Advanced" page
        Kind_Advanced
    };
    /// Constructor.
    wxStockPreferencesPage(Kind kind) : m_kind(kind) {}
    /// Returns the page's kind.
    Kind GetKind() const { return m_kind; }
    /// Reimplemented to return suitable name for the page's kind.
    virtual wxString GetName() const;
    /// Reimplemented to return stock icon on OS X.
    virtual wxBitmap GetLargeIcon() const;
 };
--- a/src/common/preferencescmn.cpp
+++ b/src/common/preferencescmn.cpp
@@ -0,0 +1,69 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/common/preferencescmn.cpp
 // Purpose:     wxPreferencesEditor implementation common to all platforms.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // ============================================================================
 // declarations
 // ============================================================================
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
 #include "wx/private/preferences.h"
 #include "wx/intl.h"
 // ============================================================================
 // implementation
 // ============================================================================
 wxString wxStockPreferencesPage::GetName() const
 {
    switch ( m_kind )
    {
        case Kind_General:
            return _("General");
        case Kind_Advanced:
            return _("Advanced");
    }
    return wxString(); // silence compiler warning
 }
 wxPreferencesEditor::wxPreferencesEditor()
    : m_impl(wxPreferencesEditorImpl::Create())
 {
 }
 wxPreferencesEditor::~wxPreferencesEditor()
 {
    delete m_impl;
 }
 void wxPreferencesEditor::AddPage(wxPreferencesPage* page)
 {
    wxCHECK_RET( page, "can't set NULL page" );
    m_impl->AddPage(page);
 }
 void wxPreferencesEditor::Show(wxWindow* parent)
 {
    m_impl->Show(parent);
 }
 void wxPreferencesEditor::Dismiss()
 {
    m_impl->Dismiss();
 }
--- a/src/generic/preferencesg.cpp
+++ b/src/generic/preferencesg.cpp
@@ -0,0 +1,184 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/generic/preferencesg.cpp
 // Purpose:     Implementation of wxPreferencesEditor.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // ============================================================================
 // declarations
 // ============================================================================
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
 #include "wx/private/preferences.h"
 #ifndef wxHAS_PREF_EDITOR_NATIVE
 #include "wx/dialog.h"
 #include "wx/notebook.h"
 #include "wx/sizer.h"
 #include "wx/sharedptr.h"
 #include "wx/scopedptr.h"
 #include "wx/vector.h"
 class wxGenericPrefsDialog : public wxDialog
 {
 public:
    wxGenericPrefsDialog(wxWindow *parent)
        : wxDialog(parent, wxID_ANY, _("Preferences"),
                   wxDefaultPosition, wxDefaultSize,
                   wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX))
    {
        SetExtraStyle(wxWS_EX_VALIDATE_RECURSIVELY);
        wxSizer *sizer = new wxBoxSizer(wxVERTICAL);
        m_notebook = new wxNotebook(this, wxID_ANY);
        sizer->Add(m_notebook, wxSizerFlags(1).Expand().DoubleBorder());
 #ifdef __WXGTK__
        SetEscapeId(wxID_CLOSE);
        sizer->Add(CreateButtonSizer(wxCLOSE), wxSizerFlags().Expand().DoubleBorder(wxBOTTOM));
 #else
        sizer->Add(CreateButtonSizer(wxOK | wxCANCEL),
                   wxSizerFlags().Expand().DoubleBorder(wxLEFT|wxRIGHT|wxBOTTOM));
 #endif
        SetSizer(sizer);
    }
    void AddPage(wxPreferencesPage *page)
    {
        wxWindow *win = page->CreateWindow(m_notebook);
        m_notebook->AddPage(win, page->GetName());
    }
 private:
    wxNotebook *m_notebook;
 };
 class wxGenericPreferencesEditorImplBase : public wxPreferencesEditorImpl
 {
 public:
    virtual void AddPage(wxPreferencesPage* page)
    {
        m_pages.push_back(wxSharedPtr<wxPreferencesPage>(page));
    }
 protected:
    virtual wxDialog *CreateWindow(wxWindow *parent)
    {
        wxGenericPrefsDialog *dlg = new wxGenericPrefsDialog(parent);
        // TODO: Don't create all pages immediately like this, do it on demand
        //       when a page is selected in the notebook (as is done on OS X).
        //
        //       Currently, creating all pages is necessary so that the notebook
        //       can determine its best size. We'll need to extend
        //       wxPreferencesPage with a GetBestSize() virtual method to make
        //       it possible to defer the creation.
        for ( Pages::const_iterator i = m_pages.begin();
              i != m_pages.end();
              ++i )
        {
            dlg->AddPage(i->get());
        }
        return dlg;
    }
    typedef wxVector< wxSharedPtr<wxPreferencesPage> > Pages;
    Pages m_pages;
 };
 #ifdef wxHAS_PREF_EDITOR_MODELESS
 class wxModelessPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase
 {
 public:
    virtual ~wxModelessPreferencesEditorImpl()
    {
        // m_win may already be destroyed if this destructor is called from
        // wxApp's destructor. In that case, all windows -- including this
        // one -- would already be destroyed by now.
        if ( m_win )
            m_win->Destroy();
    }
    virtual void Show(wxWindow* parent)
    {
        if ( !m_win )
        {
            wxWindow *win = CreateWindow(parent);
            win->Show();
            m_win = win;
        }
        else
        {
            // Ideally, we'd reparent the dialog under 'parent', but it's
            // probably not worth the hassle. We know the old parent is still
            // valid, because otherwise Dismiss() would have been called and
            // m_win cleared.
            m_win->Raise();
        }
    }
    virtual void Dismiss()
    {
        if ( m_win )
        {
            m_win->Close(/*force=*/true);
            m_win = NULL;
        }
    }
 private:
    wxWeakRef<wxWindow> m_win;
 };
 #else // !wxHAS_PREF_EDITOR_MODELESS
 class wxModalPreferencesEditorImpl : public wxGenericPreferencesEditorImplBase
 {
 public:
    virtual void Show(wxWindow* parent)
    {
        wxScopedPtr<wxDialog> dlg(CreateWindow(parent));
        dlg->ShowModal();
    }
    virtual void Dismiss()
    {
        // nothing to do
    }
 };
 #endif // !wxHAS_PREF_EDITOR_MODELESS
 /*static*/
 wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create()
 {
 #ifdef wxHAS_PREF_EDITOR_MODELESS
    return new wxModelessPreferencesEditorImpl();
 #else
    return new wxModalPreferencesEditorImpl();
 #endif
 }
 #endif // !wxHAS_PREF_EDITOR_NATIVE
--- a/src/osx/cocoa/preferences.mm
+++ b/src/osx/cocoa/preferences.mm
@@ -0,0 +1,248 @@
 ///////////////////////////////////////////////////////////////////////////////
 // Name:        src/osx/cocoa/preferences.cpp
 // Purpose:     Native OS X implementation of wxPreferencesEditor.
 // Author:      Vaclav Slavik
 // Created:     2013-02-19
 // RCS-ID:      $Id$
 // Copyright:   (c) 2013 Vaclav Slavik <vslavik@fastmail.fm>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 // ============================================================================
 // declarations
 // ============================================================================
 // ----------------------------------------------------------------------------
 // headers
 // ----------------------------------------------------------------------------
 // for compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 #ifdef __BORLANDC__
    #pragma hdrstop
 #endif
 #include "wx/private/preferences.h"
 #ifdef wxHAS_PREF_EDITOR_NATIVE
 #include "wx/frame.h"
 #include "wx/sharedptr.h"
 #include "wx/toolbar.h"
 #include "wx/vector.h"
 #include "wx/weakref.h"
 #include "wx/windowid.h"
 #include "wx/osx/private.h"
 #import <AppKit/NSWindow.h>
 wxBitmap wxStockPreferencesPage::GetLargeIcon() const
 {
    switch ( m_kind )
    {
        case Kind_General:
            return wxBitmap([NSImage imageNamed:NSImageNamePreferencesGeneral]);
        case Kind_Advanced:
            return wxBitmap([NSImage imageNamed:NSImageNameAdvanced]);
    }
    return wxBitmap(); // silence compiler warning
 }
 class wxCocoaPrefsWindow : public wxFrame
 {
 public:
    wxCocoaPrefsWindow()
        : wxFrame(NULL, wxID_ANY, _("Preferences"),
                  wxDefaultPosition, wxDefaultSize,
                  wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX)),
          m_toolbarRealized(false),
          m_visiblePage(NULL)
    {
        m_toolbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
                                  wxTB_FLAT | wxTB_TEXT);
        m_toolbar->SetToolBitmapSize(wxSize(32,32));
        m_toolbar->OSXSetSelectableTools(true);
        SetToolBar(m_toolbar);
        m_toolbar->Bind(wxEVT_COMMAND_TOOL_CLICKED,
                        &wxCocoaPrefsWindow::OnPageChanged, this);
        Bind(wxEVT_CLOSE_WINDOW, &wxCocoaPrefsWindow::OnClose, this);
    }
    void AddPage(wxPreferencesPage *page)
    {
        wxASSERT_MSG( !m_toolbarRealized,
                      "can't add more preferences pages after showing the window" );
        const wxString title = page->GetName();
        wxBitmap bmp(page->GetLargeIcon());
        wxASSERT_MSG( bmp.IsOk(), "OS X requires valid bitmap for preference page" );
        int toolId = wxIdManager::ReserveId();
        wxToolBarToolBase *tool = m_toolbar->AddTool(toolId, title, bmp);
        wxSharedPtr<PageInfo> info(new PageInfo(page));
        m_pages.push_back(info);
        tool->SetClientData(info.get());
    }
    virtual bool Show(bool show)
    {
        if ( show && !m_toolbarRealized )
        {
            m_toolbar->Realize();
            m_toolbarRealized = true;
            const wxToolBarToolBase *first = m_toolbar->GetToolByPos(0);
            wxCHECK_MSG( first, false, "no preferences panels" );
            OnSelectPageForTool(first);
            m_toolbar->OSXSelectTool(first->GetId());
        }
        return wxFrame::Show(show);
    }
    virtual bool ShouldPreventAppExit() const { return false; }
 protected:
    // Native preferences windows resize when the selected panel changes and
    // the resizing is animated, so we need to override DoMoveWindow.
    virtual void DoMoveWindow(int x, int y, int width, int height)
    {
        NSRect r = wxToNSRect(NULL, wxRect(x, y, width, height));
        NSWindow *win = (NSWindow*)GetWXWindow();
        [win setFrame:r display:YES animate:YES];
    }
 private:
    void OnSelectPageForTool(const wxToolBarToolBase *tool)
    {
        PageInfo *info = static_cast<PageInfo*>(tool->GetClientData());
        wxCHECK_RET( info, "toolbar item lacks client data" );
        if ( !info->win )
        {
            info->win = info->page->CreateWindow(this);
            info->win->Hide();
            // fill the page with data using wxEVT_INIT_DIALOG/TransferDataToWindow:
            info->win->InitDialog();
        }
        // When the page changes in a native preferences dialog, the sequence
        // of events is thus:
        // 1. the old page is hidden, only gray background remains
        if ( m_visiblePage )
            m_visiblePage->Hide();
        m_visiblePage = info->win;
        //   2. window is resized to fix the new page, with animation
        //      (in our case, using overriden DoMoveWindow())
        SetClientSize(info->win->GetSize());
        //   3. new page is shown and the title updated.
        info->win->Show();
        SetTitle(info->page->GetName());
        // TODO: Preferences window may have some pages resizeable and some
        //       non-resizable on OS X; the whole window is or is not resizable
        //       depending on which page is selected.
        //
        //       We'll need to add wxPreferencesPage::IsResizable() virtual
        //       method to implement this.
    }
    void OnPageChanged(wxCommandEvent& event)
    {
        wxToolBarToolBase *tool = m_toolbar->FindById(event.GetId());
        wxCHECK_RET( tool, "invalid tool ID" );
        OnSelectPageForTool(tool);
    }
    void OnClose(wxCloseEvent& e)
    {
        // Instead of destroying the window, just hide it, it could be
        // reused again by another invocation of the editor.
        Hide();
    }
 private:
    struct PageInfo : public wxObject
    {
        PageInfo(wxPreferencesPage *p) : page(p), win(NULL) {}
        wxSharedPtr<wxPreferencesPage> page;
        wxWindow *win;
    };
    // All pages. Use shared pointer to be able to get pointers to PageInfo structs
    wxVector< wxSharedPtr<PageInfo> > m_pages;
    wxToolBar *m_toolbar;
    bool       m_toolbarRealized;
    wxWindow  *m_visiblePage;
 };
 class wxCocoaPreferencesEditorImpl : public wxPreferencesEditorImpl
 {
 public:
    wxCocoaPreferencesEditorImpl() : m_win(NULL)
    {
    }
    virtual ~wxCocoaPreferencesEditorImpl()
    {
        // m_win may already be destroyed if this destructor is called from
        // wxApp's destructor. In that case, all windows -- including this
        // one -- would already be destroyed by now.
        if ( m_win )
            m_win->Destroy();
    }
    virtual void AddPage(wxPreferencesPage* page)
    {
        GetWin()->AddPage(page);
    }
    virtual void Show(wxWindow* WXUNUSED(parent))
    {
        // OS X preferences windows don't have parents, they are independent
        // windows, so we just ignore the 'parent' argument.
        wxWindow *win = GetWin();
        win->Show();
        win->Raise();
    }
    virtual void Dismiss()
    {
        // Don't destroy the window, only hide it, because OS X preferences
        // window typically remember their state even when closed. Reopening
        // the window should show it in the exact same state the user left it.
        GetWin()->Hide();
    }
 private:
    // Use this function to access m_win, so that the window is only created on
    // demand when actually needed.
    wxCocoaPrefsWindow* GetWin()
    {
        if ( !m_win )
            m_win = new wxCocoaPrefsWindow();
        return m_win;
    }
    wxWeakRef<wxCocoaPrefsWindow> m_win;
 };
 /*static*/
 wxPreferencesEditorImpl* wxPreferencesEditorImpl::Create()
 {
    return new wxCocoaPreferencesEditorImpl();
 }
 #endif // wxHAS_PREF_EDITOR_NATIVE