Some work on tabbing and menu accels,

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

diff --git a/src/html/m_image.cpp b/src/html/m_image.cpp
index 020c60230ee946c780492671edd7a98ba1073537..9ee14ff798e4ec4218df719daa8287ea273e71b1 100644 (file)
--- a/src/html/m_image.cpp
+++ b/src/html/m_image.cpp
@@ -75,10 +75,10 @@ wxHtmlImageMapAreaCell::wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::celltype
        type = t;
        while ((i = x.Find( ',' )) != -1)
        {
        type = t;
        while ((i = x.Find( ',' )) != -1)
        {

-               coords.Add( atoi( x.Left( i ).c_str() ) );
+               coords.Add( wxAtoi( x.Left( i ).c_str() ) );

                x = x.Mid( i + 1 );
        }
                x = x.Mid( i + 1 );
        }

-       coords.Add( atoi( x.c_str() ) );
+       coords.Add( wxAtoi( x.c_str() ) );

 }
 
 wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
 }
 
 wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const


@@ -107,7 +107,7 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
                        l = coords[ 0 ];
                        t = coords[ 1 ];
                        r = coords[ 2 ];
                        l = coords[ 0 ];
                        t = coords[ 1 ];
                        r = coords[ 2 ];

-                       d = sqrt( ((x - l) * (x - l)) + ((y - t) * (y - t)) );
+                       d = sqrt( (double) (((x - l) * (x - l)) + ((y - t) * (y - t))) );

                        if (d < (double)r)
                        {
                                return m_Link;
                        if (d < (double)r)
                        {
                                return m_Link;


@@ -220,7 +220,7 @@ wxString wxHtmlImageMapAreaCell::GetLink( int x, int y ) const
 // wxHtmlImageMapCell
 //                  0-width, 0-height cell that represents map from imagemaps
 //                  it is always placed before wxHtmlImageMapAreaCells
 // wxHtmlImageMapCell
 //                  0-width, 0-height cell that represents map from imagemaps
 //                  it is always placed before wxHtmlImageMapAreaCells

-//                  It responds to Find(HTML_COND_ISIMAGEMAP)
+//                  It responds to Find(wxHTML_COND_ISIMAGEMAP)

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


@@ -251,7 +251,7 @@ wxString wxHtmlImageMapCell::GetLink( int x, int y ) const
 
 const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 {
 
 const wxHtmlCell *wxHtmlImageMapCell::Find( int cond, const void *param ) const
 {

-       if (cond == HTML_COND_ISIMAGEMAP)
+       if (cond == wxHTML_COND_ISIMAGEMAP)

        {
                if (m_Name == *((wxString*)(param)))
                        return this;
        {
                if (m_Name == *((wxString*)(param)))
                        return this;


@@ -275,7 +275,7 @@ class wxHtmlImageCell : public wxHtmlCell
        wxHtmlImageMapCell *m_ImageMap;
        wxString m_MapName;
 
        wxHtmlImageMapCell *m_ImageMap;
        wxString m_MapName;
 

-        wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, int align = HTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString);
+        wxHtmlImageCell(wxFSFile *input, int w = -1, int h = -1, int align = wxHTML_ALIGN_BOTTOM, wxString mapname = wxEmptyString);

         ~wxHtmlImageCell() {if (m_Image) delete m_Image;}
         void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
            virtual wxString GetLink( int x = 0, int y = 0 ) const;
         ~wxHtmlImageCell() {if (m_Image) delete m_Image;}
         void Draw(wxDC& dc, int x, int y, int view_y1, int view_y2);
            virtual wxString GetLink( int x = 0, int y = 0 ) const;


@@ -311,16 +311,17 @@ wxHtmlImageCell::wxHtmlImageCell(wxFSFile *input, int w, int h, int align, wxStr
         delete img;
     }
     switch (align) {
         delete img;
     }
     switch (align) {

-        case HTML_ALIGN_TOP :
+        case wxHTML_ALIGN_TOP :

                         m_Descent = m_Height; break;
                         m_Descent = m_Height; break;

-        case HTML_ALIGN_CENTER :
+        case wxHTML_ALIGN_CENTER :

                         m_Descent = m_Height / 2; break;
                         m_Descent = m_Height / 2; break;

-        case HTML_ALIGN_BOTTOM : default :
+        case wxHTML_ALIGN_BOTTOM : default :

                         m_Descent = 0; break;
     }
 
     m_ImageMap = NULL;
     m_MapName = mapname;
                         m_Descent = 0; break;
     }
 
     m_ImageMap = NULL;
     m_MapName = mapname;

+    SetCanLiveOnPagebreak(FALSE);

 }
 
 
 }
 
 


@@ -346,7 +347,7 @@ wxString wxHtmlImageCell::GetLink( int x, int y ) const
                        p = p->GetParent();
                }
                p = op;
                        p = p->GetParent();
                }
                p = op;

