fixed handling of the accelerators of menu items added to already attached submenus

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

diff --git a/src/html/m_layout.cpp b/src/html/m_layout.cpp
index 3b18c44a57906fe94266e5b3d55e29cb2f2f2d55..879f95a761418c422707ecb1dae9362db567e682 100644 (file)
--- a/src/html/m_layout.cpp
+++ b/src/html/m_layout.cpp
@@ -4,24 +4,26 @@
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik

-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 #pragma implementation
 #endif
 
 #include "wx/wxprec.h"
 
 #pragma implementation
 #endif
 
 #include "wx/wxprec.h"
 

-

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

+

 #if wxUSE_HTML && wxUSE_STREAMS
 #if wxUSE_HTML && wxUSE_STREAMS

+

 #ifdef __BORLANDC__
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WXPRECOMP
 #endif
 
 #endif
 
 #ifndef WXPRECOMP
 #endif
 

+#include "wx/image.h"

 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"
 
 #include "wx/html/forcelnk.h"
 #include "wx/html/m_templ.h"


@@ -30,8 +32,11 @@
 
 FORCE_LINK_ME(m_layout)
 
 
 FORCE_LINK_ME(m_layout)
 

-
-#include <stdlib.h> // bsearch()
+#ifdef __WXWINCE__
+    #include "wx/msw/wince/missing.h"       // for bsearch()
+#else
+    #include <stdlib.h>                     // bsearch()
+#endif

 
 //-----------------------------------------------------------------------------
 // wxHtmlPageBreakCell
 
 //-----------------------------------------------------------------------------
 // wxHtmlPageBreakCell


@@ -77,7 +82,7 @@ public:
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),
     void Draw(wxDC& WXUNUSED(dc),
               int WXUNUSED(x), int WXUNUSED(y),
               int WXUNUSED(view_y1), int WXUNUSED(view_y2),

-              wxHtmlRenderingState& WXUNUSED(state)) {}
+              wxHtmlRenderingInfo& WXUNUSED(info)) {}

 
 private:
     DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)
 
 private:
     DECLARE_NO_COPY_CLASS(wxHtmlPageBreakCell)


@@ -94,16 +99,16 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks,
     // When we are counting pages, 'known_pagebreaks' is non-NULL.
     // That's the only time we change 'pagebreak'. Otherwise, pages
     // were already counted, 'known_pagebreaks' is NULL, and we don't
     // When we are counting pages, 'known_pagebreaks' is non-NULL.
     // That's the only time we change 'pagebreak'. Otherwise, pages
     // were already counted, 'known_pagebreaks' is NULL, and we don't

-    // do anything except return FALSE.
+    // do anything except return false.

     //
     //

-    // We also simply return FALSE if the 'pagebreak' argument is
+    // We also simply return false if the 'pagebreak' argument is

     // less than (vertically above) or the same as the current
     // vertical position. Otherwise we'd be setting a pagebreak above
     // the current cell, which is incorrect, or duplicating a
     // pagebreak that has already been set.
     if(NULL == known_pagebreaks || *pagebreak <= m_PosY)
         {
     // less than (vertically above) or the same as the current
     // vertical position. Otherwise we'd be setting a pagebreak above
     // the current cell, which is incorrect, or duplicating a
     // pagebreak that has already been set.
     if(NULL == known_pagebreaks || *pagebreak <= m_PosY)
         {

-        return FALSE;
+        return false;

         }
 
     // m_PosY is only the vertical offset from the parent. The pagebreak
         }
 
     // m_PosY is only the vertical offset from the parent. The pagebreak


@@ -123,12 +128,12 @@ bool wxHtmlPageBreakCell::AdjustPagebreak(int* pagebreak, int* known_pagebreaks,
     // Add a pagebreak only if there isn't one already set here.
     if(NULL != where)
         {
     // Add a pagebreak only if there isn't one already set here.
     if(NULL != where)
         {

-        return FALSE;
+        return false;

         }
     else
         {
         *pagebreak = m_PosY;
         }
     else
         {
         *pagebreak = m_PosY;

-        return TRUE;
+        return true;

         }
 }
 
         }
 }
 


@@ -144,7 +149,7 @@ TAG_HANDLER_BEGIN(P, "P")
         }
         m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser->GetContainer()->SetAlign(tag);
         }
         m_WParser->GetContainer()->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_TOP);
         m_WParser->GetContainer()->SetAlign(tag);

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(P)
     }
 
 TAG_HANDLER_END(P)


@@ -164,7 +169,7 @@ TAG_HANDLER_BEGIN(BR, "BR")
         c->SetAlignHor(al);
         c->SetAlign(tag);
         c->SetMinHeight(m_WParser->GetCharHeight());
         c->SetAlignHor(al);
         c->SetAlign(tag);
         c->SetMinHeight(m_WParser->GetCharHeight());

-        return FALSE;
+        return false;

     }
 
 TAG_HANDLER_END(BR)
     }
 
 TAG_HANDLER_END(BR)


@@ -201,9 +206,9 @@ TAG_HANDLER_BEGIN(CENTER, "CENTER")
             else
                 c->SetAlignHor(old);
 
             else
                 c->SetAlignHor(old);
 

