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

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

Revision: 8714
          http://plplot.svn.sourceforge.net/plplot/?rev=8714&view=rev
Author:   smekal
Date:     2008-08-26 13:41:03 +0000 (Tue, 26 Aug 2008)

Log Message:
-----------
Some methods are only available if freetype library is present to prevent compiler errors.

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

Modified: trunk/drivers/wxwidgets.h
===================================================================
--- trunk/drivers/wxwidgets.h	2008-08-26 09:02:42 UTC (rev 8713)
+++ trunk/drivers/wxwidgets.h	2008-08-26 13:41:03 UTC (rev 8714)
@@ -103,9 +103,11 @@
   virtual void SetColor0( PLStream *pls )=0;
   virtual void SetColor1( PLStream *pls )=0;
   virtual void SetExternalBuffer( void* buffer )=0;
+#ifdef HAVE_FREETYPE
   virtual void PutPixel( short x, short y, PLINT color )=0;
   virtual void PutPixel( short x, short y )=0;
   virtual PLINT GetPixel( short x, short y )=0;
+#endif // HAVE_FREETYPE
   virtual void ProcessString( PLStream* pls, EscText* args )=0;
   virtual void PSDrawText( PLUNICODE* ucs4, int ucs4Len, bool drawText );
   virtual void PSDrawTextToDC( char* utf8_string, bool drawText )=0;
@@ -186,9 +188,11 @@
   void SetColor0( PLStream *pls );
   void SetColor1( PLStream *pls );
   void SetExternalBuffer( void* buffer );
+#ifdef HAVE_FREETYPE
   void PutPixel( short x, short y, PLINT color );
   void PutPixel( short x, short y );
   PLINT GetPixel( short x, short y );
+#endif // HAVE_FREETYPE
   void ProcessString( PLStream* pls, EscText* args );
   void PSDrawTextToDC( char* utf8_string, bool drawText );
   void PSSetFont( PLUNICODE fci );
@@ -238,9 +242,11 @@
   void SetColor0( PLStream *pls );
   void SetColor1( PLStream *pls );
   void SetExternalBuffer( void* buffer );
+#ifdef HAVE_FREETYPE
   void PutPixel( short x, short y, PLINT color );
   void PutPixel( short x, short y );
   PLINT GetPixel( short x, short y );
+#endif // HAVE_FREETYPE
   void ProcessString( PLStream* pls, EscText* args );
   void PSDrawTextToDC( char* utf8_string, bool drawText );
   void PSSetFont( PLUNICODE fci );
@@ -283,9 +289,11 @@
   void SetColor0( PLStream *pls );
   void SetColor1( PLStream *pls );
   void SetExternalBuffer( void* buffer );
+#ifdef HAVE_FREETYPE
   void PutPixel( short x, short y, PLINT color );
   void PutPixel( short x, short y );
   PLINT GetPixel( short x, short y );
+#endif // HAVE_FREETYPE
   void ProcessString( PLStream* pls, EscText* args );
   void PSDrawTextToDC( char* utf8_string, bool drawText );
   void PSSetFont( PLUNICODE fci );

Modified: trunk/drivers/wxwidgets_agg.cpp
===================================================================
--- trunk/drivers/wxwidgets_agg.cpp	2008-08-26 09:02:42 UTC (rev 8713)
+++ trunk/drivers/wxwidgets_agg.cpp	2008-08-26 13:41:03 UTC (rev 8714)
@@ -230,6 +230,9 @@
   ownGUI = false;
 }
 
+
+#ifdef HAVE_FREETYPE
+
 void wxPLDevAGG::PutPixel( short x, short y, PLINT color )
 {
   m_buffer->SetRGB( x, y, GetRValue(color), GetGValue(color), GetBValue(color) );   
@@ -245,6 +248,9 @@
   return RGB( m_buffer->GetRed( x, y ), m_buffer->GetGreen( x, y ), m_buffer->GetBlue( x, y ) );    
 }
 
+#endif // HAVE_FREETYPE
+
+
 void wxPLDevAGG::PSDrawTextToDC( char* utf8_string, bool drawText )
 {
   memset( utf8_string, '\0', max_string_length );

Modified: trunk/drivers/wxwidgets_dc.cpp
===================================================================
--- trunk/drivers/wxwidgets_dc.cpp	2008-08-26 09:02:42 UTC (rev 8713)
+++ trunk/drivers/wxwidgets_dc.cpp	2008-08-26 13:41:03 UTC (rev 8714)
@@ -212,6 +212,8 @@
 }
 
 
+#ifdef HAVE_FREETYPE
+
 void wxPLDevDC::PutPixel( short x, short y, PLINT color )
 {
   const wxPen oldpen=m_dc->GetPen();
@@ -245,7 +247,9 @@
 #endif
 }
 
+#endif // HAVE_FREETYPE
 
+
 void wxPLDevDC::PSDrawTextToDC( char* utf8_string, bool drawText )
 {
   wxCoord w, h, d, l;

Modified: trunk/drivers/wxwidgets_gc.cpp
===================================================================
--- trunk/drivers/wxwidgets_gc.cpp	2008-08-26 09:02:42 UTC (rev 8713)
+++ trunk/drivers/wxwidgets_gc.cpp	2008-08-26 13:41:03 UTC (rev 8714)
@@ -240,6 +240,8 @@
 }
 
 
+#ifdef HAVE_FREETYPE
+
 void wxPLDevGC::PutPixel( short x, short y, PLINT color )
 {
   // Log_Verbose( "%s", __FUNCTION__ );
@@ -277,6 +279,9 @@
 #endif
 }
 
+#endif // HAVE_FREETYPE
+
+
 void wxPLDevGC::PSDrawTextToDC( char* utf8_string, bool drawText )
 {
   // Log_Verbose( "%s", __FUNCTION__ );


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