Minor DC correction.

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

diff --git a/samples/drawing/drawing.cpp b/samples/drawing/drawing.cpp
index b0d1b3d91ac77814d3036d138a8d4dfe74f9153d..d03f254d8ee7825f1e35e1341ae2b233ce3bc8be 100644 (file)
--- a/samples/drawing/drawing.cpp
+++ b/samples/drawing/drawing.cpp
@@ -269,7 +269,7 @@ void MyFrame::OnOption(wxCommandEvent &event)
     switch (event.GetInt())
     {
         case MapMode_Text:
     switch (event.GetInt())
     {
         case MapMode_Text:

-            m_mapMode = wxMM_LOMETRIC;
+            m_mapMode = wxMM_TEXT;

            break;
         case MapMode_Lometric:
             m_mapMode = wxMM_LOMETRIC;
            break;
         case MapMode_Lometric:
             m_mapMode = wxMM_LOMETRIC;

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 51487282280a95a64cf9c65c90fba874d5ba2008..ad4b1373f688dba645589540a716db0aba96b806 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -97,24 +97,21 @@ wxSize wxDC::GetPPI() const
 
 void wxDC::ComputeScaleAndOrigin()
 {
 
 void wxDC::ComputeScaleAndOrigin()
 {

-    // CMB: copy scale to see if it changes
+    /* 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;
 
     double origScaleX = m_scaleX;
     double origScaleY = m_scaleY;
 
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 

-    // CMB: if scale has changed call SetPen to recalulate the line width
+    /* CMB: if scale has changed call SetPen to recalulate the line width */

     if (m_scaleX != origScaleX || m_scaleY != origScaleY)
     {
     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
-/*
+      /* this is a bit artificial, but we need to force wxDC to think
+         the pen has changed */

       wxPen pen = m_pen;
       m_pen = wxNullPen;
       SetPen( pen );
       wxPen pen = m_pen;
       m_pen = wxNullPen;
       SetPen( pen );

-*/

   }
 }
 
   }
 }
 


@@ -139,6 +136,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)
     {

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 51487282280a95a64cf9c65c90fba874d5ba2008..ad4b1373f688dba645589540a716db0aba96b806 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -97,24 +97,21 @@ wxSize wxDC::GetPPI() const
 
 void wxDC::ComputeScaleAndOrigin()
 {
 
 void wxDC::ComputeScaleAndOrigin()
 {

-    // CMB: copy scale to see if it changes
+    /* 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;
 
     double origScaleX = m_scaleX;
     double origScaleY = m_scaleY;
 
     m_scaleX = m_logicalScaleX * m_userScaleX;
     m_scaleY = m_logicalScaleY * m_userScaleY;
 

-    // CMB: if scale has changed call SetPen to recalulate the line width
+    /* CMB: if scale has changed call SetPen to recalulate the line width */

     if (m_scaleX != origScaleX || m_scaleY != origScaleY)
     {
     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
-/*
+      /* this is a bit artificial, but we need to force wxDC to think
+         the pen has changed */

       wxPen pen = m_pen;
       m_pen = wxNullPen;
       SetPen( pen );
       wxPen pen = m_pen;
       m_pen = wxNullPen;
       SetPen( pen );

-*/

   }
 }
 
   }
 }
 


@@ -139,6 +136,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)
     {