-               wxHtmlCell *cell = (wxHtmlCell*)p->Find( HTML_COND_ISIMAGEMAP, (const void*)(&m_MapName));
+               wxHtmlCell *cell = (wxHtmlCell*)p->Find( wxHTML_COND_ISIMAGEMAP, (const void*)(&m_MapName));

                if (!cell)
                {
                        ((wxString&)m_MapName).Clear();
                if (!cell)
                {
                        ((wxString&)m_MapName).Clear();


@@ -381,14 +382,14 @@ TAG_HANDLER_BEGIN(IMG, "IMG, MAP, AREA")
                    wxString mn = wxEmptyString;
 
                    str = m_WParser -> GetFS() -> OpenFile(tmp);
                    wxString mn = wxEmptyString;
 
                    str = m_WParser -> GetFS() -> OpenFile(tmp);

-                   if (tag.HasParam("WIDTH")) tag.ScanParam("WIDTH", "%i", &w);
-                   if (tag.HasParam("HEIGHT")) tag.ScanParam("HEIGHT", "%i", &h);
-                   al = HTML_ALIGN_BOTTOM;
+                   if (tag.HasParam(wxT("WIDTH"))) tag.ScanParam(wxT("WIDTH"), wxT("%i"), &w);
+                   if (tag.HasParam(wxT("HEIGHT"))) tag.ScanParam(wxT("HEIGHT"), wxT("%i"), &h);
+                   al = wxHTML_ALIGN_BOTTOM;

                    if (tag.HasParam("ALIGN")) {
                        wxString alstr = tag.GetParam("ALIGN");
                        alstr.MakeUpper(); // for the case alignment was in ".."
                    if (tag.HasParam("ALIGN")) {
                        wxString alstr = tag.GetParam("ALIGN");
                        alstr.MakeUpper(); // for the case alignment was in ".."

-                       if (alstr == "TEXTTOP") al = HTML_ALIGN_TOP;
-                       else if ((alstr == "CENTER") || (alstr == "ABSCENTER")) al = HTML_ALIGN_CENTER;
+                       if (alstr == "TEXTTOP") al = wxHTML_ALIGN_TOP;
+                       else if ((alstr == "CENTER") || (alstr == "ABSCENTER")) al = wxHTML_ALIGN_CENTER;

                    }
                    if (tag.HasParam("USEMAP"))
                    {
                    }
                    if (tag.HasParam("USEMAP"))
                    {


@@ -445,12 +446,12 @@ TAG_HANDLER_BEGIN(IMG, "IMG, MAP, AREA")
                        {
                                cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords );
                        }
                        {
                                cel = new wxHtmlImageMapAreaCell( wxHtmlImageMapAreaCell::RECT, coords );
                        }

-                       if (cel && tag.HasParam("HREF"))
+                       if (cel != NULL && tag.HasParam("HREF"))

                        {
                                wxString tmp = tag.GetParam("HREF");
                                cel->SetLink( tmp );
                        }
                        {
                                wxString tmp = tag.GetParam("HREF");
                                cel->SetLink( tmp );
                        }

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

                }
        }
 
                }
        }