Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

[wxWidgets.git] / src / mgl / dc.cpp

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index c10d8b692b667026c7cd7dd15ae00b36cbc93335..40766b5af5103eb4de450a16b98ddee12d29be79 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -205,7 +205,7 @@ void wxDC::InitializeMGLDC()
 
 void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
 {
 
 void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxRect rect(XLOG2DEV(cx), YLOG2DEV(cy), XLOG2DEVREL(cw), YLOG2DEVREL(ch));
 
 
     wxRect rect(XLOG2DEV(cx), YLOG2DEV(cy), XLOG2DEVREL(cw), YLOG2DEVREL(ch));
 


@@ -220,9 +220,9 @@ void wxDC::DoSetClippingRegion(wxCoord cx, wxCoord cy, wxCoord cw, wxCoord ch)
     DO_SET_CLIPPING_BOX(m_currentClippingRegion)
 }
 
     DO_SET_CLIPPING_BOX(m_currentClippingRegion)
 }
 

-void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
+void wxDC::DoSetDeviceClippingRegion(const wxRegion& region)

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( region.IsEmpty() )
     {
 
     if ( region.IsEmpty() )
     {


@@ -262,7 +262,7 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
 
 void wxDC::DestroyClippingRegion()
 {
 
 void wxDC::DestroyClippingRegion()
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( !m_globalClippingRegion.IsNull() )
     {
 
     if ( !m_globalClippingRegion.IsNull() )
     {


@@ -303,7 +303,7 @@ int wxDC::GetDepth() const
 
 void wxDC::Clear()
 {
 
 void wxDC::Clear()
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     m_MGLDC->makeCurrent(); // will go away with MGL6.0
     if ( m_backgroundBrush.GetStyle() != wxTRANSPARENT )
 
     m_MGLDC->makeCurrent(); // will go away with MGL6.0
     if ( m_backgroundBrush.GetStyle() != wxTRANSPARENT )


@@ -319,17 +319,17 @@ void wxDC::Clear()
 }
 
 extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
 }
 
 extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,

-                          const wxColour & col, int style);
+                          const wxColour & col, wxFloodFillStyle style);

 
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
 
 bool wxDC::DoFloodFill(wxCoord x, wxCoord y,

-                       const wxColour& col, int style)
+                       const wxColour& col, wxFloodFillStyle style)

 {
     return wxDoFloodFill(this, x, y, col, style);
 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {
 {
     return wxDoFloodFill(this, x, y, col, style);
 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 {

-    wxCHECK_MSG( col, false, _T("NULL colour parameter in wxDC::GetPixel"));
+    wxCHECK_MSG( col, false, wxT("NULL colour parameter in wxDC::GetPixel"));

 
     uchar r, g, b;
     m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), YLOG2DEV(y)),
 
     uchar r, g, b;
     m_MGLDC->unpackColorFast(m_MGLDC->getPixel(XLOG2DEV(x), YLOG2DEV(y)),


@@ -340,7 +340,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {
 
 void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {
 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {


@@ -361,7 +361,7 @@ void wxDC::DoCrossHair(wxCoord x, wxCoord y)
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 
 void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {
 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {


@@ -381,7 +381,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {
                      wxCoord x2, wxCoord y2,
                      wxCoord xc, wxCoord yc)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxCoord xx1 = XLOG2DEV(x1);
     wxCoord yy1 = YLOG2DEV(y1);
 
     wxCoord xx1 = XLOG2DEV(x1);
     wxCoord yy1 = YLOG2DEV(y1);


@@ -440,7 +440,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1,
 
 void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {
 
 void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {
 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {


@@ -452,9 +452,9 @@ void wxDC::DoDrawPoint(wxCoord x, wxCoord y)
     }
 }
 
     }
 }
 

-void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,int WXUNUSED(fillStyle))
+void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset,wxPolygonFillMode WXUNUSED(fillStyle))

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxCoord xxoffset = XLOG2DEVREL(xoffset),
             yyoffset = YLOG2DEVREL(yoffset);
 
     wxCoord xxoffset = XLOG2DEVREL(xoffset),
             yyoffset = YLOG2DEVREL(yoffset);


@@ -495,7 +495,7 @@ void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffs
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
 
 void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {
 
     if ( m_pen.GetStyle() != wxTRANSPARENT )
     {


@@ -516,7 +516,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);
 
     wxCoord xx = XLOG2DEV(x);
     wxCoord yy = YLOG2DEV(y);


@@ -559,7 +559,7 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {
 
 void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     if ( radius < 0.0 )
         radius = -radius * ((width < height) ? width : height);
 
     if ( radius < 0.0 )
         radius = -radius * ((width < height) ? width : height);


@@ -635,7 +635,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord h
 
 void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {
 
 void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxCoord x2 = (x+width);
     wxCoord y2 = (y+height);
 
     wxCoord x2 = (x+width);
     wxCoord y2 = (y+height);


@@ -664,7 +664,7 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
 
 void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {
 
 void wxDC::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoord h,double sa,double ea)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxCoord x2 = (x+w);
     wxCoord y2 = (y+h);
 
     wxCoord x2 = (x+w);
     wxCoord y2 = (y+h);


@@ -736,7 +736,7 @@ bool wxDC::SelectMGLFont()
 
 void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
 {
 
 void wxDC::DrawAnyText(const wxString& text, wxCoord x, wxCoord y)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     SelectMGLFont();
 
 
     SelectMGLFont();
 


@@ -983,7 +983,7 @@ void wxDC::SelectMGLFatPen(int style, int flag)
                                                         pixPattern->p[x][y][2]);
                     break;
                 default:
                                                         pixPattern->p[x][y][2]);
                     break;
                 default:

-                    wxFAIL_MSG(_T("invalid DC depth"));
+                    wxFAIL_MSG(wxT("invalid DC depth"));

                     break;
             }
             m_MGLDC->setPenPixmapPattern(slot, &pix);
                     break;
             }
             m_MGLDC->setPenPixmapPattern(slot, &pix);


@@ -999,7 +999,7 @@ void wxDC::SelectMGLFatPen(int style, int flag)
 
 void wxDC::SelectPen()
 {
 
 void wxDC::SelectPen()
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxColour& clr = m_pen.GetColour();
     m_MGLDC->makeCurrent(); // will go away with MGL6.0
 
     wxColour& clr = m_pen.GetColour();
     m_MGLDC->makeCurrent(); // will go away with MGL6.0


@@ -1045,7 +1045,7 @@ void wxDC::SelectPen()
 
 void wxDC::SelectBrush()
 {
 
 void wxDC::SelectBrush()
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     wxColour fg, bg;
     m_MGLDC->makeCurrent(); // will go away with MGL6.0
 
     wxColour fg, bg;
     m_MGLDC->makeCurrent(); // will go away with MGL6.0


@@ -1071,7 +1071,7 @@ void wxDC::SelectBrush()
 
 void wxDC::SetPen(const wxPen& pen)
 {
 
 void wxDC::SetPen(const wxPen& pen)
 {

-    if ( !pen.Ok() ) return;
+    if ( !pen.IsOk() ) return;

     if ( m_pen == pen ) return;
     m_pen = pen;
     m_penSelected = false;
     if ( m_pen == pen ) return;
     m_pen = pen;
     m_penSelected = false;


@@ -1080,7 +1080,7 @@ void wxDC::SetPen(const wxPen& pen)
 
 void wxDC::SetBrush(const wxBrush& brush)
 {
 
 void wxDC::SetBrush(const wxBrush& brush)
 {

-    if ( !brush.Ok() ) return;
+    if ( !brush.IsOk() ) return;

     if ( m_brush == brush ) return;
     m_brush = brush;
     m_brushSelected = false;
     if ( m_brush == brush ) return;
     m_brush = brush;
     m_brushSelected = false;


@@ -1089,17 +1089,18 @@ void wxDC::SetBrush(const wxBrush& brush)
 
 void wxDC::SetPalette(const wxPalette& palette)
 {
 
 void wxDC::SetPalette(const wxPalette& palette)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
 

-    if ( palette == wxNullPalette )
+    if ( !palette.IsOk() )

     {
     {

-        if ( m_oldPalette.Ok() )
+        if ( m_oldPalette.IsOk() )

             SetPalette(m_oldPalette);
         return;
     }
 
             SetPalette(m_oldPalette);
         return;
     }
 

-    if ( !palette.Ok() ) return;
-    if ( m_palette == palette ) return;
+    if ( palette.IsSameAs(m_palette) )
+        return;
+

     m_oldPalette = m_palette;
     m_palette = palette;
 
     m_oldPalette = m_palette;
     m_palette = palette;
 


@@ -1111,7 +1112,7 @@ void wxDC::SetPalette(const wxPalette& palette)
 
 void wxDC::SetFont(const wxFont& font)
 {
 
 void wxDC::SetFont(const wxFont& font)
 {

-    if ( font.Ok() )
+    if ( font.IsOk() )

     {
         m_font = font;
         m_mglFont = NULL;
     {
         m_font = font;
         m_mglFont = NULL;


@@ -1120,9 +1121,9 @@ void wxDC::SetFont(const wxFont& font)
 
 void wxDC::SetBackground(const wxBrush& brush)
 {
 
 void wxDC::SetBackground(const wxBrush& brush)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
 

-    if (!brush.Ok()) return;
+    if (!brush.IsOk()) return;

 
     m_backgroundBrush = brush;
     wxColour &clr = m_backgroundBrush.GetColour();
 
     m_backgroundBrush = brush;
     wxColour &clr = m_backgroundBrush.GetColour();


@@ -1140,9 +1141,9 @@ void wxDC::SetBackgroundMode(int mode)
         m_MGLDC->setBackMode(MGL_TRANSPARENT_BACKGROUND);
 }
 
         m_MGLDC->setBackMode(MGL_TRANSPARENT_BACKGROUND);
 }
 

-void wxDC::SetLogicalFunction(int function)
+void wxDC::SetLogicalFunction(wxRasterOperationMode function)

 {
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );

 
     m_logicalFunction = function;
 
 
     m_logicalFunction = function;
 


@@ -1220,7 +1221,7 @@ wxCoord wxDC::GetCharWidth() const
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,
 
 void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
                            wxCoord *descent, wxCoord *externalLeading,

-                           wxFont *theFont) const
+                           const wxFont *theFont) const

 {
     wxFont oldFont;
 
 {
     wxFont oldFont;
 


@@ -1236,7 +1237,7 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
     if ( x )
         // VS: YDEV is corrent, it should *not* be XDEV, because font's are
         //     only scaled according to m_scaleY
     if ( x )
         // VS: YDEV is corrent, it should *not* be XDEV, because font's are
         //     only scaled according to m_scaleY

-        *x = YDEV2LOGREL(m_MGLDC->textWidth(string.c_str()));
+        *x = YDEV2LOGREL(m_MGLDC->textWidth(string.wc_str()));

     if ( y )
         *y = YDEV2LOGREL(m_MGLDC->textHeight());
     if ( descent )
     if ( y )
         *y = YDEV2LOGREL(m_MGLDC->textHeight());
     if ( descent )


@@ -1249,7 +1250,6 @@ void wxDC::DoGetTextExtent(const wxString& string, wxCoord *x, wxCoord *y,
 }
 
 
 }
 
 

-

 // ---------------------------------------------------------------------------
 // mapping modes
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // mapping modes
 // ---------------------------------------------------------------------------


@@ -1269,114 +1269,6 @@ void wxDC::ComputeScaleAndOrigin()
     m_scaleX = newX, m_scaleY = newY;
 }
 
     m_scaleX = newX, m_scaleY = newY;
 }
 

-void wxDC::SetMapMode(int mode)
-{
-    switch (mode)
-    {
-        case wxMM_TWIPS:
-          SetLogicalScale(twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y);
-          break;
-        case wxMM_POINTS:
-          SetLogicalScale(pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y);
-          break;
-        case wxMM_METRIC:
-          SetLogicalScale(m_mm_to_pix_x, m_mm_to_pix_y);
-          break;
-        case wxMM_LOMETRIC:
-          SetLogicalScale(m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0);
-          break;
-        default:
-        case wxMM_TEXT:
-          SetLogicalScale(1.0, 1.0);
-          break;
-    }
-    m_mappingMode = mode;
-}
-
-void wxDC::SetUserScale( double x, double y )
-{
-    // allow negative ? -> no
-    m_userScaleX = x;
-    m_userScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDC::SetLogicalScale( double x, double y )
-{
-    // allow negative ?
-    m_logicalScaleX = x;
-    m_logicalScaleY = y;
-    ComputeScaleAndOrigin();
-}
-
-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( wxCoord x, wxCoord y )
-{
-    // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
-    m_deviceOriginX = x;
-    m_deviceOriginY = y;
-    ComputeScaleAndOrigin();
-}
-
-void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-    // only wxPostScripDC has m_signX = -1, we override SetAxisOrientation there
-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp  ? -1 :  1);
-    ComputeScaleAndOrigin();
-}
-
-// ---------------------------------------------------------------------------
-// coordinates transformations
-// ---------------------------------------------------------------------------
-
-wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const
-{
-    return ((wxDC *)this)->XDEV2LOG(x);
-}
-
-wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const
-{
-    return ((wxDC *)this)->YDEV2LOG(y);
-}
-
-wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const
-{
-    return ((wxDC *)this)->XDEV2LOGREL(x);
-}
-
-wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const
-{
-    return ((wxDC *)this)->YDEV2LOGREL(y);
-}
-
-wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const
-{
-    return ((wxDC *)this)->XLOG2DEV(x);
-}
-
-wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const
-{
-    return ((wxDC *)this)->YLOG2DEV(y);
-}
-
-wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const
-{
-    return ((wxDC *)this)->XLOG2DEVREL(x);
-}
-
-wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const
-{
-    return ((wxDC *)this)->YLOG2DEVREL(y);
-}
-
-

 void wxDC::DoGetSize(int *w, int *h) const
 {
     if (w) *w = m_MGLDC->sizex()+1;
 void wxDC::DoGetSize(int *w, int *h) const
 {
     if (w) *w = m_MGLDC->sizex()+1;


@@ -1406,10 +1298,10 @@ wxSize wxDC::GetPPI() const
 bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                   wxCoord width, wxCoord height,
                   wxDC *source, wxCoord xsrc, wxCoord ysrc,
 bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
                   wxCoord width, wxCoord height,
                   wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                  int rop, bool useMask,
+                  wxRasterOperationMode rop, bool useMask,

                   wxCoord xsrcMask, wxCoord ysrcMask)
 {
                   wxCoord xsrcMask, wxCoord ysrcMask)
 {

-    wxCHECK_MSG( Ok(), false, wxT("invalid dc") );
+    wxCHECK_MSG( IsOk(), false, wxT("invalid dc") );

     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
     // transform the source DC coords to the device ones
     wxCHECK_MSG( source, false, wxT("invalid source dc") );
 
     // transform the source DC coords to the device ones


@@ -1433,17 +1325,19 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
     /* scale/translate size and position */
     wxCoord xx = XLOG2DEV(xdest);
     wxCoord yy = YLOG2DEV(ydest);
     /* scale/translate size and position */
     wxCoord xx = XLOG2DEV(xdest);
     wxCoord yy = YLOG2DEV(ydest);

-    wxCoord ww = XLOG2DEVREL(width);
-    wxCoord hh = YLOG2DEVREL(height);

 
     if ( source->m_isMemDC )
     {
         wxMemoryDC *memDC = (wxMemoryDC*) source;
 
     if ( source->m_isMemDC )
     {
         wxMemoryDC *memDC = (wxMemoryDC*) source;

-        DoDrawSubBitmap(memDC->GetSelectedObject(), xsrc, ysrc, ww, hh,
+        DoDrawSubBitmap(memDC->GetSelectedObject(),
+                        xsrc, ysrc, width, height,

                         xdest, ydest, rop, useMask);
     }
     else
     {
                         xdest, ydest, rop, useMask);
     }
     else
     {

+        wxCoord ww = XLOG2DEVREL(width);
+        wxCoord hh = YLOG2DEVREL(height);
+

         m_MGLDC->makeCurrent(); // will go away with MGL6.0
         m_MGLDC->bitBlt(*source->GetMGLDC(),
                         xsrc, ysrc, xsrc + ww, ysrc + hh,
         m_MGLDC->makeCurrent(); // will go away with MGL6.0
         m_MGLDC->bitBlt(*source->GetMGLDC(),
                         xsrc, ysrc, xsrc + ww, ysrc + hh,


@@ -1455,8 +1349,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest,
 
 void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
 {
 
 void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
-    wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );
+    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") );

 
     wxCoord w = bmp.GetWidth();
     wxCoord h = bmp.GetHeight();
 
     wxCoord w = bmp.GetWidth();
     wxCoord h = bmp.GetHeight();


@@ -1498,8 +1392,8 @@ void wxDC::DoDrawSubBitmap(const wxBitmap &bmp,
                            wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                            wxCoord destx, wxCoord desty, int rop, bool useMask)
 {
                            wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                            wxCoord destx, wxCoord desty, int rop, bool useMask)
 {

-    wxCHECK_RET( Ok(), wxT("invalid dc") );
-    wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") );
+    wxCHECK_RET( IsOk(), wxT("invalid dc") );
+    wxCHECK_RET( bmp.IsOk(), wxT("invalid bitmap") );

 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x + w, y + h);
 
     CalcBoundingBox(x, y);
     CalcBoundingBox(x + w, y + h);


@@ -1545,7 +1439,7 @@ void wxDC::DoDrawSubBitmap(const wxBitmap &bmp,
         // This sequence of operations ensures that the source's transparent
         // area need not be black, and logical functions are supported.
 
         // This sequence of operations ensures that the source's transparent
         // area need not be black, and logical functions are supported.
 

-        wxBitmap *mask = bmp.GetMask()->GetBitmap();
+        wxBitmap mask = bmp.GetMask()->GetBitmap();

 
         MGLMemoryDC *temp;
 
 
         MGLMemoryDC *temp;
 


@@ -1570,10 +1464,10 @@ void wxDC::DoDrawSubBitmap(const wxBitmap &bmp,
         DoBitBlt(bmp, temp, x, y, w, h, 0, 0, dw, dh, mglRop,
                  useStretching, putSection);
 
         DoBitBlt(bmp, temp, x, y, w, h, 0, 0, dw, dh, mglRop,
                  useStretching, putSection);
 

-        mask->SetMonoPalette(wxColour(0,0,0), wxColour(255,255,255));
-        DoBitBlt(*mask, temp, x, y, w, h, 0, 0, dw, dh, MGL_R2_MASKSRC,
+        mask.SetMonoPalette(wxColour(0,0,0), wxColour(255,255,255));
+        DoBitBlt(mask, temp, x, y, w, h, 0, 0, dw, dh, MGL_R2_MASKSRC,

                  useStretching, putSection);
                  useStretching, putSection);

-        DoBitBlt(*mask, m_MGLDC, x, y, w, h, dx, dy, dw, dh, MGL_R2_MASKNOTSRC,
+        DoBitBlt(mask, m_MGLDC, x, y, w, h, dx, dy, dw, dh, MGL_R2_MASKNOTSRC,

                  useStretching, putSection);
 
         m_MGLDC->bitBlt(*temp, 0, 0, dw, dh, dx, dy, MGL_OR_MODE);
                  useStretching, putSection);
 
         m_MGLDC->bitBlt(*temp, 0, 0, dw, dh, dx, dy, MGL_OR_MODE);