moved Clear() outside of if (textured)...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5944 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index 84c88b3dc395b1aba521af9da23671c9dd912216..66a672bcf33aaca69ed3c338bf866fc8ccaf99d2 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -819,14 +819,15 @@ void MyCanvas::OnPaint(wxPaintEvent &WXUNUSED(event))
         dc.SetTextBackground( m_owner->m_colourBackground );
 
     if ( m_owner->m_textureBackground) {
         dc.SetTextBackground( m_owner->m_colourBackground );
 
     if ( m_owner->m_textureBackground) {

-        if ( m_owner->m_backgroundBrush.Ok() )
-            dc.SetBackground( m_owner->m_backgroundBrush );
-        else {
+        if ( ! m_owner->m_backgroundBrush.Ok() ) {

             wxBrush b(wxColour(0,128,0), wxSOLID);
             dc.SetBackground(b);
         }
             wxBrush b(wxColour(0,128,0), wxSOLID);
             dc.SetBackground(b);
         }

-        dc.Clear();
+    }
+
+    dc.Clear();

 
 

+    if ( m_owner->m_textureBackground) {

         dc.SetPen(*wxMEDIUM_GREY_PEN);
         for (int i=0; i<200; i++)
             dc.DrawLine(0, i*10, i*10, 0);
         dc.SetPen(*wxMEDIUM_GREY_PEN);
         for (int i=0; i<200; i++)
             dc.DrawLine(0, i*10, i*10, 0);