X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1248b41f9f71110347659db8c54c75786eba23c6..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/motif/dc.cpp?ds=sidebyside diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp index 32ce97426a..884ac2e7e6 100644 --- a/src/motif/dc.cpp +++ b/src/motif/dc.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp +// Name: src/motif/dc.cpp // Purpose: wxDC class // Author: Julian Smart // Modified by: @@ -9,29 +9,16 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#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 "wx/dcmemory.h" -#include "wx/defs.h" - - IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- +#ifndef WX_PRECOMP + #include "wx/dcmemory.h" +#endif -#define mm2inches 0.0393700787402 -#define inches2mm 25.4 -#define mm2twips 56.6929133859 -#define twips2mm 0.0176388888889 -#define mm2pt 2.83464566929 -#define pt2mm 0.352777777778 +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) //----------------------------------------------------------------------------- // wxDC @@ -39,14 +26,14 @@ wxDC::wxDC() { - m_ok = FALSE; + m_ok = false; m_mm_to_pix_x = 1.0; m_mm_to_pix_y = 1.0; m_backgroundMode = wxTRANSPARENT; - m_isInteractive = FALSE; + m_isInteractive = false; } void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y) @@ -54,7 +41,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y) wxCHECK_RET( Ok(), "invalid dc" ); wxCHECK_RET( icon.Ok(), "invalid icon" ); - DoDrawBitmap(icon, x, y, TRUE); + DoDrawBitmap(icon, x, y, true); } void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask ) @@ -83,18 +70,13 @@ void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useM void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - m_clipping = TRUE; + m_clipping = true; m_clipX1 = x; m_clipY1 = y; m_clipX2 = x + width; m_clipY2 = y + height; } -void wxDC::DestroyClippingRegion() -{ - m_clipping = FALSE; -} - void wxDC::DoGetSize( int* width, int* height ) const { if ( width ) @@ -144,8 +126,8 @@ void wxDC::SetMapMode( int mode ) } if (mode != wxMM_TEXT) { - m_needComputeScaleX = TRUE; - m_needComputeScaleY = TRUE; + m_needComputeScaleX = true; + m_needComputeScaleY = true; } } @@ -232,4 +214,3 @@ void wxDC::ComputeScaleAndOrigin() m_scaleX = m_logicalScaleX * m_userScaleX; m_scaleY = m_logicalScaleY * m_userScaleY; } -