For whatever reason, font-size 9 is now hardly readable on Mac. Using default font...

[wxWidgets.git] / samples / drawing / drawing.cpp

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index c6e15ec257f5d33e40bd2cbe61bbd9b740498fc8..31918e3f082e05c0a0e5bbc02131b4a0bfbf14dd 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -34,12 +34,13 @@
 #include "wx/image.h"
 #include "wx/artprov.h"
 
-#define wxTEST_GRAPHICS 0
+#define wxTEST_GRAPHICS 1
 
 #if wxTEST_GRAPHICS
 #include "wx/graphics.h"
 #if wxUSE_GRAPHICS_CONTEXT == 0
-#error wxUSE_GRAPHICS_CONTEXT must be defined to 1 for testing
+#undef wxTEST_GRAPHICS
+#define wxTEST_GRAPHICS 0
 #endif
 #else
 #undef wxUSE_GRAPHICS_CONTEXT
@@ -894,8 +895,17 @@ void MyCanvas::DrawWithLogicalOps(wxDC& dc)
 }
 
 #if wxUSE_GRAPHICS_CONTEXT
+#ifdef __WXGTK20__
+void MyCanvas::DrawAlpha(wxDC& no_dc)
+#else
 void MyCanvas::DrawAlpha(wxDC& dc)
+#endif
 {
+#ifdef __WXGTK__
+    wxGCDC dc( this );
+    PrepareDC( dc );
+#endif
+
     wxDouble margin = 20 ;
     wxDouble width = 180 ;
     wxDouble radius = 30 ;
@@ -924,6 +934,10 @@ void MyCanvas::DrawAlpha(wxDC& dc)
     dc.SetPen( *wxTRANSPARENT_PEN ) ;
     dc.SetBrush( wxBrush( wxColour(255,255,128,128) ) );
     dc.DrawRoundedRectangle( 0 , margin + width / 2 , width * 3 , 100 , radius) ;
+    
+    dc.SetTextForeground( wxColour(255,255,0,128) );
+    dc.SetFont( wxFont( 40, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_NORMAL ) );
+    dc.DrawText( wxT("Hello!"), 120, 80 );
 }
 
 #endif