From: Julian Smart <julian@anthemion.co.uk>
Date: Fri, 15 Aug 2003 10:11:41 +0000 (+0000)
Subject: Put printdc.cpp into all GUI builds because there's not a way
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/e32f486958289a3d61813669d52f4bee68df2f91

Put printdc.cpp into all GUI builds because there's not a way
of adding it to a MSW/Univ build otherwise
Now includes PostScript and WIN32 print dialogs in MSW/Univ build,
and setup.h determines which will be used.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 17dd48ddb1..11ccec8d77 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -432,6 +432,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/numdlgg.cpp
     src/generic/panelg.cpp
     src/generic/progdlgg.cpp
+    src/generic/printps.cpp
     src/generic/renderg.cpp
     src/generic/scrlwing.cpp
     src/generic/selstore.cpp
@@ -483,6 +484,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/generic/notebook.h
     wx/generic/panelg.h
     wx/generic/prntdlgg.h
+    wx/generic/printps.h
     wx/generic/progdlgg.h
     wx/generic/scrolwin.h
     wx/generic/spinctlg.h
@@ -618,7 +620,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="XWIN_LOWLEVEL_SRC" hints="files">
     src/generic/caret.cpp
-    src/generic/printps.cpp
     src/unix/dialup.cpp
     src/unix/fontenum.cpp
     src/unix/fontutil.cpp
@@ -626,7 +627,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 </set>
 <set var="XWIN_LOWLEVEL_HDR" hints="files">
     wx/generic/caret.h
-    wx/generic/printps.h
     wx/unix/fontutil.h
     wx/unix/utilsx11.h
 </set>
@@ -1057,6 +1057,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/palette.cpp
     src/msw/pen.cpp
     src/msw/popupwin.cpp
+    src/msw/printdlg.cpp
+    src/msw/printwin.cpp
     src/msw/region.cpp
     src/msw/renderer.cpp
     src/msw/settings.cpp
@@ -1100,8 +1102,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/msw/notebook.cpp
     src/msw/ole/access.cpp
     src/msw/ownerdrw.cpp
-    src/msw/printdlg.cpp
-    src/msw/printwin.cpp
     src/msw/radiobox.cpp
     src/msw/radiobut.cpp
     src/msw/scrolbar.cpp
diff --git a/build/msw/makefile.bcc b/build/msw/makefile.bcc
index 062ed2e6e2..e1e698ccdc 100644
--- a/build/msw/makefile.bcc
+++ b/build/msw/makefile.bcc
@@ -927,6 +927,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_palette.obj \
 	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
+	$(OBJS)\monolib_printdlg.obj \
+	$(OBJS)\monolib_printwin.obj \
 	$(OBJS)\monolib_region.obj \
 	$(OBJS)\monolib_renderer.obj \
 	$(OBJS)\monolib_settings.obj \
@@ -966,8 +968,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
-	$(OBJS)\monolib_printdlg.obj \
-	$(OBJS)\monolib_printwin.obj \
 	$(OBJS)\monolib_radiobox.obj \
 	$(OBJS)\monolib_radiobut.obj \
 	$(OBJS)\monolib_scrolbar.obj \
@@ -1064,6 +1064,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_panelg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
+	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_scrlwing.obj \
 	$(OBJS)\monolib_selstore.obj \
@@ -1116,6 +1117,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_palette.obj \
 	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
+	$(OBJS)\monolib_printdlg.obj \
+	$(OBJS)\monolib_printwin.obj \
 	$(OBJS)\monolib_region.obj \
 	$(OBJS)\monolib_renderer.obj \
 	$(OBJS)\monolib_settings.obj \
@@ -1254,6 +1257,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_panelg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
+	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_scrlwing.obj \
 	$(OBJS)\monolib_selstore.obj \
@@ -1306,6 +1310,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_palette.obj \
 	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
+	$(OBJS)\coredll_printdlg.obj \
+	$(OBJS)\coredll_printwin.obj \
 	$(OBJS)\coredll_region.obj \
 	$(OBJS)\coredll_renderer.obj \
 	$(OBJS)\coredll_settings.obj \
@@ -1345,8 +1351,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
-	$(OBJS)\coredll_printdlg.obj \
-	$(OBJS)\coredll_printwin.obj \
 	$(OBJS)\coredll_radiobox.obj \
 	$(OBJS)\coredll_radiobut.obj \
 	$(OBJS)\coredll_scrolbar.obj \
