X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc797f4cc8ffe36277ba8b7dd4b57e63a96bfcb5..12bc5f9ad2c8be40081dbe69d0c0042fb30cbfa5:/src/x11/dc.cpp?ds=sidebyside diff --git a/src/x11/dc.cpp b/src/x11/dc.cpp index c66c5f4797..f36c6febaf 100644 --- a/src/x11/dc.cpp +++ b/src/x11/dc.cpp @@ -9,27 +9,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ - #pragma implementation "dc.h" -#endif - #include "wx/dc.h" #include "wx/dcmemory.h" #include "wx/defs.h" IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -#define mm2inches 0.0393700787402 -#define inches2mm 25.4 -#define mm2twips 56.6929133859 -#define twips2mm 0.0176388888889 -#define mm2pt 2.83464566929 -#define pt2mm 0.352777777778 - //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- @@ -38,44 +23,28 @@ wxDC::wxDC() { m_ok = FALSE; +#if 1 m_mm_to_pix_x = 1.0; m_mm_to_pix_y = 1.0; +#else + m_mm_to_pix_x = (double)wxGetDisplaySize().GetWidth() / + (double)wxGetDisplaySizeMM().GetWidth(); + m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() / + (double)wxGetDisplaySizeMM().GetHeight(); +#endif - m_backgroundMode = wxTRANSPARENT; - - m_isInteractive = FALSE; -} - -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); -} - -void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask ) -{ - wxCHECK_RET( bitmap.Ok(), "invalid bitmap" ); + m_needComputeScaleX = FALSE; /* not used yet */ + m_needComputeScaleY = FALSE; /* not used yet */ - wxMemoryDC memDC; - memDC.SelectObject(bitmap); + m_logicalFunction = wxCOPY; -#if 0 - // Not sure if we need this. The mask should leave the masked areas as per - // the original background of this DC. - if (useMask) - { - // There might be transparent areas, so make these the same colour as this - // DC - memDC.SetBackground(* GetBackground()); - memDC.Clear(); - } -#endif // 0 + m_pen = *wxBLACK_PEN; + m_font = *wxNORMAL_FONT; + m_brush = *wxWHITE_BRUSH; - Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), &memDC, 0, 0, wxCOPY, useMask); + m_backgroundMode = wxTRANSPARENT; - memDC.SelectObject(wxNullBitmap); + m_isInteractive = FALSE; // ??? } void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) @@ -87,19 +56,6 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei m_clipY2 = y + height; } -void wxDC::DestroyClippingRegion() -{ - m_clipping = FALSE; -} - -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, h;