Added chapter on collection and container classes to contents

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

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index d43a7294b4b3723803c66b25eb68f17af335abb7..da0b27c97aacfc682066728f05b7178b1f872bf7 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -14,8 +14,8 @@
 
 #include "wx/dc.h"
 
-#include "gdk/gdk.h"
-#include "gtk/gtk.h"
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 
 //-----------------------------------------------------------------------------
 // constants
@@ -38,9 +38,6 @@ wxDC::wxDC()
 {
     m_ok = FALSE;
 
-    m_optimize = FALSE;
-    m_autoSetting = FALSE;
-
     m_mm_to_pix_x = 1.0;
     m_mm_to_pix_y = 1.0;
 
@@ -51,10 +48,10 @@ wxDC::wxDC()
 
     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( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
 {
     m_clipping = TRUE;
     m_clipX1 = x;
@@ -100,25 +97,8 @@ wxSize wxDC::GetPPI() const
 
 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;
-
-    // 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 )
@@ -142,6 +122,8 @@ void wxDC::SetMapMode( int mode )
           SetLogicalScale( 1.0, 1.0 );
           break;
     }
+    m_mappingMode = mode;
+    
 /*  we don't do this mega optimisation
     if (mode != wxMM_TEXT)
     {
@@ -167,14 +149,14 @@ void wxDC::SetLogicalScale( double x, double y )
     ComputeScaleAndOrigin();
 }
 
-void wxDC::SetLogicalOrigin( long x, long y )
+void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )
 {
     m_logicalOriginX = x * m_signX;   // is this still correct ?
     m_logicalOriginY = y * m_signY;
     ComputeScaleAndOrigin();
 }
 
-void wxDC::SetDeviceOrigin( long x, long y )
+void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )
 {
     // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
     m_deviceOriginX = x;
@@ -194,43 +176,43 @@ void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
-long wxDCBase::DeviceToLogicalX(long x) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
-    return XDEV2LOG(x);
+    return ((wxDC *)this)->XDEV2LOG(x);
 }
 
-long wxDCBase::DeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
-    return YDEV2LOG(y);
+    return ((wxDC *)this)->YDEV2LOG(y);
 }
 
-long wxDCBase::DeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
-    return XDEV2LOGREL(x);
+    return ((wxDC *)this)->XDEV2LOGREL(x);
 }
 
-long wxDCBase::DeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
-    return YDEV2LOGREL(y);
+    return ((wxDC *)this)->YDEV2LOGREL(y);
 }
 
-long wxDCBase::LogicalToDeviceX(long x) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
-    return XLOG2DEV(x);
+    return ((wxDC *)this)->XLOG2DEV(x);
 }
 
-long wxDCBase::LogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
-    return YLOG2DEV(y);
+    return ((wxDC *)this)->YLOG2DEV(y);
 }
 
-long wxDCBase::LogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
-    return XLOG2DEVREL(x);
+    return ((wxDC *)this)->XLOG2DEVREL(x);
 }
 
-long wxDCBase::LogicalToDeviceYRel(long y) const
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
-    return YLOG2DEVREL(y);
+    return ((wxDC *)this)->YLOG2DEVREL(y);
 }