Fixed a notebook crash and added more tests to sample.

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

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index d43a7294b4b3723803c66b25eb68f17af335abb7..ad4b1373f688dba645589540a716db0aba96b806 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -38,9 +38,6 @@ wxDC::wxDC()
 {
     m_ok = FALSE;
 
 {
     m_ok = FALSE;
 

-    m_optimize = FALSE;
-    m_autoSetting = FALSE;
-

     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;
 
     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;
 


@@ -100,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 );

-*/

   }
 }
 
   }
 }
 


@@ -142,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)
     {


@@ -196,41 +192,41 @@ void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 
 long wxDCBase::DeviceToLogicalX(long x) const
 {
 
 long wxDCBase::DeviceToLogicalX(long x) const
 {

-    return XDEV2LOG(x);
+    return ((wxDC *)this)->XDEV2LOG(x);

 }
 
 long wxDCBase::DeviceToLogicalY(long y) const
 {
 }
 
 long wxDCBase::DeviceToLogicalY(long y) const
 {

-    return YDEV2LOG(y);
+    return ((wxDC *)this)->YDEV2LOG(y);

 }
 
 long wxDCBase::DeviceToLogicalXRel(long x) const
 {
 }
 
 long wxDCBase::DeviceToLogicalXRel(long x) const
 {

-    return XDEV2LOGREL(x);
+    return ((wxDC *)this)->XDEV2LOGREL(x);

 }
 
 long wxDCBase::DeviceToLogicalYRel(long y) const
 {
 }
 
 long wxDCBase::DeviceToLogicalYRel(long y) const
 {

-    return YDEV2LOGREL(y);
+    return ((wxDC *)this)->YDEV2LOGREL(y);

 }
 
 long wxDCBase::LogicalToDeviceX(long x) const
 {
 }
 
 long wxDCBase::LogicalToDeviceX(long x) const
 {

-    return XLOG2DEV(x);
+    return ((wxDC *)this)->XLOG2DEV(x);

 }
 
 long wxDCBase::LogicalToDeviceY(long y) const
 {
 }
 
 long wxDCBase::LogicalToDeviceY(long y) const
 {

-    return YLOG2DEV(y);
+    return ((wxDC *)this)->YLOG2DEV(y);

 }
 
 long wxDCBase::LogicalToDeviceXRel(long x) const
 {
 }
 
 long wxDCBase::LogicalToDeviceXRel(long x) const
 {

-    return XLOG2DEVREL(x);
+    return ((wxDC *)this)->XLOG2DEVREL(x);

 }
 
 long wxDCBase::LogicalToDeviceYRel(long y) const
 {
 }
 
 long wxDCBase::LogicalToDeviceYRel(long y) const
 {

-    return YLOG2DEVREL(y);
+    return ((wxDC *)this)->YLOG2DEVREL(y);

 }
 
 }