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

fix for a typo (== instead of =)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@13885 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-01-28 17:57:57 +00:00
parent a664d17e06
commit 5a7fa9ed3b
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/html/m_image.cpp
View File

@@ -276,8 +276,8 @@ class wxHtmlImageCell : public wxHtmlCell
{ {
public: public:
wxHtmlImageCell(wxWindow *window, wxHtmlImageCell(wxWindow *window,
wxFSFile *input, int w = -1, int h = -1, wxFSFile *input, int w = -1, int h = -1,
double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM, double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
const wxString& mapname = wxEmptyString); const wxString& mapname = wxEmptyString);
~wxHtmlImageCell(); ~wxHtmlImageCell();
void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2); void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
@@ -366,8 +366,8 @@ static const char * broken_image_xpm[] = {
".++++++++++++++++++++++++++#.", ".++++++++++++++++++++++++++#.",
"############################."}; "############################."};
wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input, wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
int w, int h, double scale, int align, int w, int h, double scale, int align,
const wxString& mapname) : wxHtmlCell() const wxString& mapname) : wxHtmlCell()
{ {
m_window = window ? wxStaticCast(window, wxScrolledWindow) : NULL; m_window = window ? wxStaticCast(window, wxScrolledWindow) : NULL;
@@ -423,7 +423,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
} }
if ( readImg ) if ( readImg )
#endif #endif // wxUSE_GIF && wxUSE_TIMER
{ {
SetImage(wxImage(*s, wxBITMAP_TYPE_ANY)); SetImage(wxImage(*s, wxBITMAP_TYPE_ANY));
} }
@@ -433,7 +433,8 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
{ {
if ( m_bmpW == -1 && m_bmpH == -1 ) if ( m_bmpW == -1 && m_bmpH == -1 )
{ {
m_bmpW == 29, m_bmpH = 31; m_bmpW = 29;
m_bmpH = 31;
} }
else else
{ {
@@ -508,7 +509,7 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y); m_window->CalcScrolledPosition(m_physX, m_physY, &x, &y);
wxRect rect(x, y, m_Width, m_Height); wxRect rect(x, y, m_Width, m_Height);
if ( m_window->GetClientRect().Intersects(rect) && if ( m_window->GetClientRect().Intersects(rect) &&
m_gifDecoder->ConvertToImage(&img) ) m_gifDecoder->ConvertToImage(&img) )
{ {
if ( (int)m_gifDecoder->GetWidth() != m_Width || if ( (int)m_gifDecoder->GetWidth() != m_Width ||
@@ -581,7 +582,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
p = p->GetParent(); p = p->GetParent();
} }
p = op; p = op;
wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP, wxHtmlCell *cell = (wxHtmlCell*)p->Find(wxHTML_COND_ISIMAGEMAP,
(const void*)(&m_mapName)); (const void*)(&m_mapName));
if (!cell) if (!cell)
{ {
@@ -616,9 +617,9 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
wxFSFile *str; wxFSFile *str;
wxString tmp = tag.GetParam(wxT("SRC")); wxString tmp = tag.GetParam(wxT("SRC"));
wxString mn = wxEmptyString; wxString mn = wxEmptyString;
str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp); str = m_WParser->OpenURL(wxHTML_URL_IMAGE, tmp);
if (tag.HasParam(wxT("WIDTH"))) if (tag.HasParam(wxT("WIDTH")))
tag.GetParamAsInt(wxT("WIDTH"), &w); tag.GetParamAsInt(wxT("WIDTH"), &w);
if (tag.HasParam(wxT("HEIGHT"))) if (tag.HasParam(wxT("HEIGHT")))
@@ -643,8 +644,8 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
} }
wxHtmlImageCell *cel = new wxHtmlImageCell( wxHtmlImageCell *cel = new wxHtmlImageCell(
m_WParser->GetWindow(), m_WParser->GetWindow(),
str, w, h, str, w, h,
m_WParser->GetPixelScale(), m_WParser->GetPixelScale(),
al, mn); al, mn);
cel->SetLink(m_WParser->GetLink()); cel->SetLink(m_WParser->GetLink());
cel->SetId(tag.GetParam(wxT("id"))); // may be empty cel->SetId(tag.GetParam(wxT("id"))); // may be empty