diff --git a/Makefile.in b/Makefile.in
index dbe87fd255..00ecb4b42c 100644
--- 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
 
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 385b0df8fd..e8916215f8 100644
--- 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
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 977f74c168..b635a8f90f 100644
--- 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
diff --git a/build/msw/makefile.gcc b/build/msw/makefile.gcc
index ed2dbf0ea0..b8678b7f03 100644
--- 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) $<
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 778d85b9b3..10a0982f74 100644
--- 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
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index f494e32ce4..9646c50062 100644
--- 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) $<
diff --git a/build/msw/wx_core.dsp b/build/msw/wx_core.dsp
index f329910d8c..32220f5cf9 100644
--- a/build/msw/wx_core.dsp
+++ b/build/msw/wx_core.dsp
@@ -1,3600 +1,3608 @@
-# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
+# Microsoft Developer Studio Project File - Name="wx_core" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (x86) Static Library" 0x0104
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=core - Win32 Debug
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_core.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
-!MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-RSC=rc.exe
-
+
+CFG=core - Win32 Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "wx_core.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "wx_core.mak" CFG="core - Win32 Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "core - Win32 DLL Release" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 DLL Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "core - Win32 Release" (based on "Win32 (x86) Static Library")
+!MESSAGE "core - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath ""
+CPP=cl.exe
+RSC=rc.exe
+
 !IF  "$(CFG)" == "core - Win32 DLL Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswudll\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswudll\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
-# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_dll"
-# PROP BASE Intermediate_Dir "vc_mswuddll\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_dll"
-# PROP Intermediate_Dir "vc_mswuddll\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
-# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
-# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswu\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswu\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "..\..\lib\vc_lib"
-# PROP BASE Intermediate_Dir "vc_mswud\core"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\lib\vc_lib"
-# PROP Intermediate_Dir "vc_mswud\core"
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
-# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
-# ADD BASE RSC /l 0x409
-# ADD RSC /l 0x409
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"
-# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"
-
-!ENDIF
-
-# Begin Target
-
-# Name "core - Win32 DLL Release"
-# Name "core - Win32 DLL Debug"
-# Name "core - Win32 Release"
-# Name "core - Win32 Debug"
-# Begin Group "Common Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\common\accelcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\accesscmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\affinematrix2d.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\anidecod.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\appcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\artprov.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\artstd.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\arttango.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\bmpbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\bmpbtncmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\bookctrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\btncmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\cairo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\checkboxcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\checklstcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\choiccmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\clipcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\clrpickercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\cmdproc.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\cmndata.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\colourcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\colourdata.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\combocmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\containr.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\cshelp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ctrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ctrlsub.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dcbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dcbufcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dcgraph.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dcsvg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dirctrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dlgcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dndcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dobjcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\docmdi.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\docview.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dpycmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dseldlg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\dummy.cpp
-# ADD BASE CPP /Yc"wx/wxprec.h"
-# ADD CPP /Yc"wx/wxprec.h"
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\effects.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\event.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fddlgcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\filectrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\filehistorycmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\filepickercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fldlgcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fontcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fontdata.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fontenumcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fontmap.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fontpickercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fontutilcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\framecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\fs_mem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\gaugecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\gbsizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\gdicmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\geometry.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\gifdecod.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\graphcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\headercolcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\headerctrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\helpbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\iconbndl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagall.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagbmp.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\image.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagfill.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imaggif.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagiff.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagjpeg.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagpcx.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagpng.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagpnm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagtga.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagtiff.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\imagxpm.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\layout.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\lboxcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\listctrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\markupparser.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\matrix.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\menucmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\mousemanager.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\msgout.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\nbkbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\overlaycmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\ownerdrwcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\panelcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\paper.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\persist.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\pickerbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\popupcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\prntbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\quantize.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\radiobtncmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\radiocmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\rearrangectrl.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\rendcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\rgncmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\scrolbarcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\settcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\sizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\slidercmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\spinbtncmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\spinctrlcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\srchcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\statbar.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\statbmpcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\statboxcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\statlinecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\stattextcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\stockitem.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\tbarbase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\textcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\textentrycmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\textmeasurecmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\toplvcmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\treebase.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\uiactioncmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\utilscmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\valgen.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\validate.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\valnum.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\valtext.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\wincmn.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\windowid.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\wrapsizer.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\src\common\xpmdecod.cpp
-# End Source File
-# End Group
-# Begin Group "MSW Sources"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\msw\accel.cpp
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswudll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswudll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_dll\mswu" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswudll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb /opt:ref /opt:icf /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "__WXMSW__" /d "NDEBUG" /d "_UNICODE" /i "..\..\lib\vc_dll\mswu" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295u_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
+# ADD LINK32 wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29u.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29u_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295u_core_vc_custom.pdb"
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_dll"
+# PROP BASE Intermediate_Dir "vc_mswuddll\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_dll"
+# PROP Intermediate_Dir "vc_mswuddll\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_dll\mswud" /I "..\..\include" /W4 /Yu"wx/wxprec.h" /Fp"vc_mswuddll\wxprec_coredll.pch" /Zi /Fd..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /c
+# ADD BASE MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD MTL /nologo /D "WIN32" /D "_USRDLL" /D "DLL_EXPORTS" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D "WXUSINGDLL" /D "WXMAKINGDLL_CORE" /D wxUSE_BASE=0 /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+# ADD RSC /l 0x409 /d "_DEBUG" /d "__WXMSW__" /d "_UNICODE" /i "..\..\lib\vc_dll\mswud" /i "..\..\include" /d "WXBUILDING" /d WXDLLNAME=wxmsw295ud_core_vc_custom /i "..\..\src\tiff\libtiff" /i "..\..\src\jpeg" /i "..\..\src\png" /i "..\..\src\zlib" /i "..\..\src\regex" /i "..\..\src\expat\lib" /d "WXUSINGDLL" /d "WXMAKINGDLL_CORE" /d wxUSE_BASE=0
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
+# ADD LINK32 wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib wininet.lib ..\..\lib\vc_dll\wxbase29ud.lib /nologo /dll /machine:i386 /out:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.dll" /libpath:"..\..\lib\vc_dll" /implib:"..\..\lib\vc_dll\wxmsw29ud_core.lib" /debug /pdb:"..\..\lib\vc_dll\wxmsw295ud_core_vc_custom.pdb"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswu\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswu\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MD /O2 /GR /EHsc /I "..\..\lib\vc_lib\mswu" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29u_core.pdb /opt:ref /opt:icf /Yu"wx/wxprec.h" /Fp"vc_mswu\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "__WXMSW__" /D "NDEBUG" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29u_core.lib"
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "..\..\lib\vc_lib"
+# PROP BASE Intermediate_Dir "vc_mswud\core"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "..\..\lib\vc_lib"
+# PROP Intermediate_Dir "vc_mswud\core"
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
+# ADD CPP /nologo /FD /MDd /Od /Gm /GR /EHsc /I "..\..\lib\vc_lib\mswud" /I "..\..\include" /W4 /Zi /Fd..\..\lib\vc_lib\wxmsw29ud_core.pdb /Yu"wx/wxprec.h" /Fp"vc_mswud\wxprec_corelib.pch" /I "..\..\src\tiff\libtiff" /I "..\..\src\jpeg" /I "..\..\src\png" /I "..\..\src\zlib" /I "..\..\src\regex" /I "..\..\src\expat\lib" /D "WIN32" /D "_LIB" /D "_DEBUG" /D "__WXMSW__" /D "_UNICODE" /D "WXBUILDING" /D wxUSE_BASE=0 /c
+# ADD BASE RSC /l 0x409
+# ADD RSC /l 0x409
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"
+# ADD LIB32 /nologo /out:"..\..\lib\vc_lib\wxmsw29ud_core.lib"
+
+!ENDIF
+
+# Begin Target
+
+# Name "core - Win32 DLL Release"
+# Name "core - Win32 DLL Debug"
+# Name "core - Win32 Release"
+# Name "core - Win32 Debug"
+# Begin Group "Common Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\common\accelcmn.cpp
 # End Source File
 # Begin Source File
