new sample

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

diff --git a/src/html/mod_image.cpp b/src/html/mod_image.cpp
index d21965c6c209837dc288ef6bb359f8a8e0a62b37..fda3e4ad528ef4cabbbd9f5309c95803c15304c5 100644 (file)
--- a/src/html/mod_image.cpp
+++ b/src/html/mod_image.cpp
@@ -26,7 +26,7 @@
 #include "wx/html/forcelink.h"
 #include "wx/html/mod_templ.h"
 
-#include "wx/wxhtml.h"
+
 #include "wx/image.h"
 #include "wx/dynarray.h"
 
@@ -140,12 +140,12 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
                                                (coords[pointer] - yval)) >= wherex) ? 1 : 0;
                                        }
                                }
-                               
-                               while (pointer < end) 
+
+                               while (pointer < end)
                                {
                                        yval = coords[pointer];
                                        pointer += 2;
-                                       if (yval >= wherey) 
+                                       if (yval >= wherey)
                                        {
                                                while((pointer < end) && (coords[pointer] >= wherey))
                                                {
@@ -291,10 +291,9 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr
 {
     wxImage *img;
     int ww, hh;
-    wxString m = input -> GetMimeType();
     wxInputStream *s = input -> GetStream();
 
-    img = new wxImage(*s, m);
+    img = new wxImage(*s, wxBITMAP_TYPE_ANY);
 
     m_Image = NULL;
     if (img && (img -> Ok())) {