Enabled wxPostscriptDC to be used in wxMSW, if wxUSE_POSTSCRIPT

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

diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index afc08205537f403b3c56a1d408343ccc4804725b..7278bf69d4bacca340feafbdc528e16e9e528817 100644 (file)
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -68,7 +68,7 @@ calctrl.cpp   Generic
 caret.cpp      Generic NotMSW
 choicdgg.cpp   Generic
 colrdlgg.cpp   Generic Generic
-dcpsg.cpp      Generic NotMSW
+dcpsg.cpp      Generic
 dirctrlg.cpp   Generic
 dirdlgg.cpp    Generic NotWin32,NotOS2,NotMac
 dragimgg.cpp   Generic NotOS2

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index 701c26e46f863c380c168e4a1bdebfd23621433f..ab2064457652d8afa087cdb551c60fa00771ad0d 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -37,7 +37,7 @@
 #include "wx/image.h"
 #include "wx/log.h"
 #include "wx/generic/dcpsg.h"
-#include "wx/generic/prntdlgg.h"
+#include "wx/printdlg.h"
 #include "wx/button.h"
 #include "wx/stattext.h"
 #include "wx/radiobox.h"

diff --git a/src/msw/files.lst b/src/msw/files.lst
index b42f82a45f95b69f32aa5152d93805e794219a1c..916d6e4878736ed12ea4a69b0cce1dcd464cab87 100644 (file)
--- a/src/msw/files.lst
+++ b/src/msw/files.lst
@@ -1,9 +1,10 @@
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:57, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE MSW.T!
 ALL_SOURCES = \
                generic/busyinfo.cpp \
                generic/calctrl.cpp \
                generic/choicdgg.cpp \
+               generic/dcpsg.cpp \
                generic/dirctrlg.cpp \
                generic/dragimgg.cpp \
                generic/grid.cpp \
@@ -795,6 +796,7 @@ GENERICOBJS = \
                busyinfo.o \
                calctrl.o \
                choicdgg.o \
+               dcpsg.o \
                dirctrlg.o \
                dragimgg.o \
                grid.o \

diff --git a/src/msw/makebase.vc b/src/msw/makebase.vc
index 61ec7251ffb458fd631da3d4dddc52545fc6cd61..24cdcf1cf85c7cf16dcfed1371a0ab58356ad4f6 100644 (file)
--- a/src/msw/makebase.vc
+++ b/src/msw/makebase.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 14:59, 2001/10/09
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BASEVC.T!
 
 # File:     makebase.vc

diff --git a/src/msw/makefile.b32 b/src/msw/makefile.b32
index ff91da829b39ea0ff3e38fcdd5c76f6280b7f3ae..6bdccecdb379b3c04c3bca0318736b0ae6558dc8 100644 (file)
--- a/src/msw/makefile.b32
+++ b/src/msw/makefile.b32
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE B32.T!
 
 #
@@ -74,6 +74,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcpsg.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dragimgg.obj \
                $(MSWDIR)\grid.obj \
@@ -889,6 +890,8 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+
 $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
 
 $(MSWDIR)\dragimgg.obj: $(GENDIR)\dragimgg.$(SRCSUFF)

diff --git a/src/msw/makefile.bcc b/src/msw/makefile.bcc
index 56021e50a13d6f2eb75d3ab0e5e586cff5a2d557..f1c3a7c700a6bc585dda93d36e370406bf02a88a 100644 (file)
--- a/src/msw/makefile.bcc
+++ b/src/msw/makefile.bcc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE BCC.T!
 
 #
@@ -69,6 +69,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= $(MSWDIR)\busyinfo.obj \
                $(MSWDIR)\calctrl.obj \
                $(MSWDIR)\choicdgg.obj \
+               $(MSWDIR)\dcpsg.obj \
                $(MSWDIR)\dirctrlg.obj \
                $(MSWDIR)\dirdlgg.obj \
                $(MSWDIR)\dragimgg.obj \
@@ -719,6 +720,8 @@ $(MSWDIR)\calctrl.obj: $(GENDIR)\calctrl.$(SRCSUFF)
 
 $(MSWDIR)\choicdgg.obj: $(GENDIR)\choicdgg.$(SRCSUFF)
 
+$(MSWDIR)\dcpsg.obj: $(GENDIR)\dcpsg.$(SRCSUFF)
+
 $(MSWDIR)\dirctrlg.obj: $(GENDIR)\dirctrlg.$(SRCSUFF)
 
 $(MSWDIR)\dirdlgg.obj: $(GENDIR)\dirdlgg.$(SRCSUFF)

diff --git a/src/msw/makefile.dos b/src/msw/makefile.dos
index ae31308a69d5dfc201a688ebb59939b7197bae24..28a85070fd0b843f41a3e0493b0b1ebbb9bfb47b 100644 (file)
--- a/src/msw/makefile.dos
+++ b/src/msw/makefile.dos
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE DOS.T!
 
 #
@@ -52,6 +52,7 @@ MSWDIR=.
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
+               $(GENDIR)\dcpsg.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dirdlgg.obj \
                $(GENDIR)\dragimgg.obj \
