X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f61815af20ebb943000d36ea01489f6115e4061c..275abf24e140159f2ac19b64b76737a6903b1319:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index cdebaa3927..946aa06c1a 100644 --- 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 +// RCS-ID: $Id$ // Copyright: (c) 1999 Vaclav Slavik // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -24,29 +25,9 @@ #include #endif -#include - -#include - -///// This is my own wxBusyCursor. It works only with one window. - -#if (defined __WXGTK__) && (wxVERSION_NUMBER < 2100) -class wxLocalBusyCursor -#else -class wxLocalBusyCursor : public wxBusyCursor -#endif -{ - private: - wxWindow *m_Wnd; - public: -#if (defined __WXGTK__) && (wxVERSION_NUMBER < 2100) - wxLocalBusyCursor(wxWindow *w) {m_Wnd = w; m_Wnd -> SetCursor(*wxHOURGLASS_CURSOR);} - ~wxLocalBusyCursor() {m_Wnd -> SetCursor(*wxSTANDARD_CURSOR);} -#else - wxLocalBusyCursor(wxWindow *w) : wxBusyCursor() {} -#endif -}; +#include "wx/html/htmlwin.h" +#include "wx/html/forcelnk.h" @@ -60,8 +41,8 @@ class wxLocalBusyCursor : public wxBusyCursor WX_DEFINE_OBJARRAY(HtmlHistoryArray) -wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, - const wxString& name, bool scrollable) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) +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; m_tmpCanDraw = TRUE; @@ -76,7 +57,7 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, SetBorders(10); m_HistoryPos = -1; m_HistoryOn = TRUE; - m_Scrollable = scrollable; + m_Style = style; SetPage(""); } @@ -109,9 +90,9 @@ void wxHtmlWindow::SetRelatedStatusBar(int 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); @@ -146,7 +127,7 @@ bool wxHtmlWindow::LoadPage(const wxString& location) { wxFSFile *f; bool rt_val; - wxLocalBusyCursor b(this); + wxBusyCursor b; m_tmpCanDraw = FALSE; if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item @@ -240,7 +221,7 @@ bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor) 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; @@ -267,16 +248,36 @@ void wxHtmlWindow::CreateLayout() int ClientWidth, ClientHeight; if (!m_Cell) return; - GetClientSize(&ClientWidth, &ClientHeight); - m_Cell -> Layout(ClientWidth); - if (m_Scrollable) - 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*/ ); + + if (m_Style == wxHW_SCROLLBAR_NEVER) { + SetScrollbars(1, 1, 0, 0); // always off + GetClientSize(&ClientWidth, &ClientHeight); + m_Cell -> Layout(ClientWidth); + } + + else { + GetClientSize(&ClientWidth, &ClientHeight); +#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); + 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*/); + } + 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) { @@ -389,13 +390,16 @@ void wxHtmlWindow::CleanUpStatics() { 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) { - m_Filters.DeleteContents(TRUE); m_Filters.Append(filter); }