X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfad0599246651d4994e348d868a3e65613c7379..081eb1b120c1bc9147582cff84de756b4a3a63af:/src/stubs/dc.cpp?ds=sidebyside diff --git a/src/stubs/dc.cpp b/src/stubs/dc.cpp index 484a44f6fd..a70a0f1d13 100644 --- a/src/stubs/dc.cpp +++ b/src/stubs/dc.cpp @@ -15,9 +15,7 @@ #include "wx/dc.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -#endif //----------------------------------------------------------------------------- // constants @@ -61,7 +59,7 @@ wxDC::wxDC(void) m_scaleX = 1.0; m_scaleY = 1.0; - m_mappingMode = MM_TEXT; + m_mappingMode = wxMM_TEXT; m_needComputeScaleX = FALSE; m_needComputeScaleY = FALSE; @@ -211,24 +209,24 @@ void wxDC::SetMapMode( int mode ) { switch (mode) { - case MM_TWIPS: + case wxMM_TWIPS: SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); break; - case MM_POINTS: + case wxMM_POINTS: SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); break; - case MM_METRIC: + case wxMM_METRIC: SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); break; - case MM_LOMETRIC: + case wxMM_LOMETRIC: SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); break; default: - case MM_TEXT: + case wxMM_TEXT: SetLogicalScale( 1.0, 1.0 ); break; }; - if (mode != MM_TEXT) + if (mode != wxMM_TEXT) { m_needComputeScaleX = TRUE; m_needComputeScaleY = TRUE; @@ -376,10 +374,10 @@ void wxDC::ComputeScaleAndOrigin(void) { // this is a bit artificial, but we need to force wxDC to think // the pen has changed - wxPen* pen = GetPen(); + wxPen* pen = & GetPen(); wxPen tempPen; m_pen = tempPen; - SetPen(pen); + SetPen(* pen); } };