wrong directory

[wxWidgets.git] / src / html / htmlwin.cpp
diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp

index 7d79fe5523c97a1d7de1c31ea4af8f642d1cb929..5166612f44650595026ba56968568a05175526b2 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();
@@ -204,13 +214,12 @@ bool wxHtmlWindow::AppendToPage(const wxString& source)
  
  bool wxHtmlWindow::LoadPage(const wxString& location)
  {
+    wxBusyCursor busyCursor;
+    
      wxFSFile *f;
      bool rt_val;
      bool needs_refresh = FALSE;
  
-    SetCursor(*wxHOURGLASS_CURSOR);
-    wxYield(); Refresh(FALSE);
-
      m_tmpCanDrawLocks++;
      if (m_HistoryOn && (m_HistoryPos != -1))
      {
@@ -260,8 +269,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
          {
              wxLogError(_("Unable to open requested HTML document: %s"), location.c_str());
              m_tmpCanDrawLocks--;
-
-            SetCursor(*wxSTANDARD_CURSOR);
              return FALSE;
          }
  
@@ -326,7 +333,6 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
  
      if (m_OpenedPageTitle == wxEmptyString)
          OnSetTitle(wxFileNameFromPath(m_OpenedPage));
-    SetCursor(*wxSTANDARD_CURSOR);
  
      if (needs_refresh)
      {