From 7087444f7e4f0f0954ed7011f4c5e87aa68497ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 16 Oct 1999 15:37:35 +0000
Subject: [PATCH] fixed bug in PS clipping (non-virtual SetClippingRegion was
 overloaded)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4024 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/generic/dcpsg.h |  3 +--
 src/generic/dcpsg.cpp      | 14 +++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/include/wx/generic/dcpsg.h b/include/wx/generic/dcpsg.h
index fba5f2cb57..b12584fd2d 100644
--- a/include/wx/generic/dcpsg.h
+++ b/include/wx/generic/dcpsg.h
@@ -94,8 +94,7 @@ public:
   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 DoSetClippingRegion(long x, long y, long width, long height);
   void DestroyClippingRegion();
 
   void DoSetClippingRegionAsRegion( const wxRegion &WXUNUSED(clip) ) {}
diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index a02303a670..6770319ffd 100644
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -387,13 +387,13 @@ bool wxPostScriptDC::PrinterDialog(wxWindow *parent)
     return m_ok;
 }
 
-void wxPostScriptDC::SetClippingRegion (long x, long y, long w, long h)
+void wxPostScriptDC::DoSetClippingRegion (long x, long y, long w, long h)
 {
     wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
 
-    if (m_clipping) return;
+    if (m_clipping) DestroyClippingRegion();
 
-    wxDC::SetClippingRegion( x, y, w, h );
+    wxDC::DoSetClippingRegion(x, y, w, h);
 
     m_clipping = TRUE;
     fprintf( m_pstream, 
@@ -409,22 +409,18 @@ void wxPostScriptDC::SetClippingRegion (long x, long y, long w, long h)
 	    XLOG2DEV(x),   YLOG2DEV(y+h) );
 }
 
-void wxPostScriptDC::SetClippingRegion( const wxRegion &WXUNUSED(region) )
-{
-    wxFAIL_MSG( wxT("wxPostScriptDC::SetClippingRegion not implemented.") );
-}
 
 void wxPostScriptDC::DestroyClippingRegion()
 {
     wxCHECK_RET( m_ok && m_pstream, wxT("invalid postscript dc") );
 
-    wxDC::DestroyClippingRegion();
-
     if (m_clipping)
     {
         m_clipping = FALSE;
 	fprintf( m_pstream, "grestore\n" );
     }
+    
+    wxDC::DestroyClippingRegion();
 }
 
 void wxPostScriptDC::Clear()
-- 
2.45.2