-
+
+SOURCE=..\..\src\common\accesscmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\affinematrix2d.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\anidecod.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\appcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\artprov.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\artstd.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\arttango.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\bmpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\bmpbtncmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\bookctrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\btncmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\cairo.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\checkboxcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\checklstcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\choiccmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\clipcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\clrpickercmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\cmdproc.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\cmndata.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\colourcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\colourdata.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\combocmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\containr.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\cshelp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\ctrlcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\ctrlsub.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dcbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dcbufcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dcgraph.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dcsvg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dirctrlcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dlgcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dndcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dobjcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\docmdi.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\docview.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dpycmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dseldlg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\dummy.cpp
+# ADD BASE CPP /Yc"wx/wxprec.h"
+# ADD CPP /Yc"wx/wxprec.h"
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\effects.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\event.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fddlgcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\filectrlcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\filehistorycmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\filepickercmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fldlgcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontdata.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontenumcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontmap.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontpickercmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fontutilcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\framecmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\fs_mem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\gaugecmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\gbsizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\gdicmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\geometry.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\gifdecod.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\graphcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\headercolcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\headerctrlcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\helpbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\iconbndl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagall.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagbmp.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\image.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagfill.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imaggif.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagiff.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagjpeg.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagpcx.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagpng.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagpnm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagtga.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagtiff.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\imagxpm.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\layout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\lboxcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\listctrlcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\markupparser.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\matrix.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\menucmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\mousemanager.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\msgout.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\nbkbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\overlaycmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\ownerdrwcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\panelcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\paper.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\persist.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\pickerbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\popupcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\preferencescmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\prntbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\quantize.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\radiobtncmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\radiocmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\rearrangectrl.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\rendcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\rgncmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\scrolbarcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\settcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\sizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\slidercmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\spinbtncmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\spinctrlcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\srchcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\statbar.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\statbmpcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\statboxcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\statlinecmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\stattextcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\stockitem.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\tbarbase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\textcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\textentrycmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\textmeasurecmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\toplvcmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\treebase.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\uiactioncmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\utilscmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\valgen.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\validate.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\valnum.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\valtext.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\wincmn.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\windowid.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\wrapsizer.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\src\common\xpmdecod.cpp
+# End Source File
+# End Group
+# Begin Group "MSW Sources"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\msw\accel.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\ole\access.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\activex.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\anybutton.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\app.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\artmsw.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\automtn.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\bitmap.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\bmpbuttn.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\brush.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\button.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\caret.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\checkbox.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\checklst.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\choice.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\clipbrd.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\colordlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\colour.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\combo.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\combobox.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\control.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\cursor.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\data.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\dataobj.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dc.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dcclient.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dcmemory.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dcprint.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dcscreen.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dialog.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dialup.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dib.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dirdlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\display.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\dragimag.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\dropsrc.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\droptgt.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\enhmeta.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\evtloop.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\fdrepdlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\filedlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\font.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\fontdlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\fontenum.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\fontutil.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\frame.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\gauge.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\gdiimage.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\gdiobj.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\gdiplus.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\graphics.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\headerctrl.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\helpchm.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\helpwin.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\icon.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\imaglist.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\iniconf.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\listbox.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\listctrl.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\main.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\mdi.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\menu.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\menuitem.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\metafile.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\minifram.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\msgdlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\mslu.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\nativdlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\nativewin.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\nonownedwnd.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\notebook.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\oleutils.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ownerdrw.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\palette.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\panel.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\pen.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\popupwin.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\printdlg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\printwin.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\progdlg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\radiobox.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\radiobut.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\region.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\renderer.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\richmsgdlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\safearray.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\scrolbar.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\settings.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\slider.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\spinbutt.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\spinctrl.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\statbmp.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\statbox.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\statline.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\stattext.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\statusbar.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\textctrl.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\textentry.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\textmeasure.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\tglbtn.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\toolbar.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\tooltip.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\toplevel.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\treectrl.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\uiaction.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\utilsgui.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\utilswin.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\ole\uuid.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\uxtheme.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\msw\version.rc
-
+
 !IF  "$(CFG)" == "core - Win32 DLL Release"
