added wxDisplayFactoryX11 ctor body

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

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index fd4ff2485563b930d07dcd0c9886412223ab5744..9574b94d419f67bff8df8aec43db7a7de550653d 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation
-#endif
-

 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"


@@ -47,7 +43,7 @@ FORCE_LINK_ME(m_image)
 
 WX_DECLARE_OBJARRAY(int, CoordArray);
 #include "wx/arrimpl.cpp" // this is a magic incantation which must be done!
 
 WX_DECLARE_OBJARRAY(int, CoordArray);
 #include "wx/arrimpl.cpp" // this is a magic incantation which must be done!

-WX_DEFINE_OBJARRAY(CoordArray);
+WX_DEFINE_OBJARRAY(CoordArray)

 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------


@@ -372,9 +368,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 )
                 {


@@ -451,6 +446,7 @@ wxHtmlImageCell::wxHtmlImageCell(wxWindow *window, wxFSFile *input,
 
 void wxHtmlImageCell::SetImage(const wxImage& img)
 {
 
 void wxHtmlImageCell::SetImage(const wxImage& img)
 {

+#if !defined(__WXMSW__) || wxUSE_WXDIB

     if ( img.Ok() )
     {
         delete m_bitmap;
     if ( img.Ok() )
     {
         delete m_bitmap;


@@ -476,6 +472,7 @@ void wxHtmlImageCell::SetImage(const wxImage& img)
 */
             m_bitmap = new wxBitmap(img);
     }
 */
             m_bitmap = new wxBitmap(img);
     }

+#endif

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


@@ -502,6 +499,7 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
     if ( m_window->GetClientRect().Intersects(rect) &&
          m_gifDecoder->ConvertToImage(&img) )
     {
     if ( m_window->GetClientRect().Intersects(rect) &&
          m_gifDecoder->ConvertToImage(&img) )
     {

+#if !defined(__WXMSW__) || wxUSE_WXDIB

         if ( (int)m_gifDecoder->GetWidth() != m_Width ||
              (int)m_gifDecoder->GetHeight() != m_Height ||
              m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 )
         if ( (int)m_gifDecoder->GetWidth() != m_Width ||
              (int)m_gifDecoder->GetHeight() != m_Height ||
              m_gifDecoder->GetLeft() != 0 || m_gifDecoder->GetTop() != 0 )


@@ -513,6 +511,7 @@ void wxHtmlImageCell::AdvanceAnimation(wxTimer *timer)
                           true /* use mask */);
         }
         else
                           true /* use mask */);
         }
         else

+#endif            

             SetImage(img);
         m_window->Refresh(img.HasMask(), &rect);
     }
             SetImage(img);
         m_window->Refresh(img.HasMask(), &rect);
     }


@@ -650,7 +649,7 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                                           str, w, h,
                                           m_WParser->GetPixelScale(),
                                           al, mn);
                                           str, w, h,
                                           m_WParser->GetPixelScale(),
                                           al, mn);

-                cel->SetLink(m_WParser->GetLink());
+                m_WParser->ApplyStateToCell(cel);

                 cel->SetId(tag.GetParam(wxT("id"))); // may be empty
                 m_WParser->GetContainer()->InsertCell(cel);
                 if (str)
                 cel->SetId(tag.GetParam(wxT("id"))); // may be empty
                 m_WParser->GetContainer()->InsertCell(cel);
                 if (str)


@@ -697,12 +696,13 @@ TAG_HANDLER_BEGIN(IMG, "IMG,MAP,AREA")
                 }
                 if (cel != NULL && tag.HasParam(wxT("HREF")))
                 {
                 }
                 if (cel != NULL && tag.HasParam(wxT("HREF")))
                 {

-                    wxString tmp = tag.GetParam(wxT("HREF"));
-                    wxString target = wxEmptyString;
-                    if (tag.HasParam(wxT("TARGET"))) target = tag.GetParam(wxT("TARGET"));
-                    cel->SetLink( wxHtmlLinkInfo(tmp, target));
+                    wxString target;
+                    if (tag.HasParam(wxT("TARGET")))
+                        target = tag.GetParam(wxT("TARGET"));
+                    cel->SetLink(wxHtmlLinkInfo(tag.GetParam(wxT("HREF")), target));

                 }
                 }

-                if (cel != NULL) m_WParser->GetContainer()->InsertCell( cel );
+                if (cel != NULL)
+                    m_WParser->GetContainer()->InsertCell( cel );

             }
         }
 
             }
         }