X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/41bf0eb335ef9941b0aa87f8d5d040cd86620755..b2fcfd94d34b25233a0bf14f3ac388ae747bccb7:/src/gtk1/dc.cpp diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp index d98edaf9ec..c74bbc81bb 100644 --- a/src/gtk1/dc.cpp +++ b/src/gtk1/dc.cpp @@ -3,19 +3,22 @@ // Purpose: // Author: Robert Roebling // RCS-ID: $Id$ -// Copyright: (c) 1998 Robert Roebling, Markus Holzem +// Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "dc.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + #include "wx/dc.h" -#include "gdk/gdk.h" -#include "gtk/gtk.h" +#include +#include //----------------------------------------------------------------------------- // constants @@ -38,8 +41,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 */ @@ -51,7 +56,7 @@ wxDC::wxDC() 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; @@ -60,28 +65,17 @@ void wxDC::DoSetClippingRegion( long x, long y, long width, long height ) m_clipY2 = y + height; } -void wxDC::DestroyClippingRegion() -{ - m_clipping = FALSE; -} - // --------------------------------------------------------------------------- // 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 @@ -149,14 +143,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; @@ -176,42 +170,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); }