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

[<ai...@us...>]

Revision: 12194
          http://plplot.svn.sourceforge.net/plplot/?rev=12194&view=rev
Author:   airwin
Date:     2012-05-08 01:37:27 +0000 (Tue, 08 May 2012)
Log Message:
-----------
AWI for Phil Rosenberg.  Fix a small bug whereby the styles (italic,
bold etc) and weights weren't being applied correctly by wxWidgets in
the _gc and _dc files. An & was used instead of a | when combining
style and weight flags.

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

Modified: trunk/drivers/wxwidgets_dc.cpp
===================================================================
--- trunk/drivers/wxwidgets_dc.cpp	2012-05-01 17:27:14 UTC (rev 12193)
+++ trunk/drivers/wxwidgets_dc.cpp	2012-05-08 01:37:27 UTC (rev 12194)
@@ -368,7 +368,7 @@
 
     m_font = wxFont::New( (int) ( fontSize * fontScale < 4 ? 4 : fontSize * fontScale ),
         fontFamilyLookup[fontFamily],
-        fontStyleLookup[fontStyle] & fontWeightLookup[fontWeight] );
+        fontStyleLookup[fontStyle] | fontWeightLookup[fontWeight] );
     m_font->SetUnderlined( underlined );
     m_dc->SetFont( *m_font );
 }

Modified: trunk/drivers/wxwidgets_gc.cpp
===================================================================
--- trunk/drivers/wxwidgets_gc.cpp	2012-05-01 17:27:14 UTC (rev 12193)
+++ trunk/drivers/wxwidgets_gc.cpp	2012-05-08 01:37:27 UTC (rev 12194)
@@ -398,7 +398,7 @@
         delete m_font;
     m_font = wxFont::New( static_cast<int>( fontSize * fontScale ),
         fontFamilyLookup[fontFamily],
-        fontStyleLookup[fontStyle] & fontWeightLookup[fontWeight] );
+        fontStyleLookup[fontStyle] | fontWeightLookup[fontWeight] );
     m_font->SetUnderlined( underlined );
     m_context->SetFont( *m_font, wxColour( textRed, textGreen, textBlue ) );
 }

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