removed Win16 code (patch 905241), last version with remains of Win16 support tagged...

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

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 7458ddf79210de712fd2f441bd36717c696b9aa4..58aaa45e230843edf0f497a9724abc95a9300f8c 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -7,7 +7,7 @@
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation
 #endif
 
 #pragma implementation
 #endif
 


@@ -16,7 +16,7 @@
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
 #include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 

-#ifdef __BORDLANDC__
+#ifdef __BORLANDC__

 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 


@@ -35,6 +35,7 @@
 #include "wx/gifdecod.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"
 #include "wx/gifdecod.h"
 #include "wx/dynarray.h"
 #include "wx/log.h"

+#include "wx/artprov.h"

 
 #include <math.h>
 #include <float.h>
 
 #include <math.h>
 #include <float.h>


@@ -49,11 +50,11 @@ WX_DECLARE_OBJARRAY(int, CoordArray);
 WX_DEFINE_OBJARRAY(CoordArray);
 
 
 WX_DEFINE_OBJARRAY(CoordArray);
 
 

-//--------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------

 // wxHtmlImageMapAreaCell
 // wxHtmlImageMapAreaCell

-//                  0-width, 0-height cell that represents single area in imagemap
-//                  (it's GetLink is called from wxHtmlImageCell's)
-//--------------------------------------------------------------------------------
+//                  0-width, 0-height cell that represents single area in
+//                  imagemap (it's GetLink is called from wxHtmlImageCell's)
+// ---------------------------------------------------------------------------

 
 class wxHtmlImageMapAreaCell : public wxHtmlCell
 {
 
 class wxHtmlImageMapAreaCell : public wxHtmlCell
 {


@@ -66,6 +67,13 @@ class wxHtmlImageMapAreaCell : public wxHtmlCell
     public:
         wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0);
         virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
     public:
         wxHtmlImageMapAreaCell( celltype t, wxString &coords, double pixel_scale = 1.0);
         virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;

+        void Draw(wxDC& WXUNUSED(dc),
+                  int WXUNUSED(x), int WXUNUSED(y),
+                  int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                  wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+
+    DECLARE_NO_COPY_CLASS(wxHtmlImageMapAreaCell)

 };
 
 
 };
 
 


@@ -238,6 +246,12 @@ class wxHtmlImageMapCell : public wxHtmlCell
     public:
         virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
         virtual const wxHtmlCell *Find( int cond, const void *param ) const;
     public:
         virtual wxHtmlLinkInfo *GetLink( int x = 0, int y = 0 ) const;
         virtual const wxHtmlCell *Find( int cond, const void *param ) const;

+        void Draw(wxDC& WXUNUSED(dc),
+                  int WXUNUSED(x), int WXUNUSED(y),
+                  int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                  wxHtmlRenderingInfo& WXUNUSED(info)) {}
+
+    DECLARE_NO_COPY_CLASS(wxHtmlImageMapCell)

 };
 
 
 };
 
 


@@ -281,7 +295,8 @@ public:
                     double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
                     const wxString& mapname = wxEmptyString);
     ~wxHtmlImageCell();
                     double scale = 1.0, int align = wxHTML_ALIGN_BOTTOM,
                     const wxString& mapname = wxEmptyString);
     ~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,
+              wxHtmlRenderingInfo& info);

     virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
 
     void SetImage(const wxImage& img);
     virtual wxHtmlLinkInfo *GetLink(int x = 0, int y = 0) const;
 
     void SetImage(const wxImage& img);


@@ -303,6 +318,8 @@ private:
     double              m_scale;
     wxHtmlImageMapCell *m_imageMap;
     wxString            m_mapName;
     double              m_scale;
     wxHtmlImageMapCell *m_imageMap;
     wxString            m_mapName;

+
+    DECLARE_NO_COPY_CLASS(wxHtmlImageCell)

 };
 
 #if wxUSE_GIF && wxUSE_TIMER
 };
 
 #if wxUSE_GIF && wxUSE_TIMER


@@ -317,55 +334,16 @@ class wxGIFTimer : public wxTimer
 
     private:
         wxHtmlImageCell *m_cell;
 
     private:
         wxHtmlImageCell *m_cell;

+
+    DECLARE_NO_COPY_CLASS(wxGIFTimer)

 };
 #endif
 
 
 };
 #endif
 
 

-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 // wxHtmlImageCell
 // wxHtmlImageCell

-//--------------------------------------------------------------------------------
+//----------------------------------------------------------------------------

 
 

-/* XPM */
-static const char * broken_image_xpm[] = {
-"29 31 7 1",
-"   c None",
-".  c #808080",
-"+  c #FFFFFF",
-"@  c #C0C0C0",
-"#  c #000000",
-"$  c #333366",
-"%  c #B2B2B2",
-".....................        ",
-".+++++++++++++++++++..       ",
-".+++++++++++++++++++.@.      ",
-".++@@@@@@@@@@@@@@@@@.+@.     ",
-".++@@@@@@@@@@@@@@@@@.++@.    ",
-".++@@@@@.@@@@.@@@@@@.+++@.   ",
-".++@@@@@@@@@@@@@@@@@.++++@.  ",
-".++@@@@@@@@@@@@@@@@@.+++++@. ",
-".++@@.@@@@@@@@@@.@@@######## ",
-".++@@@@@@@@@@@@@@@@@@$$$$$$#.",
-".######@@@@@@@@@@@@@@@.....#.",
-"       ###@@@@@@@@@@@@@@@++#.",
-"          #####@@@@@@@@@@++#.",
-"              #@.@@@@@@@@++#.",
-"..             ###@@@@@@@++#.",
-".+....            #@@@@@@++#.",
-".++@@@...          ####@@++#.",
-".++@@@@@@..            #####.",
-".++@@@@@@@@...               ",
-".++@@@@@@%%%%@.              ",
-".++@@@@@@%%%%@@....          ",
-".++@@@@@@%%%%@@@@@@....      ",
-".++@@@@@@%%%%@@@@@@@@@@....  ",
-".++@@@@@@@@@@@@@@@@@@@@@@++#.",
-".++@@@@@@@@@@@@@@@@@@@@@@++#.",
-".++@@@@@@@@@@@@@@@@@@@@@@++#.",
-".++@@@@@@@@@@@@@@@@@@@@@@++#.",
-".++@@@@@@@@@@@@@@@@@@@@@@++#.",
-".++++++++++++++++++++++++++#.",
-".++++++++++++++++++++++++++#.",
-"############################."};

 
 wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
                                  int w, int h, double scale, int align,
 
 wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
                                  int w, int h, double scale, int align,


