1. minor fixes in wxDynLib

[wxWidgets.git] / include / wx / generic / dcpsg.h

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index a0d0c51cc6a4cc4ab91cdc4450f9853a61aed793..fba5f2cb57d1cc3b14ab8c9712a2a9fc63e9c4a3 100644 (file)
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -17,13 +17,13 @@
 
 #include "wx/dc.h"
 
 
 #include "wx/dc.h"
 

+#if wxUSE_PRINTING_ARCHITECTURE
+

 #if wxUSE_POSTSCRIPT
 
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"
 #if wxUSE_POSTSCRIPT
 
 #include "wx/dialog.h"
 #include "wx/module.h"
 #include "wx/cmndata.h"

-#include <fstream.h>
-

 
 //-----------------------------------------------------------------------------
 // classes
 
 //-----------------------------------------------------------------------------
 // classes


@@ -97,7 +97,7 @@ public:
   void SetClippingRegion(long x, long y, long width, long height);
   void SetClippingRegion( const wxRegion &region );
   void DestroyClippingRegion();
   void SetClippingRegion(long x, long y, long width, long height);
   void SetClippingRegion( const wxRegion &region );
   void DestroyClippingRegion();

-  
+

   void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) {}
 
   bool StartDoc(const wxString& message);
   void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) {}
 
   bool StartDoc(const wxString& message);


@@ -125,16 +125,14 @@ public:
   inline void SetBackgroundMode(int WXUNUSED(mode)) {}
   inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
 
   inline void SetBackgroundMode(int WXUNUSED(mode)) {}
   inline void SetPalette(const wxPalette& WXUNUSED(palette)) {}
 

-  inline ofstream *GetStream(void) const { return m_pstream; }
+  wxPrintData& GetPrintData() { return m_printData; }
+  void SetPrintData(const wxPrintData& data) { m_printData = data; }

 
 

-  inline wxPrintData& GetPrintData() { return m_printData; }
-  inline void SetPrintData(const wxPrintData& data) { m_printData = data; }
-  
-  int GetDepth() const { return 24; }
+  virtual int GetDepth() const { return 24; }

 
 protected:
 
 
 protected:
 

-  ofstream *        m_pstream;    // PostScript output stream
+  FILE*             m_pstream;    // PostScript output stream

   wxString          m_title;
   unsigned char     m_currentRed;
   unsigned char     m_currentGreen;
   wxString          m_title;
   unsigned char     m_currentRed;
   unsigned char     m_currentGreen;


@@ -170,13 +168,15 @@ public:
 #endif
 
 // Print Orientation (Should also add Left, Right)
 #endif
 
 // Print Orientation (Should also add Left, Right)

-enum {
+enum
+{

   PS_PORTRAIT = 1,
   PS_LANDSCAPE = 2
 };// ps_orientation = PS_PORTRAIT;
 
 // Print Actions
   PS_PORTRAIT = 1,
   PS_LANDSCAPE = 2
 };// ps_orientation = PS_PORTRAIT;
 
 // Print Actions

-enum {
+enum
+{

   PS_NONE,
   PS_PREVIEW,
   PS_FILE,
   PS_NONE,
   PS_PREVIEW,
   PS_FILE,


@@ -273,6 +273,9 @@ WXDLLEXPORT extern void wxInitializePrintSetupData(bool init = TRUE);
 
 #endif
     // wxUSE_POSTSCRIPT
 
 #endif
     // wxUSE_POSTSCRIPT

+    
+#endif
+    // wxUSE_PRINTING_ARCHITECTURE

 
 #endif
         // _WX_DCPSG_H_
 
 #endif
         // _WX_DCPSG_H_