@@ -1308,6 +1309,11 @@ $(GENDIR)/choicdgg.obj:     $*.$(SRCSUFF)
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
 <<
 
+$(GENDIR)/dcpsg.obj:     $*.$(SRCSUFF)
+        cl @<<
+$(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)
+<<
+
 $(GENDIR)/dirctrlg.obj:     $*.$(SRCSUFF)
         cl @<<
 $(CPPFLAGS) /Fo$@ /c /Tp $*.$(SRCSUFF)

diff --git a/src/msw/makefile.g95 b/src/msw/makefile.g95
index f9c2d922f387055a9cffbd4a83e1c3d59b0c3c4f..898c5d2711644b85891e049c5e5d083d4490ed9c 100644 (file)
--- a/src/msw/makefile.g95
+++ b/src/msw/makefile.g95
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE G95.T!
 
 #
@@ -72,6 +72,7 @@ GENERICOBJS = \
                 $(GENDIR)/busyinfo.$(OBJSUFF) \
                $(GENDIR)/calctrl.$(OBJSUFF) \
                $(GENDIR)/choicdgg.$(OBJSUFF) \
+               $(GENDIR)/dcpsg.$(OBJSUFF) \
                $(GENDIR)/dirctrlg.$(OBJSUFF) \
                $(GENDIR)/dragimgg.$(OBJSUFF) \
                $(GENDIR)/grid.$(OBJSUFF) \

diff --git a/src/msw/makefile.sc b/src/msw/makefile.sc
index 9038c52738e9e5951cdf2a6255258b04d5b67bbd..b5fe6d3152be866ef20001e660b03f8865a7bd49 100644 (file)
--- a/src/msw/makefile.sc
+++ b/src/msw/makefile.sc
@@ -1,6 +1,6 @@
 
 
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE SC.T!
 
 # Symantec C++ makefile for the msw objects
@@ -28,6 +28,7 @@ MSWDIR=$(WXDIR)\src\msw
 GENERICOBJS= $(GENDIR)\busyinfo.obj \
                $(GENDIR)\calctrl.obj \
                $(GENDIR)\choicdgg.obj \
+               $(GENDIR)\dcpsg.obj \
                $(GENDIR)\dirctrlg.obj \
                $(GENDIR)\dragimgg.obj \
                $(GENDIR)\grid.obj \

diff --git a/src/msw/makefile.vc b/src/msw/makefile.vc
index e82b02191b8add3c332c463e72b2608b236e1d39..2308fb122832d4931e84b99668024523f6f2fe26 100644 (file)
--- a/src/msw/makefile.vc
+++ b/src/msw/makefile.vc
@@ -1,4 +1,4 @@
-# This file was automatically generated by tmake at 17:29, 2001/11/01
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE VC.T!
 
 # File:     makefile.vc
@@ -93,6 +93,7 @@ $(CPPFLAGS) /Fo$@ /c /Tp $<
 GENERICOBJS= $(GENDIR)\$D\busyinfo.obj \
                $(GENDIR)\$D\calctrl.obj \
                $(GENDIR)\$D\choicdgg.obj \
+               $(GENDIR)\$D\dcpsg.obj \
                $(GENDIR)\$D\dirctrlg.obj \
                $(GENDIR)\$D\dragimgg.obj \
                $(GENDIR)\$D\grid.obj \

diff --git a/src/msw/makefile.wat b/src/msw/makefile.wat
index 6647c21b65cfa9c1ec5ecb50b0c82f23748b24d4..d2b526166f7ea4414f6ef22c8474924e9e08aeb1 100644 (file)
--- a/src/msw/makefile.wat
+++ b/src/msw/makefile.wat
@@ -1,6 +1,6 @@
 #!/binb/wmake.exe
 
-# This file was automatically generated by tmake at 17:52, 2001/10/30
+# This file was automatically generated by tmake at 10:56, 2001/11/03
 # DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE WAT.T!
 
 #
@@ -44,6 +44,7 @@ DOCDIR = $(WXDIR)\docs
 GENERICOBJS= busyinfo.obj &
        calctrl.obj &
        choicdgg.obj &
+       dcpsg.obj &
        dirctrlg.obj &
        dragimgg.obj &
        grid.obj &
@@ -76,7 +77,6 @@ GENERICOBJS= busyinfo.obj &
 NONESSENTIALOBJS= accel.obj &
        caret.obj &
        colrdlgg.obj &
-       dcpsg.obj &
        dirdlgg.obj &
        fdrepdlg.obj &
        filedlgg.obj &
@@ -1103,6 +1103,9 @@ calctrl.obj:     $(GENDIR)\calctrl.cpp
 choicdgg.obj:     $(GENDIR)\choicdgg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
 
+dcpsg.obj:     $(GENDIR)\dcpsg.cpp
+  *$(CCC) $(CPPFLAGS) $(IFLAGS) $<
+
 dirctrlg.obj:     $(GENDIR)\dirctrlg.cpp
   *$(CCC) $(CPPFLAGS) $(IFLAGS) $<