@@ -447,7 +425,8 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
                 if ( m_bmpW == -1 ) m_bmpW = 31;
                 if ( m_bmpH == -1 ) m_bmpH = 33;
             }
                 if ( m_bmpW == -1 ) m_bmpW = 31;
                 if ( m_bmpH == -1 ) m_bmpH = 33;
             }

-            m_bitmap = new wxBitmap(broken_image_xpm);
+            m_bitmap = 
+                new wxBitmap(wxArtProvider::GetBitmap(wxART_MISSING_IMAGE));

         }
     }
     //else: ignore the 0-sized images used sometimes on the Web pages
         }
     }
     //else: ignore the 0-sized images used sometimes on the Web pages


@@ -485,12 +464,16 @@ void wxHtmlImageCell::SetImage(const wxImage& img)
         if ( m_bmpH == -1 )
             m_bmpH = hh;
 
         if ( m_bmpH == -1 )
             m_bmpH = hh;
 

+        // Only scale the bitmap at the rendering stage,
+        // so we don't lose quality twice
+/*

         if ((m_bmpW != ww) || (m_bmpH != hh))
         {
             wxImage img2 = img.Scale(m_bmpW, m_bmpH);
             m_bitmap = new wxBitmap(img2);
         }
         else
         if ((m_bmpW != ww) || (m_bmpH != hh))
         {
             wxImage img2 = img.Scale(m_bmpW, m_bmpH);
             m_bitmap = new wxBitmap(img2);
         }
         else

+*/

             m_bitmap = new wxBitmap(img);
     }
 }
             m_bitmap = new wxBitmap(img);
     }
 }


@@ -526,7 +509,8 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
             wxBitmap bmp(img);
             wxMemoryDC dc;
             dc.SelectObject(*m_bitmap);
             wxBitmap bmp(img);
             wxMemoryDC dc;
             dc.SelectObject(*m_bitmap);

-            dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop());
+            dc.DrawBitmap(bmp, m_gifDecoder->GetLeft(), m_gifDecoder->GetTop(),
+                          TRUE /* use mask */);

         }
         else
             SetImage(img);
         }
         else
             SetImage(img);


@@ -554,7 +538,9 @@ wxHtmlImageCell::~wxHtmlImageCell()
 }
 
 
 }
 
 

-void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WXUNUSED(view_y2))
+void wxHtmlImageCell::Draw(wxDC& dc, int x, int y,
+                           int WXUNUSED(view_y1), int WXUNUSED(view_y2),
+                           wxHtmlRenderingInfo& WXUNUSED(info))

 {
     if ( m_showFrame )
     {
 {
     if ( m_showFrame )
     {


@@ -565,12 +551,21 @@ void wxHtmlImageCell::Draw(wxDC& dc, int x, int y, int WXUNUSED(view_y1), int WX
     }
     if ( m_bitmap )
     {
     }
     if ( m_bitmap )
     {

+        // We add in the scaling from the desired bitmap width
+        // and height, so we only do the scaling once.
+        double imageScaleX = 1.0;
+        double imageScaleY = 1.0;
+        if (m_bmpW != m_bitmap->GetWidth())
+            imageScaleX = (double) m_bmpW / (double) m_bitmap->GetWidth();
+        if (m_bmpH != m_bitmap->GetHeight())
+            imageScaleY = (double) m_bmpH / (double) m_bitmap->GetHeight();
+        

         double us_x, us_y;
         dc.GetUserScale(&us_x, &us_y);
         double us_x, us_y;
         dc.GetUserScale(&us_x, &us_y);

-        dc.SetUserScale(us_x * m_scale, us_y * m_scale);
+        dc.SetUserScale(us_x * m_scale * imageScaleX, us_y * m_scale * imageScaleY);

 
 

-        dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / m_scale),
-                                 (int) ((y + m_PosY) / m_scale), TRUE);
+        dc.DrawBitmap(*m_bitmap, (int) ((x + m_PosX) / (m_scale*imageScaleX)),
+                                 (int) ((y + m_PosY) / (m_scale*imageScaleY)), TRUE);

         dc.SetUserScale(us_x, us_y);
     }
 }
         dc.SetUserScale(us_x, us_y);
     }
 }


@@ -612,6 +607,7 @@ wxHtmlLinkInfo *wxHtmlImageCell::GetLink( int x, int y ) const
 //--------------------------------------------------------------------------------
 
 TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
 //--------------------------------------------------------------------------------
 
 TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")

+    TAG_HANDLER_CONSTR(IMG) { }

 
     TAG_HANDLER_PROC(tag)
     {
 
     TAG_HANDLER_PROC(tag)
     {