X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b985763280ef50a537c28ce6e811c9186859453d..d9ff0f91fbddae88286567cab74dcfb59c91fc0f:/src/gtk/dc.cpp?ds=sidebyside

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index ad4b1373f6..46ea5626c4 100644
--- 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,8 +38,10 @@ wxDC::wxDC()
 {
     m_ok = FALSE;
 
-    m_mm_to_pix_x = 1.0;
-    m_mm_to_pix_y = 1.0;
+    m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() /
+                    (double)wxGetDisplaySizeMM().GetWidth();
+    m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
+                    (double)wxGetDisplaySizeMM().GetHeight();
 
     m_needComputeScaleX = FALSE; /* not used yet */
     m_needComputeScaleY = FALSE; /* not used yet */
@@ -48,10 +50,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;
@@ -69,19 +71,13 @@ void wxDC::DestroyClippingRegion()
 // get DC capabilities
 // ---------------------------------------------------------------------------
 
-void wxDC::DoGetSize( int* width, int* height ) const
-{
-    if (width) *width = m_maxX-m_minX;
-    if (height) *height = m_maxY-m_minY;
-}
-
 void wxDC::DoGetSizeMM( int* width, int* height ) const
 {
     int w = 0;
     int h = 0;
     GetSize( &w, &h );
-    if (width) *width = int( double(w) / (m_scaleX*m_mm_to_pix_x) );
-    if (height) *height = int( double(h) / (m_scaleY*m_mm_to_pix_y) );
+    if (width) *width = int( double(w) / (m_userScaleX*m_mm_to_pix_x) );
+    if (height) *height = int( double(h) / (m_userScaleY*m_mm_to_pix_y) );
 }
 
 // Resolution in pixels per logical inch
@@ -97,22 +93,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 */
-      wxPen pen = m_pen;
-      m_pen = wxNullPen;
-      SetPen( pen );
-  }
 }
 
 void wxDC::SetMapMode( int mode )
@@ -163,14 +145,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;
@@ -190,42 +172,42 @@ void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 // coordinates transformations
 // ---------------------------------------------------------------------------
 
-long wxDCBase::DeviceToLogicalX(long x) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
 {
     return ((wxDC *)this)->XDEV2LOG(x);
 }
 
-long wxDCBase::DeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
 {
     return ((wxDC *)this)->YDEV2LOG(y);
 }
 
-long wxDCBase::DeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
 {
     return ((wxDC *)this)->XDEV2LOGREL(x);
 }
 
-long wxDCBase::DeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
 {
     return ((wxDC *)this)->YDEV2LOGREL(y);
 }
 
-long wxDCBase::LogicalToDeviceX(long x) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
 {
     return ((wxDC *)this)->XLOG2DEV(x);
 }
 
-long wxDCBase::LogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
 {
     return ((wxDC *)this)->YLOG2DEV(y);
 }
 
-long wxDCBase::LogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
 {
     return ((wxDC *)this)->XLOG2DEVREL(x);
 }
 
-long wxDCBase::LogicalToDeviceYRel(long y) const
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
 {
     return ((wxDC *)this)->YLOG2DEVREL(y);
 }