Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added two-step creation of wxHtmlWindow

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2001-11-27 18:13:53 +00:00
parent 954cc8d2f2
commit 4f41713093
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/html/htmlwin.h
View File

@@ -49,14 +49,24 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
friend class wxHtmlWinModule; friend class wxHtmlWinModule;
public: public:
wxHtmlWindow() : wxScrolledWindow() {} wxHtmlWindow() { Init(); }
wxHtmlWindow(wxWindow *parent, wxWindowID id = -1, wxHtmlWindow(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize, const wxSize& size = wxDefaultSize,
long style = wxHW_SCROLLBAR_AUTO, long style = wxHW_SCROLLBAR_AUTO,
const wxString& name = wxT("htmlWindow")); const wxString& name = wxT("htmlWindow"))
{
Init();
Create(parent, id, pos, size, style, name);
}
~wxHtmlWindow(); ~wxHtmlWindow();
bool Create(wxWindow *parent, wxWindowID id = -1,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
long style = wxHW_SCROLLBAR_AUTO,
const wxString& name = wxT("htmlWindow"));
// Set HTML page and display it. !! source is HTML document itself, // Set HTML page and display it. !! source is HTML document itself,
// it is NOT address/filename of HTML document. If you want to // it is NOT address/filename of HTML document. If you want to
// specify document location, use LoadPage() istead // specify document location, use LoadPage() istead
@@ -153,6 +163,8 @@ public:
virtual bool AcceptsFocusFromKeyboard() const { return FALSE; } virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
protected: protected:
void Init();
// Scrolls to anchor of this name. (Anchor is #news // Scrolls to anchor of this name. (Anchor is #news
// or #features etc. it is part of address sometimes: // or #features etc. it is part of address sometimes:
// http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/index.html#news) // http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/index.html#news)

20
src/html/htmlwin.cpp
View File

@@ -72,8 +72,7 @@ WX_DEFINE_LIST(wxHtmlProcessorList);
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, void wxHtmlWindow::Init()
long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)
{ {
m_tmpMouseMoved = FALSE; m_tmpMouseMoved = FALSE;
m_tmpLastLink = NULL; m_tmpLastLink = NULL;
@@ -87,15 +86,26 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
m_Cell = NULL; m_Cell = NULL;
m_Parser = new wxHtmlWinParser(this); m_Parser = new wxHtmlWinParser(this);
m_Parser->SetFS(m_FS); m_Parser->SetFS(m_FS);
SetBorders(10);
m_HistoryPos = -1; m_HistoryPos = -1;
m_HistoryOn = TRUE; m_HistoryOn = TRUE;
m_History = new wxHtmlHistoryArray; m_History = new wxHtmlHistoryArray;
m_Processors = NULL; m_Processors = NULL;
m_Style = style; m_Style = 0;
SetPage(wxT("<html><body></body></html>")); SetBorders(10);
} }
bool wxHtmlWindow::Create(wxWindow *parent, wxWindowID id,
const wxPoint& pos, const wxSize& size,
long style, const wxString& name)
{
if (!wxScrolledWindow::Create(parent, id, pos, size,
style | wxVSCROLL | wxHSCROLL, name))
return FALSE;
m_Style = style;
SetPage(wxT("<html><body></body></html>"));
return TRUE;
}
wxHtmlWindow::~wxHtmlWindow() wxHtmlWindow::~wxHtmlWindow()