Fix horizontal mouse wheel scrolling in wxGTK.

[wxWidgets.git] / samples / image / canvas.cpp

diff --git a/samples/image/canvas.cpp b/samples/image/canvas.cpp
index cdba69aa43a32895136b1512441ee2c91a538911..cf8433caafc443170acae087693373f4eb3286bc 100644 (file)
--- a/samples/image/canvas.cpp
+++ b/samples/image/canvas.cpp
@@ -4,7 +4,6 @@
 // Author:      Robert Roebling
 // Modified by: Francesco Montorsi
 // Created:     1998
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998-2005 Robert Roebling
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -63,7 +62,7 @@ MyCanvas::MyCanvas( wxWindow *parent, wxWindowID id,
 
     wxMemoryDC dc;
     dc.SelectObject( bitmap );
-    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
+    dc.SetBrush( wxBrush( wxS("orange") ) );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 0, 0, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );
@@ -407,7 +406,7 @@ void MyCanvas::OnPaint( wxPaintEvent &WXUNUSED(event) )
         dc.DrawBitmap( my_square, 30, 30 );
 
     dc.DrawText( wxT("Drawn directly"), 150, 10 );
-    dc.SetBrush( wxBrush( wxT("orange"), wxSOLID ) );
+    dc.SetBrush( wxBrush( wxS("orange") ) );
     dc.SetPen( *wxBLACK_PEN );
     dc.DrawRectangle( 150, 30, 100, 100 );
     dc.SetBrush( *wxWHITE_BRUSH );