fixing overrelease and out-of-bounds write, fixes #13725

[wxWidgets.git] / src / common / overlaycmn.cpp

diff --git a/src/common/overlaycmn.cpp b/src/common/overlaycmn.cpp
index 722cd5794f9813ba58d094e3f128dac52adee313..f08cb238e55efda4bfb844045a66d76f997bfdd2 100644 (file)
--- a/src/common/overlaycmn.cpp
+++ b/src/common/overlaycmn.cpp
@@ -139,7 +139,7 @@ wxOverlayImpl::~wxOverlayImpl()
 
 bool wxOverlayImpl::IsOk()
 {
 
 bool wxOverlayImpl::IsOk()
 {

-    return m_bmpSaved.Ok() ;
+    return m_bmpSaved.IsOk() ;

 }
 
 void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
 }
 
 void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )


@@ -152,11 +152,6 @@ void wxOverlayImpl::Init( wxDC* dc, int x , int y , int width , int height )
     m_y = y ;
     m_width = width ;
     m_height = height ;
     m_y = y ;
     m_width = width ;
     m_height = height ;

-#if defined(__WXGTK__) && !defined(__WX_DC_BLIT_FIXED__)
-    wxPoint pt = dc->GetDeviceOrigin();
-    x += pt.x;
-    y += pt.y;
-#endif // broken wxGTK wxDC::Blit

     dcMem.Blit(0, 0, m_width, m_height,
         dc, x, y);
     dcMem.SelectObject( wxNullBitmap );
     dcMem.Blit(0, 0, m_width, m_height,
         dc, x, y);
     dcMem.SelectObject( wxNullBitmap );