-            return TRUE;
+            return true;

         }
         }

-        else return FALSE;
+        else return false;

     }
 
 TAG_HANDLER_END(CENTER)
     }
 
 TAG_HANDLER_END(CENTER)


@@ -217,18 +222,18 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
     {
         if(tag.HasParam(wxT("STYLE")))
         {
     {
         if(tag.HasParam(wxT("STYLE")))
         {

-            if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), FALSE))
+            if(tag.GetParam(wxT("STYLE")).IsSameAs(wxT("PAGE-BREAK-BEFORE:ALWAYS"), false))

             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer()->InsertCell(new wxHtmlPageBreakCell);
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();
             {
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer()->InsertCell(new wxHtmlPageBreakCell);
                 m_WParser->CloseContainer();
                 m_WParser->OpenContainer();

-                return FALSE;
+                return false;

             }
             else
             {
                 // Treat other STYLE parameters here when they're supported.
             }
             else
             {
                 // Treat other STYLE parameters here when they're supported.

-                return FALSE;
+                return false;

             }
         }
         else if(tag.HasParam(wxT("ALIGN")))
             }
         }
         else if(tag.HasParam(wxT("ALIGN")))


@@ -260,11 +265,20 @@ TAG_HANDLER_BEGIN(DIV, "DIV")
             else
                 c->SetAlignHor(old);
 
             else
                 c->SetAlignHor(old);
 

-            return TRUE;
+            return true;

         }
         else
         {
         }
         else
         {

-            return FALSE;
+            // Same as BR
+            int al = m_WParser->GetContainer()->GetAlignHor();
+            wxHtmlContainerCell *c;
+
+            m_WParser->CloseContainer();
+            c = m_WParser->OpenContainer();
+            c->SetAlignHor(al);
+            c->SetAlign(tag);
+            c->SetMinHeight(m_WParser->GetCharHeight());
+            return false;

         }
     }
 
         }
     }
 


@@ -283,12 +297,18 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
             wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
             if (wfr)
             {
             wxHtmlWindow *wfr = (wxHtmlWindow*)(m_WParser->GetWindow());
             if (wfr)
             {

-                const wxString& src = *m_WParser->GetSource();
-                wfr->OnSetTitle(src.Mid(tag.GetBeginPos(), 
-                                        tag.GetEndPos1()-tag.GetBeginPos()));
+                wxString title = m_WParser->GetSource()->Mid(
+                                        tag.GetBeginPos(),
+                                        tag.GetEndPos1()-tag.GetBeginPos());
+#if !wxUSE_UNICODE && wxUSE_WCHAR_T
+                wxCSConv conv(m_WParser->GetInputEncoding());
+                title = wxString(title.wc_str(conv), wxConvLocal);
+#endif
+                title = m_WParser->GetEntitiesParser()->Parse(title);
+                wfr->OnSetTitle(title);

             }
         }
             }
         }

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(TITLE)
     }
 
 TAG_HANDLER_END(TITLE)


@@ -312,6 +332,25 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
         if (tag.GetParamAsColour(wxT("LINK"), &clr))
             m_WParser->SetLinkColor(clr);
 
         if (tag.GetParamAsColour(wxT("LINK"), &clr))
             m_WParser->SetLinkColor(clr);
 

+        if (tag.HasParam(wxT("BACKGROUND")))
+        {
+            wxFSFile *fileBgImage = m_WParser->OpenURL
+                                               (
+                                                wxHTML_URL_IMAGE,
+                                                tag.GetParam(wxT("BACKGROUND"))
+                                               );
+            if ( fileBgImage )
+            {
+                wxInputStream *is = fileBgImage->GetStream();
+                if ( is )
+                {
+                    wxImage image(*is);
+                    if ( image.Ok() )
+                        m_WParser->GetWindow()->SetBackgroundImage(image);
+                }
+            }
+        }
+

         if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))
         {
             m_WParser->GetContainer()->InsertCell(
         if (tag.GetParamAsColour(wxT("BGCOLOR"), &clr))
         {
             m_WParser->GetContainer()->InsertCell(


@@ -319,7 +358,8 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
             if (m_WParser->GetWindow() != NULL)
                 m_WParser->GetWindow()->SetBackgroundColour(clr);
         }
             if (m_WParser->GetWindow() != NULL)
                 m_WParser->GetWindow()->SetBackgroundColour(clr);
         }

-        return FALSE;
+
+        return false;

     }
 
 TAG_HANDLER_END(BODY)
     }
 
 TAG_HANDLER_END(BODY)


@@ -348,7 +388,7 @@ TAG_HANDLER_BEGIN(BLOCKQUOTE, "BLOCKQUOTE")
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_BOTTOM);
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();
         c->SetIndent(m_WParser->GetCharHeight(), wxHTML_INDENT_BOTTOM);
         m_WParser->CloseContainer();
         m_WParser->OpenContainer();

-        return TRUE;
+        return true;

     }
 
 TAG_HANDLER_END(BLOCKQUOTE)
     }
 
 TAG_HANDLER_END(BLOCKQUOTE)