Updated configure (not only configure.in)

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

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index a149ca56cbf83c359d7855d57760d3a05d551989..946aa06c1a60ef27ed05c8942734cfdfac70c5ca 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -2,6 +2,7 @@
 // Name:        htmlwin.cpp
 // Purpose:     wxHtmlWindow class for parsing & displaying HTML (implementation)
 // Author:      Vaclav Slavik
 // Name:        htmlwin.cpp
 // Purpose:     wxHtmlWindow class for parsing & displaying HTML (implementation)
 // Author:      Vaclav Slavik

+// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Vaclav Slavik
 // Licence:     wxWindows Licence
 /////////////////////////////////////////////////////////////////////////////


@@ -24,9 +25,9 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#include <wx/html/htmlwin.h>
+#include "wx/html/htmlwin.h"

 
 

-#include <wx/html/forcelink.h>
+#include "wx/html/forcelnk.h"

 
 
 
 
 
 


@@ -40,7 +41,7 @@
 WX_DEFINE_OBJARRAY(HtmlHistoryArray)
 
 
 WX_DEFINE_OBJARRAY(HtmlHistoryArray)
 
 

-wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, 
+wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,

                 long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
 {
     m_tmpMouseMoved = FALSE;
                 long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name)
 {
     m_tmpMouseMoved = FALSE;


@@ -89,9 +90,9 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar)
 {
     m_RelatedStatusBar = bar;
 }
 {
     m_RelatedStatusBar = bar;
 }

-        
-        
-        
+
+
+

 void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes)
 {
     m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
 void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes)
 {
     m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);


@@ -220,7 +221,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
     if (!c) return FALSE;
     else {
         int y;
     if (!c) return FALSE;
     else {
         int y;

-    
+

         for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY();
         Scroll(-1, y / HTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;
         for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY();
         Scroll(-1, y / HTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;


@@ -256,24 +257,27 @@ void wxHtmlWindow::CreateLayout()
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);
 
     else {
         GetClientSize(&ClientWidth, &ClientHeight);

-        SetScrollbars(1, 1, 0, ClientHeight * 2); // always on          
+#ifndef __WXMSW__
+        // VS : this looks extremely ugly under windoze, better fix needed!
+        SetScrollbars(1, 1, 0, ClientHeight * 2); // always on
+#endif

         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);
         GetClientSize(&ClientWidth, &ClientHeight);
         m_Cell -> Layout(ClientWidth);

-        GetClientSize(&ClientWidth, &ClientHeight);
-       if (ClientHeight < m_Cell -> GetHeight()) {
+       if (ClientHeight < m_Cell -> GetHeight()) {

             SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP,
                           m_Cell -> GetWidth() / HTML_SCROLL_STEP,
                           m_Cell -> GetHeight() / HTML_SCROLL_STEP
                           /*cheat: top-level frag is always container*/);
         }
             SetScrollbars(HTML_SCROLL_STEP, HTML_SCROLL_STEP,
                           m_Cell -> GetWidth() / HTML_SCROLL_STEP,
                           m_Cell -> GetHeight() / HTML_SCROLL_STEP
                           /*cheat: top-level frag is always container*/);
         }

-       else { /* we fit into window, no need for scrollbars */
-           SetScrollbars(1, 1, 0, 0); // disable...
-           m_Cell -> Layout(ClientWidth); // ...and relayout
-       }
+           else { /* we fit into window, no need for scrollbars */
+               SetScrollbars(1, 1, 0, 0); // disable...
+                GetClientSize(&ClientWidth, &ClientHeight);
+               m_Cell -> Layout(ClientWidth); // ...and relayout
+           }

     }
 }
 
     }
 }
 

-        
+

 
 void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
 {
 
 void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
 {


@@ -386,13 +390,16 @@ void wxHtmlWindow::CleanUpStatics()
 {
     if (m_DefaultFilter) delete m_DefaultFilter;
     m_DefaultFilter = NULL;
 {
     if (m_DefaultFilter) delete m_DefaultFilter;
     m_DefaultFilter = NULL;

+    wxNode* node = m_Filters.GetFirst();
+    m_Filters.DeleteContents(TRUE);
+    m_Filters.Clear();
+

 }
 
 
 
 void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 {
 }
 
 
 
 void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
 {

-    m_Filters.DeleteContents(TRUE);

     m_Filters.Append(filter);
 }
 
     m_Filters.Append(filter);
 }