[Plplot-cvs] SF.net SVN: plplot:[11821] trunk/drivers/wxwidgets_gc.cpp

[<sm...@us...>]

Revision: 11821
          http://plplot.svn.sourceforge.net/plplot/?rev=11821&view=rev
Author:   smekal
Date:     2011-07-19 15:46:38 +0000 (Tue, 19 Jul 2011)

Log Message:
-----------
The text clipping didn't work for wxWidgets 2.9.2/Cocoa/Mac since the wxRegion constructor used wasn't implemented. Only for this wxWidgets configuration another wxRegion constructor is used. Apart from that there was no problem using the new wxWidgets version (which soon will become 3.0.0) with the PLplot wxWidgets driver.

Modified Paths:
--------------
    trunk/drivers/wxwidgets_gc.cpp

Modified: trunk/drivers/wxwidgets_gc.cpp
===================================================================
--- trunk/drivers/wxwidgets_gc.cpp	2011-07-18 05:34:57 UTC (rev 11820)
+++ trunk/drivers/wxwidgets_gc.cpp	2011-07-19 15:46:38 UTC (rev 11821)
@@ -425,6 +425,19 @@
     PLINT rcx[4], rcy[4];
     difilt_clip( rcx, rcy );
 
+#ifdef __WXOSX_COCOA__ 
+    wxPoint topLeft(width, height), bottomRight(-1, -1);
+    for ( int i = 0; i < 4; i++ )
+    {
+        topLeft.x = topLeft.x > (rcx[i] / scalex) ? (rcx[i] / scalex) : topLeft.x;
+        topLeft.y = topLeft.y > (height - rcy[i] / scaley) ? (height - rcy[i] / scaley) : topLeft.y;
+        bottomRight.x = bottomRight.x < (rcx[i] / scalex) ? (rcx[i] / scalex) : bottomRight.x;
+        bottomRight.y = bottomRight.y < (height - rcy[i] / scaley) ? (height - rcy[i] / scaley) : bottomRight.y;
+    }
+
+    m_context->Clip( wxRegion( topLeft.x, topLeft.y, bottomRight.x-topLeft.x, bottomRight.y-topLeft.y ) );
+    // m_context->Clip( wxRegion( topLeft, bottomRight) );  // this wxRegion constructor doesn't work in wxWidgets 2.9.2/Cocoa
+#else
     wxPoint cpoints[4];
     for ( int i = 0; i < 4; i++ )
     {
@@ -432,6 +445,7 @@
         cpoints[i].y = height - rcy[i] / scaley;
     }
     m_context->Clip( wxRegion( 4, cpoints ) );
+#endif
 
     // text color
     textRed   = pls->cmap0[pls->icol0].r;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.