-
-
+
+
 !ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
 
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
 # PROP Exclude_From_Build 1
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\volume.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\msw\window.cpp
 # End Source File
 # End Group
 # Begin Group "Generic Sources"
-
+
 # PROP Default_Filter ""
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\busyinfo.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\buttonbar.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\choicbkg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\choicdgg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\clrpickerg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\collpaneg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\combog.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\dcpsg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\dirctrlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\dragimgg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\filectrlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\filepickerg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\fontpickerg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\graphicc.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\headerctrlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\infobar.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\listbkg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\logg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\markuptext.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\msgdlgg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\numdlgg.cpp
 # End Source File
 # Begin Source File
-
+
+SOURCE=..\..\src\generic\preferencesg.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\printps.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\prntdlgg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\progdlgg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\renderg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\richmsgdlgg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\scrlwing.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\selstore.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\spinctlg.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\splitter.cpp
-# End Source File
-# Begin Source File
-
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\src\generic\srchctlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\statbmpg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\stattextg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\statusbr.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\textdlgg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\tipwin.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\toolbkg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\treebkg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\treectlg.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\vlbox.cpp
 # End Source File
 # Begin Source File
-
+
 SOURCE=..\..\src\generic\vscroll.cpp
-# End Source File
-# End Group
-# Begin Group "Setup Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\setup.h
-
+# End Source File
+# End Group
+# Begin Group "Setup Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\setup.h
+
 !IF  "$(CFG)" == "core - Win32 DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
-InputPath=..\..\include\wx\msw\setup.h
-
-"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\univ\setup.h
-
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_dll\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_dll\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_dll\mswud\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswu\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_lib\mswu\wx\setup.h
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\setup.h
+InputPath=..\..\include\wx\msw\setup.h
+
+"..\..\lib\vc_lib\mswud\wx\setup.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
+	copy "$(InputPath)" ..\..\lib\vc_lib\mswud\wx\setup.h
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\univ\setup.h
+
 !IF  "$(CFG)" == "core - Win32 DLL Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# Begin Custom Build - 
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# End Group
-# Begin Group "MSW Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\accel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\access.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\activex.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\anybutton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\app.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\automtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\bitmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\bmpbuttn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\bmpcbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\brush.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\button.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\calctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\caret.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\checkbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\checklst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\choice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\clipbrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\colordlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\colour.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\combo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\combobox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\commandlinkbutton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ctrlsub.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\cursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\dataform.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\dataobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\dataobj2.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\datectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\datetimectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dcclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dcmemory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dcprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dcscreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dib.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dirdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\dragimag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\dropsrc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\droptgt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\enhmeta.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\evtloop.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\fdrepdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\filedlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\fontdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\gauge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\gdiimage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\genrcdefs.h
-
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# Begin Custom Build - 
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# End Group
+# Begin Group "MSW Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\accel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\activex.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\anybutton.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\app.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\automtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\bitmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\bmpbuttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\bmpcbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\brush.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\button.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\calctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\caret.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\checkbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\checklst.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\choice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\clipbrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\colordlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\colour.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\combobox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\commandlinkbutton.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ctrlsub.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\cursor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataform.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dataobj2.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\datetimectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcclient.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcmemory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dcscreen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dib.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dirdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\dragimag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\dropsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\droptgt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\enhmeta.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\evtloop.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\fdrepdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\filedlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\fontdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\gdiimage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\genrcdefs.h
+
 !IF  "$(CFG)" == "core - Win32 DLL Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Release"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ELSEIF  "$(CFG)" == "core - Win32 Debug"