@@ -1443,6 +1447,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_panelg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
+	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_scrlwing.obj \
 	$(OBJS)\coredll_selstore.obj \
@@ -1495,6 +1500,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_palette.obj \
 	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
+	$(OBJS)\coredll_printdlg.obj \
+	$(OBJS)\coredll_printwin.obj \
 	$(OBJS)\coredll_region.obj \
 	$(OBJS)\coredll_renderer.obj \
 	$(OBJS)\coredll_settings.obj \
@@ -1633,6 +1640,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_panelg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
+	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_scrlwing.obj \
 	$(OBJS)\coredll_selstore.obj \
@@ -1685,6 +1693,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_palette.obj \
 	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
+	$(OBJS)\corelib_printdlg.obj \
+	$(OBJS)\corelib_printwin.obj \
 	$(OBJS)\corelib_region.obj \
 	$(OBJS)\corelib_renderer.obj \
 	$(OBJS)\corelib_settings.obj \
@@ -1724,8 +1734,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
-	$(OBJS)\corelib_printdlg.obj \
-	$(OBJS)\corelib_printwin.obj \
 	$(OBJS)\corelib_radiobox.obj \
 	$(OBJS)\corelib_radiobut.obj \
 	$(OBJS)\corelib_scrolbar.obj \
@@ -1822,6 +1830,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_panelg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
+	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_scrlwing.obj \
 	$(OBJS)\corelib_selstore.obj \
@@ -1874,6 +1883,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_palette.obj \
 	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
+	$(OBJS)\corelib_printdlg.obj \
+	$(OBJS)\corelib_printwin.obj \
 	$(OBJS)\corelib_region.obj \
 	$(OBJS)\corelib_renderer.obj \
 	$(OBJS)\corelib_settings.obj \
@@ -2012,6 +2023,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_panelg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
+	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_scrlwing.obj \
 	$(OBJS)\corelib_selstore.obj \
@@ -2064,6 +2076,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_palette.obj \
 	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
+	$(OBJS)\monodll_printdlg.obj \
+	$(OBJS)\monodll_printwin.obj \
 	$(OBJS)\monodll_region.obj \
 	$(OBJS)\monodll_renderer.obj \
 	$(OBJS)\monodll_settings.obj \
@@ -2103,8 +2117,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
-	$(OBJS)\monodll_printdlg.obj \
-	$(OBJS)\monodll_printwin.obj \
 	$(OBJS)\monodll_radiobox.obj \
 	$(OBJS)\monodll_radiobut.obj \
 	$(OBJS)\monodll_scrolbar.obj \
@@ -2201,6 +2213,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_panelg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
+	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_scrlwing.obj \
 	$(OBJS)\monodll_selstore.obj \
@@ -2253,6 +2266,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_palette.obj \
 	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
+	$(OBJS)\monodll_printdlg.obj \
+	$(OBJS)\monodll_printwin.obj \
 	$(OBJS)\monodll_region.obj \
 	$(OBJS)\monodll_renderer.obj \
 	$(OBJS)\monodll_settings.obj \
@@ -2391,6 +2406,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_panelg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
+	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_scrlwing.obj \
 	$(OBJS)\monodll_selstore.obj \
@@ -3842,11 +3858,20 @@ $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) -q -c -P -o$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -4947,11 +4972,20 @@ $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) -q -c -P -o$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -6436,11 +6470,20 @@ $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -7880,11 +7923,20 @@ $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) -q -c -P -o$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
diff --git a/build/msw/makefile.vc b/build/msw/makefile.vc
index 2517d29b4d..d8b6f1eb63 100644
--- a/build/msw/makefile.vc
+++ b/build/msw/makefile.vc
@@ -1241,6 +1241,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_palette.obj \
 	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
+	$(OBJS)\monolib_printdlg.obj \
+	$(OBJS)\monolib_printwin.obj \
 	$(OBJS)\monolib_region.obj \
 	$(OBJS)\monolib_renderer.obj \
 	$(OBJS)\monolib_settings.obj \
@@ -1280,8 +1282,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_notebook.obj \
 	$(OBJS)\monolib_access.obj \
 	$(OBJS)\monolib_ownerdrw.obj \
