Trace module initialization and cleanup.

[wxWidgets.git] / src / html / m_image.cpp

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index b42f7780be950f69609920769af096e4fed06d4a..75fe3adbd5b554ef76e244fc258c1ba045ca786d 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
@@ -36,8 +32,8 @@
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/artprov.h"
+#include "wx/math.h"
 
-#include <math.h>
 #include <float.h>
 
 FORCE_LINK_ME(m_image)
@@ -372,9 +368,8 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
 
             if ( s )
             {
-                bool readImg = true;
-
 #if wxUSE_GIF && wxUSE_TIMER
+                bool readImg = true;
                 if ( (input->GetLocation().Matches(wxT("*.gif")) ||
                       input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
                 {
@@ -539,11 +534,9 @@ wxHtmlImageCell::~wxHtmlImageCell()
 
 
 void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
-                           int WXUNUSED(view_y1), int view_y2,
+                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
                            wxHtmlRenderingInfo& WXUNUSED(info))
 {
-    if (y+m_PosY+m_Height > view_y2) return;
-    
     if ( m_showFrame )
     {
         dc.SetBrush(*wxTRANSPARENT_BRUSH);
@@ -574,7 +567,7 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
 
 wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 {
-    if (m_mapName.IsEmpty())
+    if (m_mapName.empty())
         return wxHtmlCell::GetLink( x, y );
     if (!m_imageMap)
     {