[Plplot-cvs] SF.net SVN: plplot:[9608] trunk/drivers

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

Revision: 9608
          http://plplot.svn.sourceforge.net/plplot/?rev=9608&view=rev
Author:   smekal
Date:     2009-02-25 12:47:51 +0000 (Wed, 25 Feb 2009)

Log Message:
-----------
The user can determine now which backend the wxWidgets driver actually uses.

Modified Paths:
--------------
    trunk/drivers/wxwidgets.cpp
    trunk/drivers/wxwidgets.h
    trunk/drivers/wxwidgets_agg.cpp
    trunk/drivers/wxwidgets_dc.cpp
    trunk/drivers/wxwidgets_gc.cpp

Modified: trunk/drivers/wxwidgets.cpp
===================================================================
--- trunk/drivers/wxwidgets.cpp	2009-02-25 12:46:00 UTC (rev 9607)
+++ trunk/drivers/wxwidgets.cpp	2009-02-25 12:47:51 UTC (rev 9608)
@@ -115,7 +115,7 @@
  *
  *  Contructor of base class of wxPLDev classes.
  *--------------------------------------------------------------------------*/
-wxPLDevBase::wxPLDevBase( void )
+wxPLDevBase::wxPLDevBase( int bcknd ) : backend(bcknd)
 {
   // Log_Verbose( "wxPLDevBase::wxPLDevBase()" );
 
@@ -854,6 +854,10 @@
       GetCursorCmd( pls, (PLGraphicsIn *) ptr );
 	  break;
 
+  case PLESC_GETBACKEND:
+    *((int*)ptr) = dev->backend;
+	  break;
+
   default:
     break;
   }

Modified: trunk/drivers/wxwidgets.h
===================================================================
--- trunk/drivers/wxwidgets.h	2009-02-25 12:46:00 UTC (rev 9607)
+++ trunk/drivers/wxwidgets.h	2009-02-25 12:47:51 UTC (rev 9608)
@@ -89,7 +89,7 @@
 class wxPLDevBase
 {
 public: /* methods */
-	wxPLDevBase( void );
+	wxPLDevBase( int bcknd );
 	virtual ~wxPLDevBase( void );
 
   // virtual functions which need to implemented
@@ -115,13 +115,13 @@
   virtual void PSSetFont( PLUNICODE fci )=0;
 
 public: /* variables */
+  const int backend;
   bool ready;
   bool ownGUI;
   bool showGUI;
   bool waiting;
   bool resizing;
   bool exit;
-  int backend;
   int comcount;
   
   wxPLplotFrame* m_frame;

Modified: trunk/drivers/wxwidgets_agg.cpp
===================================================================
--- trunk/drivers/wxwidgets_agg.cpp	2009-02-25 12:46:00 UTC (rev 9607)
+++ trunk/drivers/wxwidgets_agg.cpp	2009-02-25 12:47:51 UTC (rev 9608)
@@ -65,7 +65,7 @@
  *  class. Initialisations of variables and objects are done.
  *--------------------------------------------------------------------------*/
 wxPLDevAGG::wxPLDevAGG() :
-		wxPLDevBase(),
+		wxPLDevBase(wxBACKEND_AGG),
     mRenderingBuffer(),
     mPixFormat( mRenderingBuffer ),
     mRendererBase( mPixFormat ),
@@ -93,8 +93,6 @@
     mColorGreenFill( 0 ),
     mColorBlueFill( 0 )
 {
-  backend=wxBACKEND_AGG;
-	
   mCurves.approximation_scale( 2.0 );
   mContour.auto_detect_orientation( false );
   mConvStroke.line_join( agg::round_join );

Modified: trunk/drivers/wxwidgets_dc.cpp
===================================================================
--- trunk/drivers/wxwidgets_dc.cpp	2009-02-25 12:46:00 UTC (rev 9607)
+++ trunk/drivers/wxwidgets_dc.cpp	2009-02-25 12:47:51 UTC (rev 9608)
@@ -45,9 +45,8 @@
  *  Constructor of the standard wxWidgets device based on the wxPLDevBase
  *  class. Only some initialisations are done.
  *--------------------------------------------------------------------------*/
-wxPLDevDC::wxPLDevDC( void ) : wxPLDevBase()
+wxPLDevDC::wxPLDevDC( void ) : wxPLDevBase(wxBACKEND_DC)
 {
-  backend=wxBACKEND_DC;
   m_dc=NULL;
   m_bitmap=NULL;
   m_font=NULL;

Modified: trunk/drivers/wxwidgets_gc.cpp
===================================================================
--- trunk/drivers/wxwidgets_gc.cpp	2009-02-25 12:46:00 UTC (rev 9607)
+++ trunk/drivers/wxwidgets_gc.cpp	2009-02-25 12:47:51 UTC (rev 9608)
@@ -39,11 +39,10 @@
 /* only compile code if wxGraphicsContext available */
 #if wxUSE_GRAPHICS_CONTEXT
   
-wxPLDevGC::wxPLDevGC( void ) : wxPLDevBase()
+wxPLDevGC::wxPLDevGC( void ) : wxPLDevBase(wxBACKEND_GC)
 {
   // Log_Verbose( "%s", __FUNCTION__ );
 
-  backend=wxBACKEND_GC;
   m_dc=NULL;
   m_bitmap=NULL;
   m_context=NULL;


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