// 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
/////////////////////////////////////////////////////////////////////////////
#include <wx/wx.h>
#endif
-#include <wx/html/htmlwin.h>
-
-#include <wx/html/forcelink.h>
-
-///// 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"
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;
SetBorders(10);
m_HistoryPos = -1;
m_HistoryOn = TRUE;
- m_Scrollable = scrollable;
+ m_Style = style;
SetPage("<html><body></body></html>");
}
{
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);
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);
{
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
wxString err;
err.Printf(_("The browser is unable to open requested location :\n\n%s"), WXSTRINGCAST location);
- wxMessageBox(err, "Error");
m_tmpCanDraw = TRUE;
+ Refresh();
+ wxMessageBox(err, "Error");
return FALSE;
}
}
node = node -> GetNext();
}
- if (src == wxEmptyString) src = m_DefaultFilter.ReadFile(*f);
+ if (src == wxEmptyString) {
+ if (m_DefaultFilter == NULL) m_DefaultFilter = GetDefaultFilter();
+ src = m_DefaultFilter -> ReadFile(*f);
+ }
m_FS -> ChangePathTo(f -> GetLocation());
rt_val = SetPage(src);
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;
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)
{
wxList wxHtmlWindow::m_Filters;
-wxHtmlFilterPlainText wxHtmlWindow::m_DefaultFilter;
+wxHtmlFilter *wxHtmlWindow::m_DefaultFilter = NULL;
-void wxHtmlWindow::AddFilter(wxHtmlFilter *filter)
+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.Append(filter);
}
+// A module to allow initialization/cleanup
+// without calling these functions from app.cpp or from
+// the user's application.
+
+class wxHtmlWinModule: public wxModule
+{
+DECLARE_DYNAMIC_CLASS(wxHtmlWinModule)
+public:
+ wxHtmlWinModule() : wxModule() {}
+ bool OnInit() { return TRUE; }
+ void OnExit() { wxHtmlWindow::CleanUpStatics(); }
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinModule, wxModule)
+
FORCE_LINK(mod_tables)
-#endif
\ No newline at end of file
+#endif
projects / wxWidgets.git / blobdiff