-	$(OBJS)\monolib_printdlg.obj \
-	$(OBJS)\monolib_printwin.obj \
 	$(OBJS)\monolib_radiobox.obj \
 	$(OBJS)\monolib_radiobut.obj \
 	$(OBJS)\monolib_scrolbar.obj \
@@ -1378,6 +1378,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_panelg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
+	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_scrlwing.obj \
 	$(OBJS)\monolib_selstore.obj \
@@ -1430,6 +1431,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_palette.obj \
 	$(OBJS)\monolib_pen.obj \
 	$(OBJS)\monolib_popupwin.obj \
+	$(OBJS)\monolib_printdlg.obj \
+	$(OBJS)\monolib_printwin.obj \
 	$(OBJS)\monolib_region.obj \
 	$(OBJS)\monolib_renderer.obj \
 	$(OBJS)\monolib_settings.obj \
@@ -1568,6 +1571,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  \
 	$(OBJS)\monolib_numdlgg.obj \
 	$(OBJS)\monolib_panelg.obj \
 	$(OBJS)\monolib_progdlgg.obj \
+	$(OBJS)\monolib_printps.obj \
 	$(OBJS)\monolib_renderg.obj \
 	$(OBJS)\monolib_scrlwing.obj \
 	$(OBJS)\monolib_selstore.obj \
@@ -1620,6 +1624,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_palette.obj \
 	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
+	$(OBJS)\coredll_printdlg.obj \
+	$(OBJS)\coredll_printwin.obj \
 	$(OBJS)\coredll_region.obj \
 	$(OBJS)\coredll_renderer.obj \
 	$(OBJS)\coredll_settings.obj \
@@ -1659,8 +1665,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_notebook.obj \
 	$(OBJS)\coredll_access.obj \
 	$(OBJS)\coredll_ownerdrw.obj \
-	$(OBJS)\coredll_printdlg.obj \
-	$(OBJS)\coredll_printwin.obj \
 	$(OBJS)\coredll_radiobox.obj \
 	$(OBJS)\coredll_radiobut.obj \
 	$(OBJS)\coredll_scrolbar.obj \
@@ -1757,6 +1761,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_panelg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
+	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_scrlwing.obj \
 	$(OBJS)\coredll_selstore.obj \
@@ -1809,6 +1814,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_palette.obj \
 	$(OBJS)\coredll_pen.obj \
 	$(OBJS)\coredll_popupwin.obj \
+	$(OBJS)\coredll_printdlg.obj \
+	$(OBJS)\coredll_printwin.obj \
 	$(OBJS)\coredll_region.obj \
 	$(OBJS)\coredll_renderer.obj \
 	$(OBJS)\coredll_settings.obj \
@@ -1947,6 +1954,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  \
 	$(OBJS)\coredll_numdlgg.obj \
 	$(OBJS)\coredll_panelg.obj \
 	$(OBJS)\coredll_progdlgg.obj \
+	$(OBJS)\coredll_printps.obj \
 	$(OBJS)\coredll_renderg.obj \
 	$(OBJS)\coredll_scrlwing.obj \
 	$(OBJS)\coredll_selstore.obj \
@@ -1999,6 +2007,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_palette.obj \
 	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
+	$(OBJS)\corelib_printdlg.obj \
+	$(OBJS)\corelib_printwin.obj \
 	$(OBJS)\corelib_region.obj \
 	$(OBJS)\corelib_renderer.obj \
 	$(OBJS)\corelib_settings.obj \
@@ -2038,8 +2048,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_notebook.obj \
 	$(OBJS)\corelib_access.obj \
 	$(OBJS)\corelib_ownerdrw.obj \
-	$(OBJS)\corelib_printdlg.obj \
-	$(OBJS)\corelib_printwin.obj \
 	$(OBJS)\corelib_radiobox.obj \
 	$(OBJS)\corelib_radiobut.obj \
 	$(OBJS)\corelib_scrolbar.obj \
@@ -2136,6 +2144,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_panelg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
+	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_scrlwing.obj \
 	$(OBJS)\corelib_selstore.obj \
@@ -2188,6 +2197,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_palette.obj \
 	$(OBJS)\corelib_pen.obj \
 	$(OBJS)\corelib_popupwin.obj \
+	$(OBJS)\corelib_printdlg.obj \
+	$(OBJS)\corelib_printwin.obj \
 	$(OBJS)\corelib_region.obj \
 	$(OBJS)\corelib_renderer.obj \
 	$(OBJS)\corelib_settings.obj \
