More makefiles

[wxWidgets.git] / src / gtk / dc.cpp

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 51487282280a95a64cf9c65c90fba874d5ba2008..d98edaf9ec094c5c1affe59f1669b3dce8b42c6e 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -48,7 +48,7 @@ wxDC::wxDC()
 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;
 
     m_pen = *wxBLACK_PEN;
     m_font = *wxNORMAL_FONT;

-    m_brush = *wxTRANSPARENT_BRUSH;
+    m_brush = *wxWHITE_BRUSH;

 }
 
 void wxDC::DoSetClippingRegion( long x, long y, long width, long height )
 }
 
 void wxDC::DoSetClippingRegion( long x, long y, long width, long height )


@@ -97,25 +97,8 @@ wxSize wxDC::GetPPI() const
 
 void wxDC::ComputeScaleAndOrigin()
 {
 
 void wxDC::ComputeScaleAndOrigin()
 {

-    // CMB: copy scale to see if it changes
-    double origScaleX = m_scaleX;
-    double origScaleY = m_scaleY;
-

     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;

-
-    // CMB: if scale has changed call SetPen to recalulate the line width
-    if (m_scaleX != origScaleX || m_scaleY != origScaleY)
-    {
-      // this is a bit artificial, but we need to force wxDC to think
-      // the pen has changed
-        // It gives an Assert, Robert Roebling
-/*
-      wxPen pen = m_pen;
-      m_pen = wxNullPen;
-      SetPen( pen );
-*/
-  }

 }
 
 void wxDC::SetMapMode( int mode )
 }
 
 void wxDC::SetMapMode( int mode )


@@ -139,6 +122,8 @@ void wxDC::SetMapMode( int mode )
           SetLogicalScale( 1.0, 1.0 );
           break;
     }
           SetLogicalScale( 1.0, 1.0 );
           break;
     }

+    m_mappingMode = mode;
+    

 /*  we don't do this mega optimisation
     if (mode != wxMM_TEXT)
     {
 /*  we don't do this mega optimisation
     if (mode != wxMM_TEXT)
     {