mac methodname fixed, so all use the same now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42168 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp
index 03756a3033978c5d4c712f0803a6554130a11bc7..380209a6081eb27b54162a0292aee4bd30f6ff22 100644 (file)
--- a/src/common/graphcmn.cpp
+++ b/src/common/graphcmn.cpp
@@ -1058,7 +1058,7 @@ bool wxGCDC::CanDrawBitmap() const
 
 bool wxGCDC::DoBlit(
     wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
 
 bool wxGCDC::DoBlit(
     wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,

-    wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask,
+    wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool WXUNUSED(useMask),

     wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid DC") );
     wxCoord xsrcMask, wxCoord ysrcMask )
 {
     wxCHECK_MSG( Ok(), false, wxT("wxGCDC(cg)::DoBlit - invalid DC") );


@@ -1086,7 +1086,7 @@ bool wxGCDC::DoBlit(
     wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source);
     if ( memdc && logical_func == wxCOPY )
     {
     wxMemoryDC* memdc = dynamic_cast<wxMemoryDC*>(source);
     if ( memdc && logical_func == wxCOPY )
     {

-        wxBitmap blit = memdc->GetSelectedObject();
+        wxBitmap blit = memdc->GetSelectedBitmap();

 
         wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") );
 
 
         wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") );
 


@@ -1122,7 +1122,6 @@ bool wxGCDC::DoBlit(
         {
             m_graphicContext->DrawBitmap( blit, xxdest , yydest , wwdest , hhdest );
         }
         {
             m_graphicContext->DrawBitmap( blit, xxdest , yydest , wwdest , hhdest );
         }

-

     }
     else
     {
     }
     else
     {