]> git.saurik.com Git - wxWidgets.git/commitdiff
projects / wxWidgets.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 954cc8d)
added two-step creation of wxHtmlWindow
authorVáclav Slavík <vslavik@fastmail.fm>
Tue, 27 Nov 2001 18:13:53 +0000 (18:13 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Tue, 27 Nov 2001 18:13:53 +0000 (18:13 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12732 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/html/htmlwin.h patch | blob | blame | history
src/html/htmlwin.cpp patch | blob | blame | history

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index 5ef878c088555e1b39d94cd4d24fafc42abe46c2..c58d244feb3999d2e305fbe34cb271547adf522f 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -49,14 +49,24 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
     friend class wxHtmlWinModule;
 
 public:
-    wxHtmlWindow() : wxScrolledWindow() {}
+    wxHtmlWindow() { Init(); }
     wxHtmlWindow(wxWindow *parent, wxWindowID id = -1,
                  const wxPoint& pos = wxDefaultPosition,
                  const wxSize& size = wxDefaultSize,
                  long style = wxHW_SCROLLBAR_AUTO,
-                 const wxString& name = wxT("htmlWindow"));
+                 const wxString& name = wxT("htmlWindow"))
+    {
+        Init();
+        Create(parent, id, pos, size, style, name);
+    }
     ~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,
     // it is NOT address/filename of HTML document. If you want to
     // specify document location, use LoadPage() istead
@@ -153,6 +163,8 @@ public:
     virtual bool AcceptsFocusFromKeyboard() const { return FALSE; }
 
 protected:
+    void Init();
+
     // Scrolls to anchor of this name. (Anchor is #news
     // or #features etc. it is part of address sometimes:
     // http://www.ms.mff.cuni.cz/~vsla8348/wxhtml/index.html#news)
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 7d79fe5523c97a1d7de1c31ea4af8f642d1cb929..6cf959cf5f1bcb788e129e68d1fa204ebb2e5ecd 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -72,8 +72,7 @@ WX_DEFINE_LIST(wxHtmlProcessorList);
 //-----------------------------------------------------------------------------
 
 
-wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size,
-                long style, const wxString& name) : wxScrolledWindow(parent, id, pos, size, style | wxVSCROLL | wxHSCROLL, name)
+void wxHtmlWindow::Init()
 {
     m_tmpMouseMoved = FALSE;
     m_tmpLastLink = NULL;
@@ -87,17 +86,28 @@ wxHtmlWindow::wxHtmlWindow(wxWindow *parent, wxWindowID id, const wxPoint& pos,
     m_Cell = NULL;
     m_Parser = new wxHtmlWinParser(this);
     m_Parser->SetFS(m_FS);
-    SetBorders(10);
     m_HistoryPos = -1;
     m_HistoryOn = TRUE;
     m_History = new wxHtmlHistoryArray;
     m_Processors = NULL;
+    m_Style = 0;
+    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()
 {
     HistoryClear();
wxWidgets (Impactor)