Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display of PNG images in wxHTML when GIF is disabled

Browse Source 
Too much code was taken in "#if wxUSE_GIF" check, move Layout() out from it to
make PNG images work even if GIF support is disabled.

Closes #17181
This commit is contained in:
Vadim Zeitlin
2015-10-05 12:21:15 +02:00
parent 5c72e0c354
commit b1314bbca4
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/html/m_image.cpp
View File

@@ -304,9 +304,10 @@ public:
#if wxUSE_GIF && wxUSE_TIMER #if wxUSE_GIF && wxUSE_TIMER
void AdvanceAnimation(wxTimer *timer); void AdvanceAnimation(wxTimer *timer);
virtual void Layout(int w) wxOVERRIDE;
#endif #endif
virtual void Layout(int w) wxOVERRIDE;
private: private:
wxBitmap *m_bitmap; wxBitmap *m_bitmap;
int m_align; int m_align;
@@ -538,6 +539,7 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
delay = 1; delay = 1;
timer->Start(delay, true); timer->Start(delay, true);
} }
#endif
void wxHtmlImageCell::Layout(int w) void wxHtmlImageCell::Layout(int w)
{ {
@@ -571,10 +573,10 @@ void wxHtmlImageCell::Layout(int w)
} }
wxHtmlCell::Layout(w); wxHtmlCell::Layout(w);
#if wxUSE_GIF && wxUSE_TIMER
m_physX = m_physY = wxDefaultCoord; m_physX = m_physY = wxDefaultCoord;
}
#endif #endif
}
wxHtmlImageCell::~wxHtmlImageCell() wxHtmlImageCell::~wxHtmlImageCell()
{ {