projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Unicode build fix
[wxWidgets.git]
/
src
/
html
/
m_image.cpp
diff --git
a/src/html/m_image.cpp
b/src/html/m_image.cpp
index a850abcf374482c91b214557f1542d58e3265c35..05fe9e123b04c3fcbc1e552db0fc70eb9db0276f 100644
(file)
--- a/
src/html/m_image.cpp
+++ b/
src/html/m_image.cpp
@@
-36,8
+36,8
@@
#include "wx/dynarray.h"
#include "wx/log.h"
#include "wx/artprov.h"
#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)
#include <float.h>
FORCE_LINK_ME(m_image)
@@
-372,9
+372,8
@@
wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
if ( s )
{
if ( s )
{
- bool readImg = true;
-
#if wxUSE_GIF && wxUSE_TIMER
#if wxUSE_GIF && wxUSE_TIMER
+ bool readImg = true;
if ( (input->GetLocation().Matches(wxT("*.gif")) ||
input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
{
if ( (input->GetLocation().Matches(wxT("*.gif")) ||
input->GetLocation().Matches(wxT("*.GIF"))) && m_window )
{
@@
-572,7
+571,7
@@
void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
{
wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
{
- if (m_mapName.
IsE
mpty())
+ if (m_mapName.
e
mpty())
return wxHtmlCell::GetLink( x, y );
if (!m_imageMap)
{
return wxHtmlCell::GetLink( x, y );
if (!m_imageMap)
{