@@ -2326,6 +2337,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  \
 	$(OBJS)\corelib_numdlgg.obj \
 	$(OBJS)\corelib_panelg.obj \
 	$(OBJS)\corelib_progdlgg.obj \
+	$(OBJS)\corelib_printps.obj \
 	$(OBJS)\corelib_renderg.obj \
 	$(OBJS)\corelib_scrlwing.obj \
 	$(OBJS)\corelib_selstore.obj \
@@ -2378,6 +2390,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_palette.obj \
 	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
+	$(OBJS)\monodll_printdlg.obj \
+	$(OBJS)\monodll_printwin.obj \
 	$(OBJS)\monodll_region.obj \
 	$(OBJS)\monodll_renderer.obj \
 	$(OBJS)\monodll_settings.obj \
@@ -2417,8 +2431,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_notebook.obj \
 	$(OBJS)\monodll_access.obj \
 	$(OBJS)\monodll_ownerdrw.obj \
-	$(OBJS)\monodll_printdlg.obj \
-	$(OBJS)\monodll_printwin.obj \
 	$(OBJS)\monodll_radiobox.obj \
 	$(OBJS)\monodll_radiobut.obj \
 	$(OBJS)\monodll_scrolbar.obj \
@@ -2515,6 +2527,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_panelg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
+	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_scrlwing.obj \
 	$(OBJS)\monodll_selstore.obj \
@@ -2567,6 +2580,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_palette.obj \
 	$(OBJS)\monodll_pen.obj \
 	$(OBJS)\monodll_popupwin.obj \
+	$(OBJS)\monodll_printdlg.obj \
+	$(OBJS)\monodll_printwin.obj \
 	$(OBJS)\monodll_region.obj \
 	$(OBJS)\monodll_renderer.obj \
 	$(OBJS)\monodll_settings.obj \
@@ -2705,6 +2720,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  \
 	$(OBJS)\monodll_numdlgg.obj \
 	$(OBJS)\monodll_panelg.obj \
 	$(OBJS)\monodll_progdlgg.obj \
+	$(OBJS)\monodll_printps.obj \
 	$(OBJS)\monodll_renderg.obj \
 	$(OBJS)\monodll_scrlwing.obj \
 	$(OBJS)\monodll_selstore.obj \
