X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/285f58ab666d956bdbede9fce33f29113640caa2..e07d33e7244bbc6192b00cd7839ea96a50014228:/src/html/m_image.cpp?ds=sidebyside

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index bc85ae290b..a142580cd4 100644
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation
 #endif
 
@@ -71,6 +71,9 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+
+    DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell)
 };
 
 
@@ -247,6 +250,8 @@ class wxHtmlImageMapCell : public wxHtmlCell
                   int WXUNUSED(x), int WXUNUSED(y),
                   int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                   wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+    DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell)
 };
 
 
@@ -500,7 +505,8 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
             wxBitmap bmp(img);
             wxMemoryDC dc;
             dc.SelectObject(*m_bitmap);
-            dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop());
+            dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(),
+                          TRUE /* use mask */);
         }
         else
             SetImage(img);
@@ -588,6 +594,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 //--------------------------------------------------------------------------------
 
 TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
+    TAG_HANDLER_CONSTR(IMG) { }
 
     TAG_HANDLER_PROC(tag)
     {