X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a6f6393c3f42fc0d14b6815fb7a4cf5549b53501..06cfab17389f4bbd38560dd86ee39931e979bb1e:/include/wx/postscrp.h

diff --git a/include/wx/postscrp.h b/include/wx/postscrp.h
index 73fd4dc59d..f0c1e5e0dc 100644
--- a/include/wx/postscrp.h
+++ b/include/wx/postscrp.h
@@ -43,6 +43,14 @@ public:
 #  endif
 #endif
 
+#ifdef __WXGTK__
+
+// wxGTK has its own wxPostscriptDC
+
+#include "wx/gtk/dcps.h"
+
+#else
+
 class WXDLLEXPORT wxPostScriptDC: public wxDC
 {
   DECLARE_DYNAMIC_CLASS(wxPostScriptDC)
@@ -61,7 +69,7 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
   inline virtual void BeginDrawing(void) {} ;
   inline virtual void EndDrawing(void) {} ;
 
-  void FloodFill(long x1, long y1, wxColour *col, int style=wxFLOOD_SURFACE) ;
+  void FloodFill(long x1, long y1, const wxColour &col, int style=wxFLOOD_SURFACE) ;
   bool GetPixel(long x1, long y1, wxColour *col) const;
 
   void DrawLine(long x1, long y1, long x2, long y2);
@@ -85,11 +93,8 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
 
   void DrawSpline(wxList *points);
 
-  void DrawIcon(const wxIcon& icon, long x, long y);
-#ifdef __WXGTK__
-  void DrawIcon(const wxIcon& icon, long x, long y, bool WXUNUSED(usemask) ) 
-    { DrawIcon( icon, x, y ); }
-#endif
+  void DrawIcon( const wxIcon& icon, long x, long y );
+  void DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask=FALSE );
   void DrawText(const wxString& text, long x, long y, bool use16 = FALSE);
 
   void Clear();
@@ -98,7 +103,9 @@ class WXDLLEXPORT wxPostScriptDC: public wxDC
   void SetBrush(const wxBrush& brush);
   void SetLogicalFunction(int function);
   void SetBackground(const wxBrush& brush);
+  
   void SetClippingRegion(long x, long y, long width, long height);
+  void SetClippingRegion( const wxRegion &region );
   void DestroyClippingRegion();
 
   bool StartDoc(const wxString& message);
@@ -151,6 +158,9 @@ protected:
   double            m_scaleFactor;
 };
 
+#endif 
+        // __WXGTK__
+      
 #define wxID_PRINTER_COMMAND        1
 #define wxID_PRINTER_OPTIONS        2
 #define wxID_PRINTER_ORIENTATION    3
@@ -309,6 +319,10 @@ private:
 
 WXDLLEXPORT_DATA(extern wxPrintPaperDatabase*) wxThePrintPaperDatabase;
 
-#endif // wxUSE_POSTSCRIPT
+#endif 
+      // wxUSE_POSTSCRIPT
+
 #endif
         // _WX_POSTSCRPH__
+	
+