@@ -4402,11 +4418,20 @@ $(OBJS)\coredll_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\coredll_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(COREDLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\coredll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -5507,11 +5532,20 @@ $(OBJS)\corelib_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\corelib_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(CORELIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\corelib_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -6996,11 +7030,20 @@ $(OBJS)\monodll_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monodll_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONODLL_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monodll_prntbase.obj: ..\..\src\common\prntbase.cpp
@@ -8440,11 +8483,20 @@ $(OBJS)\monolib_popupwin.obj: ..\..\src\msw\popupwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
 !endif
 
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printdlg.obj: ..\..\src\msw\printdlg.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
+!if "$(USE_GUI)" == "1"
+$(OBJS)\monolib_printps.obj: ..\..\src\generic\printps.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
+
+!if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_printwin.obj: ..\..\src\msw\printwin.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(MONOLIB_CXXFLAGS) $**
+!endif
 
 !if "$(USE_GUI)" == "1"
 $(OBJS)\monolib_prntbase.obj: ..\..\src\common\prntbase.cpp
diff --git a/build/msw/makefile.wat b/build/msw/makefile.wat
index d44ac1d113..ae23dcce99 100644
--- a/build/msw/makefile.wat
+++ b/build/msw/makefile.wat
@@ -202,6 +202,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_palette.obj &
 	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
+	$(OBJS)\monolib_printdlg.obj &
+	$(OBJS)\monolib_printwin.obj &
 	$(OBJS)\monolib_region.obj &
 	$(OBJS)\monolib_renderer.obj &
 	$(OBJS)\monolib_settings.obj &
@@ -241,8 +243,6 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_notebook.obj &
 	$(OBJS)\monolib_access.obj &
 	$(OBJS)\monolib_ownerdrw.obj &
-	$(OBJS)\monolib_printdlg.obj &
-	$(OBJS)\monolib_printwin.obj &
 	$(OBJS)\monolib_radiobox.obj &
 	$(OBJS)\monolib_radiobut.obj &
 	$(OBJS)\monolib_scrolbar.obj &
@@ -339,6 +339,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_numdlgg.obj &
 	$(OBJS)\monolib_panelg.obj &
 	$(OBJS)\monolib_progdlgg.obj &
+	$(OBJS)\monolib_printps.obj &
 	$(OBJS)\monolib_renderg.obj &
 	$(OBJS)\monolib_scrlwing.obj &
 	$(OBJS)\monolib_selstore.obj &
@@ -393,6 +394,8 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_palette.obj &
 	$(OBJS)\monolib_pen.obj &
 	$(OBJS)\monolib_popupwin.obj &
+	$(OBJS)\monolib_printdlg.obj &
+	$(OBJS)\monolib_printwin.obj &
 	$(OBJS)\monolib_region.obj &
 	$(OBJS)\monolib_renderer.obj &
 	$(OBJS)\monolib_settings.obj &
@@ -531,6 +534,7 @@ ____CORE_SRC_FILENAMES_1_OBJECTS =  &
 	$(OBJS)\monolib_numdlgg.obj &
 	$(OBJS)\monolib_panelg.obj &
 	$(OBJS)\monolib_progdlgg.obj &
+	$(OBJS)\monolib_printps.obj &
 	$(OBJS)\monolib_renderg.obj &
 	$(OBJS)\monolib_scrlwing.obj &
 	$(OBJS)\monolib_selstore.obj &
@@ -586,6 +590,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_palette.obj &
 	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
+	$(OBJS)\coredll_printdlg.obj &
+	$(OBJS)\coredll_printwin.obj &
 	$(OBJS)\coredll_region.obj &
 	$(OBJS)\coredll_renderer.obj &
 	$(OBJS)\coredll_settings.obj &
@@ -625,8 +631,6 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_notebook.obj &
 	$(OBJS)\coredll_access.obj &
 	$(OBJS)\coredll_ownerdrw.obj &
-	$(OBJS)\coredll_printdlg.obj &
-	$(OBJS)\coredll_printwin.obj &
 	$(OBJS)\coredll_radiobox.obj &
 	$(OBJS)\coredll_radiobut.obj &
 	$(OBJS)\coredll_scrolbar.obj &
@@ -723,6 +727,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_numdlgg.obj &
 	$(OBJS)\coredll_panelg.obj &
 	$(OBJS)\coredll_progdlgg.obj &
+	$(OBJS)\coredll_printps.obj &
 	$(OBJS)\coredll_renderg.obj &
 	$(OBJS)\coredll_scrlwing.obj &
 	$(OBJS)\coredll_selstore.obj &
@@ -777,6 +782,8 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_palette.obj &
 	$(OBJS)\coredll_pen.obj &
 	$(OBJS)\coredll_popupwin.obj &
+	$(OBJS)\coredll_printdlg.obj &
+	$(OBJS)\coredll_printwin.obj &
 	$(OBJS)\coredll_region.obj &
 	$(OBJS)\coredll_renderer.obj &
 	$(OBJS)\coredll_settings.obj &
@@ -915,6 +922,7 @@ ____CORE_SRC_FILENAMES_2_OBJECTS =  &
 	$(OBJS)\coredll_numdlgg.obj &
 	$(OBJS)\coredll_panelg.obj &
 	$(OBJS)\coredll_progdlgg.obj &
+	$(OBJS)\coredll_printps.obj &
 	$(OBJS)\coredll_renderg.obj &
 	$(OBJS)\coredll_scrlwing.obj &
 	$(OBJS)\coredll_selstore.obj &
@@ -970,6 +978,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_palette.obj &
 	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
+	$(OBJS)\corelib_printdlg.obj &
+	$(OBJS)\corelib_printwin.obj &
 	$(OBJS)\corelib_region.obj &
 	$(OBJS)\corelib_renderer.obj &
 	$(OBJS)\corelib_settings.obj &
@@ -1009,8 +1019,6 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_notebook.obj &
 	$(OBJS)\corelib_access.obj &
 	$(OBJS)\corelib_ownerdrw.obj &
-	$(OBJS)\corelib_printdlg.obj &
-	$(OBJS)\corelib_printwin.obj &
 	$(OBJS)\corelib_radiobox.obj &
 	$(OBJS)\corelib_radiobut.obj &
 	$(OBJS)\corelib_scrolbar.obj &
@@ -1107,6 +1115,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_numdlgg.obj &
 	$(OBJS)\corelib_panelg.obj &
 	$(OBJS)\corelib_progdlgg.obj &
+	$(OBJS)\corelib_printps.obj &
 	$(OBJS)\corelib_renderg.obj &
 	$(OBJS)\corelib_scrlwing.obj &
 	$(OBJS)\corelib_selstore.obj &
@@ -1161,6 +1170,8 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_palette.obj &
 	$(OBJS)\corelib_pen.obj &
 	$(OBJS)\corelib_popupwin.obj &
+	$(OBJS)\corelib_printdlg.obj &
+	$(OBJS)\corelib_printwin.obj &
 	$(OBJS)\corelib_region.obj &
 	$(OBJS)\corelib_renderer.obj &
 	$(OBJS)\corelib_settings.obj &
@@ -1299,6 +1310,7 @@ ____CORE_SRC_FILENAMES_3_OBJECTS =  &
 	$(OBJS)\corelib_numdlgg.obj &
 	$(OBJS)\corelib_panelg.obj &
 	$(OBJS)\corelib_progdlgg.obj &
+	$(OBJS)\corelib_printps.obj &
 	$(OBJS)\corelib_renderg.obj &
 	$(OBJS)\corelib_scrlwing.obj &
 	$(OBJS)\corelib_selstore.obj &
@@ -1354,6 +1366,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_palette.obj &
 	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
+	$(OBJS)\monodll_printdlg.obj &
+	$(OBJS)\monodll_printwin.obj &
 	$(OBJS)\monodll_region.obj &
 	$(OBJS)\monodll_renderer.obj &
 	$(OBJS)\monodll_settings.obj &
@@ -1393,8 +1407,6 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_notebook.obj &
 	$(OBJS)\monodll_access.obj &
 	$(OBJS)\monodll_ownerdrw.obj &
-	$(OBJS)\monodll_printdlg.obj &
-	$(OBJS)\monodll_printwin.obj &
 	$(OBJS)\monodll_radiobox.obj &
 	$(OBJS)\monodll_radiobut.obj &
 	$(OBJS)\monodll_scrolbar.obj &
@@ -1491,6 +1503,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_numdlgg.obj &
 	$(OBJS)\monodll_panelg.obj &
 	$(OBJS)\monodll_progdlgg.obj &
+	$(OBJS)\monodll_printps.obj &
 	$(OBJS)\monodll_renderg.obj &
 	$(OBJS)\monodll_scrlwing.obj &
 	$(OBJS)\monodll_selstore.obj &
@@ -1545,6 +1558,8 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_palette.obj &
 	$(OBJS)\monodll_pen.obj &
 	$(OBJS)\monodll_popupwin.obj &
+	$(OBJS)\monodll_printdlg.obj &
+	$(OBJS)\monodll_printwin.obj &
 	$(OBJS)\monodll_region.obj &
 	$(OBJS)\monodll_renderer.obj &
 	$(OBJS)\monodll_settings.obj &
@@ -1683,6 +1698,7 @@ ____CORE_SRC_FILENAMES_OBJECTS =  &
 	$(OBJS)\monodll_numdlgg.obj &
 	$(OBJS)\monodll_panelg.obj &
 	$(OBJS)\monodll_progdlgg.obj &
+	$(OBJS)\monodll_printps.obj &
 	$(OBJS)\monodll_renderg.obj &
 	$(OBJS)\monodll_scrlwing.obj &
 	$(OBJS)\monodll_selstore.obj &
@@ -4060,11 +4076,20 @@ $(OBJS)\coredll_popupwin.obj :  .AUTODEPEND ..\..\src\msw\popupwin.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\coredll_printdlg.obj :  .AUTODEPEND ..\..\src\msw\printdlg.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\coredll_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
+	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
 
+!ifeq USE_GUI 1
 $(OBJS)\coredll_printwin.obj :  .AUTODEPEND ..\..\src\msw\printwin.cpp
 	$(CXX) -zq -fo=$^@ $(COREDLL_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\coredll_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
@@ -5265,11 +5290,20 @@ $(OBJS)\corelib_popupwin.obj :  .AUTODEPEND ..\..\src\msw\popupwin.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\corelib_printdlg.obj :  .AUTODEPEND ..\..\src\msw\printdlg.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\corelib_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
+	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
 
+!ifeq USE_GUI 1
 $(OBJS)\corelib_printwin.obj :  .AUTODEPEND ..\..\src\msw\printwin.cpp
 	$(CXX) -zq -fo=$^@ $(CORELIB_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\corelib_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
@@ -6854,11 +6888,20 @@ $(OBJS)\monodll_popupwin.obj :  .AUTODEPEND ..\..\src\msw\popupwin.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\monodll_printdlg.obj :  .AUTODEPEND ..\..\src\msw\printdlg.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
+$(OBJS)\monodll_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
+	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
 
+!ifeq USE_GUI 1
 $(OBJS)\monodll_printwin.obj :  .AUTODEPEND ..\..\src\msw\printwin.cpp
 	$(CXX) -zq -fo=$^@ $(MONODLL_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monodll_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
@@ -8398,11 +8441,20 @@ $(OBJS)\monolib_popupwin.obj :  .AUTODEPEND ..\..\src\msw\popupwin.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
 !endif
 
+!ifeq USE_GUI 1
 $(OBJS)\monolib_printdlg.obj :  .AUTODEPEND ..\..\src\msw\printdlg.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
 
+!ifeq USE_GUI 1
+$(OBJS)\monolib_printps.obj :  .AUTODEPEND ..\..\src\generic\printps.cpp
+	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
+
+!ifeq USE_GUI 1
 $(OBJS)\monolib_printwin.obj :  .AUTODEPEND ..\..\src\msw\printwin.cpp
 	$(CXX) -zq -fo=$^@ $(MONOLIB_CXXFLAGS) $<
+!endif
 
 !ifeq USE_GUI 1
 $(OBJS)\monolib_prntbase.obj :  .AUTODEPEND ..\..\src\common\prntbase.cpp
diff --git a/build/msw/wx.dsw b/build/msw/wx.dsw
index 97873f97bb..e1f44371e0 100644
--- a/build/msw/wx.dsw
+++ b/build/msw/wx.dsw
@@ -2,7 +2,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
 
 ###############################################################################
-Project: "adv"=wx_adv.dsp - Package Owner=<4>
+Project: "advdll"=wx_advdll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -10,11 +10,35 @@ Package=<5>
 
 Package=<4>
 {{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name coredll
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "base"=wx_base.dsp - Package Owner=<4>
+Project: "advlib"=wx_advlib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -26,7 +50,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "core"=wx_core.dsp - Package Owner=<4>
+Project: "basedll"=wx_basedll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -34,11 +58,29 @@ Package=<5>
 
 Package=<4>
 {{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "dbgrid"=wx_dbgrid.dsp - Package Owner=<4>
+Project: "baselib"=wx_baselib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -50,7 +92,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "gl"=wx_gl.dsp - Package Owner=<4>
+Project: "coredll"=wx_coredll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -58,11 +100,32 @@ Package=<5>
 
 Package=<4>
 {{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "html"=wx_html.dsp - Package Owner=<4>
+Project: "corelib"=wx_corelib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -74,7 +137,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "net"=wx_net.dsp - Package Owner=<4>
+Project: "dbgriddll"=wx_dbgriddll.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -82,11 +145,221 @@ Package=<5>
 
 Package=<4>
 {{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name advdll
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name odbcdll
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name coredll
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
 }}}
 
 ###############################################################################
 
-Project: "odbc"=wx_odbc.dsp - Package Owner=<4>
+Project: "dbgridlib"=wx_dbgridlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "gldll"=wx_gldll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "gllib"=wx_gllib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "htmldll"=wx_htmldll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name coredll
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "htmllib"=wx_htmllib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "netdll"=wx_netdll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "netlib"=wx_netlib.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Project: "odbcdll"=wx_odbcdll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "odbclib"=wx_odbclib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -170,7 +443,40 @@ Package=<4>
 
 ###############################################################################
 
-Project: "xml"=wx_xml.dsp - Package Owner=<4>
+Project: "xmldll"=wx_xmldll.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+Begin Project Dependency
+Project_Dep_Name wxtiff
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxjpeg
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxpng
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxexpat
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxzlib
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name wxregex
+End Project Dependency
+Begin Project Dependency
+Project_Dep_Name basedll
+End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "xmllib"=wx_xmllib.dsp - Package Owner=<4>
 
 Package=<5>
 {{{