-
-# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
-InputPath=..\..\include\wx\msw\genrcdefs.h
-
-"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
-	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
-
-# End Custom Build
-
-!ENDIF
-
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\glcanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\headerctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\helpbest.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\helpchm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\helpwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\htmlhelp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\hyperlink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\icon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\imaglist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\iniconf.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\init.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\joystick.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\listbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\listctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\mdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\menuitem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\metafile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\minifram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\missing.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\msgdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\msvcrt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\nonownedwnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\notebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\notifmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\oleutils.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ownerdrw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\palette.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\panel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\pen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\popupwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\printdlg.h
-# End Source File
-# Begin Source File
-
-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
-
-SOURCE=..\..\include\wx\msw\radiobut.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\rcdefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\region.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\richmsgdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\safearray.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\scrolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\slider.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\spinbutt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\spinctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\statbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\statbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\statline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\stattext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\statusbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\taskbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\textctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\textentry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\toolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\tooltip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\toplevel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\treectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\ole\uuid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\uxtheme.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\uxthemep.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\webview_ie.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\webview_missing.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msw\window.h
-# End Source File
-# End Group
-# Begin Group "Generic Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\aboutdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\accel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\animate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\bmpcbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\busyinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\buttonbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\calctrlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\choicdgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\clrpickerg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\collpaneg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\colrdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\combo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dataview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\datectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dcpsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dirctrlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dragimgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dvrenderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\dvrenderers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\filectrlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\filepickerg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\fontpickerg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\grid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\gridctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\grideditors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\gridsel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\headerctrlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\helpext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\hyperlink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\infobar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\laywin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\logg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\msgdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\notebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\notifmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\numdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\panelg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\printps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\prntdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\progdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\propdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\richmsgdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\sashwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\scrolwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\spinctlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\splash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\srchctlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\statbmpg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\stattextg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\textdlgg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\treectlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\generic\wizard.h
-# End Source File
-# End Group
-# Begin Group "wxHTML Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\helpctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\helpdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\helpdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\helpfrm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\helpwnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmlcell.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmldefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmlfilt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmlpars.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmlproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmltag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmlwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\htmprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\m_templ.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\styleparams.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\html\winpars.h
-# End Source File
-# End Group
-# Begin Group "Common Headers"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\include\wx\aboutdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\accel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\access.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\advprops.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\affinematrix2d.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\affinematrix2dbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\anidecod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\animate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\animdecod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\anybutton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\art.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\art_internal.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\artprov.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\aui.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\auibar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\auibook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\bannerwindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\bar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\bitmap.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\bmpbuttn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\bmpcbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\bookctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\persist\bookctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\brush.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\busyinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\button.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\buttonbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\calctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\caret.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\checkbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\checklst.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\choicdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\choice.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\choicebk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\clipbrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\clrpicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\cmdproc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\cmndata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\collpane.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\colordlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\colour.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\colourdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\combo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\combobox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\commandlinkbutton.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\compositewin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\control.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\cshelp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ctrlsub.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\cursor.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\custombgwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dataobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dataview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\datectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dateevt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\datetimectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcclient.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcgraph.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcmemory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcmirror.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcps.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcscreen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dcsvg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\debugrpt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dialog.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dialup.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dirctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dirdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\display.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\display_impl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\dockart.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\docmdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\docview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dragimag.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\dvrenderers.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\editlbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\editors.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\effects.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\encinfo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\evtloopsrc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fdrepdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\filectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\filedlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\filehistory.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\filepicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\floatpane.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fmappriv.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\font.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fontdata.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fontdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fontenum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fontpicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\fontutil.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\framemanager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\gallery.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\gauge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\gbsizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\gdicmn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\gdiobj.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\geometry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\gifdecod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\glcanvas.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\graphics.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\grid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\headercol.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\headerctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\help.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\helpbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\helphtml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\helpwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\htmllbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\hyperlink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\icon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\iconbndl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\image.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imaggif.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagiff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagjpeg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imaglist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagpcx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagpng.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagpnm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagtga.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagtiff.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\imagxpm.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\infobar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\itemid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\joystick.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\layout.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\laywin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\listbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\listbook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\listbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\listctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\manager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\matrix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\mdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\mediactrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\menuitem.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\metafile.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\minifram.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\mousemanager.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\msgdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\nativewin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\nonownedwnd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\notebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\notifmsg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\numdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\odcombo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\overlay.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ownerdrw.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\page.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\palette.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\panel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\panel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\paper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\pen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\persist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\pickerbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\popupwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\position.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\print.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\printdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\prntbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\progdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\property.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\propgrid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\propgriddefs.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\propgridiface.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\propgridpagestate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\propgrid\props.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\quantize.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\radiobox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\radiobut.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\range.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\rawbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\rearrangectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\region.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\renderer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richmsgdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextbackgroundpage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextborderspage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextbuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextbulletspage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextdialogpage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextfontpage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtexthtml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextimagedlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextindentspage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextliststylepage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextmarginspage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextprint.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextsizepage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextstyledlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextstylepage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextstyles.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtexttabspage.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextuicustomization.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtext\richtextxml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\richtooltip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sashwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\scopeguard.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\scrolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\scrolwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\selstore.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\settings.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\simplebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\slider.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\sound.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\spinbutt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\spinctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\splash.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\persist\splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\splitter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\srchctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\statbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\statbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\statline.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\stattext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\statusbr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\stc\stc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\tabart.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\aui\tabmdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\taskbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tbarbase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textcompleter.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textentry.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\textwrapper.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tipdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tipwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\ribbon\toolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\toolbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\toolbook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\tooltip.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\persist\toplevel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\toplevel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\treebase.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\persist\treebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\treebook.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\treectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\treelist.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\uiaction.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\valgen.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\validate.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\valnum.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\valtext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\vidmode.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\vlbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\vms_x_fix.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\vscroll.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\webview.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\webviewarchivehandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\webviewfshandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\persist\window.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\window.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\windowid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\withimages.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\wizard.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\wrapsizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\wupdlock.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\wxhtml.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_all.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_auinotbk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_bmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_bmpbt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_bmpcbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_bttn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_cald.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_chckb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_chckl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_choic.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_choicbk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_cmdlinkbn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_collpane.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_combo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_comboctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_datectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_dirpicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_dlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_editlbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_filectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_filepicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_fontpicker.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_frame.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_gauge.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_gdctl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_grid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_html.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_htmllbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_hyperlink.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_listb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_listbk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_listc.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_mdi.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_menu.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_notbk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_odcombo.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_panel.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_propdlg.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_radbt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_radbx.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_ribbon.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_richtext.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_scrol.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_scwin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_sizer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_slidr.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_spin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_split.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_srchctrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_statbar.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_stbmp.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_stbox.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_stlin.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_sttxt.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_text.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_timectrl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_toolb.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_toolbk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_tree.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_treebk.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_unkwn.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xh_wizrd.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xmlres.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xrc\xmlreshandler.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xpmdecod.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\include\wx\xpmhand.h
-# End Source File
-# End Group
-# Begin Group "Source Files"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\src\xrc\xmlreshandler.cpp
-# End Source File
-# End Group
-# End Target
-# End Project
-
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswu\wx\msw"
+	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 DLL Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_dll\mswud\wx\msw"
+	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_dll\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Release"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswu\wx\msw"
+	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswu\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ELSEIF  "$(CFG)" == "core - Win32 Debug"
+
+# Begin Custom Build - Creating ..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h
+InputPath=..\..\include\wx\msw\genrcdefs.h
+
+"..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h" : "$(SOURCE)" "..\..\lib\vc_lib\mswud\wx\msw"
+	cl /EP /nologo "$(InputPath)" > "..\..\lib\vc_lib\mswud\wx\msw\rcdefs.h"
+
+# End Custom Build
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\glcanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\headerctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpbest.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpchm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\helpwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\htmlhelp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\hyperlink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\icon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\imaglist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\iniconf.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\init.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\joystick.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\listbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\listctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\menuitem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\metafile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\minifram.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\missing.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\msgdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\msvcrt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\nonownedwnd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\notebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\notifmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\oleutils.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ownerdrw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\pen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\popupwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\printdlg.h
+# End Source File
+# Begin Source File
+
+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
+
+SOURCE=..\..\include\wx\msw\radiobut.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\rcdefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\region.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\richmsgdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\safearray.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\scrolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\slider.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\spinbutt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\spinctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statline.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\stattext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\statusbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\taskbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\textctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\textentry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\toolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\tooltip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\toplevel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\treectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\ole\uuid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\uxtheme.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\uxthemep.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\webview_ie.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\webview_missing.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\webviewhistoryitem_ie.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msw\window.h
+# End Source File
+# End Group
+# Begin Group "Generic Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\aboutdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\accel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\animate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\bmpcbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\buttonbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\calctrlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\choicdgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\clrpickerg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\collpaneg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\colrdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dcpsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dirctrlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dragimgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dvrenderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\dvrenderers.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\filectrlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\filepickerg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\fontpickerg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\gridctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\grideditors.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\gridsel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\headerctrlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\helpext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\hyperlink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\infobar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\laywin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\logg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\msgdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\notebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\notifmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\numdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\panelg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\printps.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\prntdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\progdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\propdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\richmsgdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\sashwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\scrolwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\spinctlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\splash.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\splitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\srchctlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\statbmpg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\stattextg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\textdlgg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\treectlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\generic\wizard.h
+# End Source File
+# End Group
+# Begin Group "wxHTML Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpfrm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\helpwnd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlcell.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmldefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlfilt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlpars.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlproc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmltag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmlwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\htmprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\m_templ.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\styleparams.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\html\winpars.h
+# End Source File
+# End Group
+# Begin Group "Common Headers"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\include\wx\aboutdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\accel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\access.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\advprops.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\affinematrix2d.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\affinematrix2dbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\anidecod.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\animate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\animdecod.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\anybutton.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\art.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\art_internal.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\artprov.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\aui.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\auibar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\auibook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\bannerwindow.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\bar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\bitmap.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\bmpbuttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\bmpcbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\bookctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\persist\bookctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\brush.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\busyinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\button.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\buttonbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\calctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\caret.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\checkbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\checklst.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\choicdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\choice.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\choicebk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\clipbrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\clrpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\cmdproc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\cmndata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\collpane.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\colordlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\colour.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\colourdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\combobox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\commandlinkbutton.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\compositewin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\control.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\cshelp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ctrlsub.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\cursor.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\custombgwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dataobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dataview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dateevt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\datetimectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcclient.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcgraph.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcmemory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcmirror.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcps.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcscreen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dcsvg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\debugrpt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dialog.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dialup.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dirctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dirdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\display.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\display_impl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dnd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\dockart.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\docmdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\docview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dragimag.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\dvrenderers.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\editlbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\editors.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\effects.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\encinfo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\evtloopsrc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fdrepdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\filectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\filedlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\filehistory.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\floatpane.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fmappriv.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\font.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fontdata.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fontdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fontenum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fontpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\fontutil.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\framemanager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\gallery.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\gbsizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\gdicmn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\gdiobj.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\geometry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\gifdecod.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\glcanvas.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\graphics.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\headercol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\headerctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\help.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\helpbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\helphtml.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\helpwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\htmllbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\hyperlink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\icon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\iconbndl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\image.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imaggif.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagiff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagjpeg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imaglist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagpcx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagpng.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagpnm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagtga.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagtiff.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\imagxpm.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\infobar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\itemid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\joystick.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\layout.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\laywin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\listbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\listbook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\listbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\listctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\manager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\matrix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\mediactrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\menuitem.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\metafile.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\minifram.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\mousemanager.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\msgdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\nativewin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\nonownedwnd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\notebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\notifmsg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\numdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\odcombo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\overlay.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ownerdrw.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\page.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\palette.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\paper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\pen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\persist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\pickerbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\popupwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\position.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\print.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\printdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\prntbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\progdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\property.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\propgrid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\propgriddefs.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\propgridiface.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\propgridpagestate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\propgrid\props.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\quantize.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\radiobox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\radiobut.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\range.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\rawbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\rearrangectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\region.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\renderer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richmsgdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextbackgroundpage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextborderspage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextbuffer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextbulletspage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextdialogpage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextfontpage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextformatdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtexthtml.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextimagedlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextindentspage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextliststylepage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextmarginspage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextprint.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextsizepage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextstyledlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextstylepage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextstyles.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextsymboldlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtexttabspage.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextuicustomization.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtext\richtextxml.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\richtooltip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\sashwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\scopeguard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\scrolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\scrolwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\selstore.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\settings.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\simplebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\slider.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\sound.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\spinbutt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\spinctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\splash.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\persist\splitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\splitter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\srchctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\statbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\statbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\statline.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\stattext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\statusbr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\stc\stc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\tabart.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\aui\tabmdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\taskbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tbarbase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\textcompleter.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\textctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\textdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\textentry.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\textwrapper.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tipdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tipwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\ribbon\toolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\toolbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\toolbook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\tooltip.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\persist\toplevel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\toplevel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\treebase.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\persist\treebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\treebook.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\treectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\treelist.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\uiaction.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\valgen.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\validate.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\valnum.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\valtext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\vidmode.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\vlbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\vms_x_fix.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\vscroll.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\webview.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\webviewarchivehandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\webviewfshandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\persist\window.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\window.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\windowid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\withimages.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\wizard.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\wrapsizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\wupdlock.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\wxhtml.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_all.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_animatctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_auinotbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bannerwindow.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bmpbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bmpcbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_bttn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_cald.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_chckb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_chckl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_choic.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_choicbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_clrpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_cmdlinkbn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_collpane.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_combo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_comboctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_datectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_dirpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_dlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_editlbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_filectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_filepicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_fontpicker.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_frame.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_gauge.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_gdctl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_grid.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_html.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_htmllbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_hyperlink.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_listb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_listbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_listc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_mdi.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_menu.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_notbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_odcombo.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_panel.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_propdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_radbt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_radbx.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_ribbon.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_richtext.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_scrol.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_scwin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_sizer.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_slidr.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_spin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_split.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_srchctrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_statbar.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_stbmp.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_stbox.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_stlin.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_sttxt.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_text.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_tglbtn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_timectrl.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolb.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_toolbk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_tree.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_treebk.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_unkwn.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xh_wizrd.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xmlres.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xrc\xmlreshandler.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xpmdecod.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\include\wx\xpmhand.h
+# End Source File
+# End Group
+# Begin Group "Source Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=..\..\src\xrc\xmlreshandler.cpp
+# End Source File
+# End Group
+# End Target
+# End Project
+
diff --git a/build/msw/wx_vc7_core.vcproj b/build/msw/wx_vc7_core.vcproj
index 395c3df11b..7d826c8034 100644
--- 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>
diff --git a/build/msw/wx_vc8_core.vcproj b/build/msw/wx_vc8_core.vcproj
index 18f1338e28..b81afc8128 100644
--- 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"
 				>
diff --git a/build/msw/wx_vc9_core.vcproj b/build/msw/wx_vc9_core.vcproj
index 83d70c5307..13aebbf490 100644
--- 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"
 				>
diff --git a/include/wx/preferences.h b/include/wx/preferences.h
new file mode 100644
index 0000000000..6f107ed058
--- /dev/null
+++ 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_
diff --git a/include/wx/private/preferences.h b/include/wx/private/preferences.h
new file mode 100644
index 0000000000..05ce8f5b1f
--- /dev/null
+++ 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_
diff --git a/interface/wx/preferences.h b/interface/wx/preferences.h
new file mode 100644
index 0000000000..222419e035
--- /dev/null
+++ 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;
+};
diff --git a/src/common/preferencescmn.cpp b/src/common/preferencescmn.cpp
new file mode 100644
index 0000000000..899dc36d2d
--- /dev/null
+++ 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();
+}
diff --git a/src/generic/preferencesg.cpp b/src/generic/preferencesg.cpp
new file mode 100644
index 0000000000..a19cc44d78
--- /dev/null
+++ 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
diff --git a/src/osx/cocoa/preferences.mm b/src/osx/cocoa/preferences.mm
new file mode 100644
index 0000000000..389e75092d
--- /dev/null
+++ 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