X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a76015e6ebf22e267c80f3740f3f7adc523b47e3..92afa2b150803da84a4bc7dfa4e580dbbff15c9a:/src/html/htmlwin.cpp diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp index b98f5fed9a..a149ca56cb 100644 --- a/src/html/htmlwin.cpp +++ b/src/html/htmlwin.cpp @@ -28,26 +28,6 @@ #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 -}; - - //----------------------------------------------------------------------------- @@ -61,7 +41,7 @@ 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) + long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, wxVSCROLL, name) { m_tmpMouseMoved = FALSE; m_tmpCanDraw = TRUE; @@ -76,7 +56,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(""); } @@ -128,7 +108,10 @@ bool wxHtmlWindow::SetPage(const wxString& source) SetBackgroundColour(wxColour(0xFF, 0xFF, 0xFF)); m_OpenedPage = m_OpenedAnchor = wxEmptyString; m_Parser -> SetDC(dc); - if (m_Cell) delete m_Cell; + if (m_Cell) { + delete m_Cell; + m_Cell = NULL; + } m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source); delete dc; m_Cell -> SetIndent(m_Borders, HTML_INDENT_ALL, HTML_UNITS_PIXELS); @@ -143,7 +126,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 @@ -264,13 +247,30 @@ 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); + SetScrollbars(1, 1, 0, ClientHeight * 2); // always on + GetClientSize(&ClientWidth, &ClientHeight); + m_Cell -> Layout(ClientWidth); + GetClientSize(&ClientWidth, &ClientHeight); + 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... + m_Cell -> Layout(ClientWidth); // ...and relayout + } + } }