Headers moved a bit.

[wxWidgets.git] / src / html / htmlwin.cpp

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 7d81aecc17ea02843747d3a657403eeff4c6d491..ab653caf7b9ae4ca1b6558b5f3e5f4ca169464fe 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -12,7 +12,7 @@
 #pragma implementation
 #endif
 
-#include <wx/wxprec.h>
+#include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #if wxUSE_HTML
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef WXPRECOMP
-#include <wx/wx.h>
+#include "wx/wx.h"
 #endif
 
 #include "wx/html/htmlwin.h"
@@ -37,7 +37,7 @@
 
 
 
-#include <wx/arrimpl.cpp>
+#include "wx/arrimpl.cpp"
 WX_DEFINE_OBJARRAY(HtmlHistoryArray)
 
 
@@ -94,7 +94,7 @@ void wxHtmlWindow::SetRelatedStatusBar(int bar)
 
 
 
-void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes)
+void wxHtmlWindow::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes)
 {
     m_Parser -> SetFonts(normal_face, normal_italic_mode, fixed_face, fixed_italic_mode, sizes);
     if (!m_OpenedPage.IsEmpty()) LoadPage(m_OpenedPage);
@@ -116,8 +116,8 @@ bool wxHtmlWindow::SetPage(const wxString& source)
     }
     m_Cell = (wxHtmlContainerCell*) m_Parser -> Parse(source);
     delete dc;
-    m_Cell -> SetIndent(m_Borders, HTML_INDENT_ALL, HTML_UNITS_PIXELS);
-    m_Cell -> SetAlignHor(HTML_ALIGN_CENTER);
+    m_Cell -> SetIndent(m_Borders, wxHTML_INDENT_ALL, wxHTML_UNITS_PIXELS);
+    m_Cell -> SetAlignHor(wxHTML_ALIGN_CENTER);
     CreateLayout();
     Refresh();
     return TRUE;
@@ -128,7 +128,9 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 {
     wxFSFile *f;
     bool rt_val;
-    wxBusyCursor b;
+
+    SetCursor(*wxHOURGLASS_CURSOR);
+    wxYield();
 
     m_tmpCanDraw = FALSE;
     if (m_HistoryOn && (m_HistoryPos != -1)) { // store scroll position into history item
@@ -158,6 +160,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
             m_tmpCanDraw = TRUE;
             Refresh();
             wxMessageBox(err, "Error");
+
+            SetCursor(*wxSTANDARD_CURSOR);
             return FALSE;
         }
 
@@ -209,6 +213,8 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
         m_History.Add(new HtmlHistoryItem(m_OpenedPage, m_OpenedAnchor));
     }
 
+    SetCursor(*wxSTANDARD_CURSOR);
+
     m_tmpCanDraw = TRUE;
     Refresh();
     return rt_val;
@@ -218,13 +224,13 @@ bool wxHtmlWindow::LoadPage(const wxString& location)
 
 bool wxHtmlWindow::ScrollToAnchor(const wxString& anchor)
 {
-    const wxHtmlCell *c = m_Cell -> Find(HTML_COND_ISANCHOR, &anchor);
+    const wxHtmlCell *c = m_Cell -> Find(wxHTML_COND_ISANCHOR, &anchor);
     if (!c) return FALSE;
     else {
         int y;
 
         for (y = 0; c != NULL; c = c -> GetParent()) y += c -> GetPosY();
-        Scroll(-1, y / HTML_SCROLL_STEP);
+        Scroll(-1, y / wxHTML_SCROLL_STEP);
         m_OpenedAnchor = anchor;
         return TRUE;
     }
@@ -265,9 +271,9 @@ void wxHtmlWindow::CreateLayout()
         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
+            SetScrollbars(wxHTML_SCROLL_STEP, wxHTML_SCROLL_STEP,
+                          m_Cell -> GetWidth() / wxHTML_SCROLL_STEP,
+                          m_Cell -> GetHeight() / wxHTML_SCROLL_STEP
                           /*cheat: top-level frag is always container*/);
         }
            else { /* we fit into window, no need for scrollbars */
@@ -296,7 +302,7 @@ void wxHtmlWindow::ReadCustomization(wxConfigBase *cfg, wxString path)
     m_Parser -> m_ItalicModeFixed = cfg -> Read("wxHtmlWindow/ItalicModeFixed", m_Parser -> m_ItalicModeFixed);
     m_Parser -> m_ItalicModeNormal = cfg -> Read("wxHtmlWindow/ItalicModeNormal", m_Parser -> m_ItalicModeNormal);
     for (int i = 0; i < 7; i++) {
-        tmp.Printf("wxHtmlWindow/FontsSize%i", i);
+        tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
         m_Parser -> m_FontsSizes[i] = cfg -> Read(tmp, m_Parser -> m_FontsSizes[i]);
     }
 
@@ -322,7 +328,7 @@ void wxHtmlWindow::WriteCustomization(wxConfigBase *cfg, wxString path)
     cfg -> Write("wxHtmlWindow/ItalicModeFixed", (long) m_Parser -> m_ItalicModeFixed);
     cfg -> Write("wxHtmlWindow/ItalicModeNormal", (long) m_Parser -> m_ItalicModeNormal);
     for (int i = 0; i < 7; i++) {
-        tmp.Printf("wxHtmlWindow/FontsSize%i", i);
+        tmp.Printf(wxT("wxHtmlWindow/FontsSize%i"), i);
         cfg -> Write(tmp, (long) m_Parser -> m_FontsSizes[i]);
     }
 
@@ -430,7 +436,7 @@ void wxHtmlWindow::OnDraw(wxDC& dc)
     while (upd) {
         v_y = upd.GetY();
         v_h = upd.GetH();
-        if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * HTML_SCROLL_STEP + v_y, y * HTML_SCROLL_STEP + v_h + v_y);
+        if (m_Cell) m_Cell -> Draw(dc, 0, 0, y * wxHTML_SCROLL_STEP + v_y, y * wxHTML_SCROLL_STEP + v_h + v_y);
         upd++;
     }
 }
@@ -452,8 +458,8 @@ void wxHtmlWindow::OnKeyDown(wxKeyEvent& event)
     int sty, szy, cliy;
 
     ViewStart(&dummy, &sty);
-    GetClientSize(&dummy, &cliy); cliy /= HTML_SCROLL_STEP;
-    GetVirtualSize(&dummy, &szy); szy /= HTML_SCROLL_STEP;
+    GetClientSize(&dummy, &cliy); cliy /= wxHTML_SCROLL_STEP;
+    GetVirtualSize(&dummy, &szy); szy /= wxHTML_SCROLL_STEP;
 
     switch (event.KeyCode()) {
         case WXK_PAGEUP :
@@ -490,7 +496,7 @@ void wxHtmlWindow::OnMouseEvent(wxMouseEvent& event)
         wxPoint pos;
         wxString lnk;
 
-        ViewStart(&sx, &sy); sx *= HTML_SCROLL_STEP; sy *= HTML_SCROLL_STEP;
+        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
         pos = event.GetPosition();
 
         if (m_Cell)
@@ -509,7 +515,7 @@ void wxHtmlWindow::OnIdle(wxIdleEvent& event)
         int x, y;
         wxString lnk;
 
-        ViewStart(&sx, &sy); sx *= HTML_SCROLL_STEP; sy *= HTML_SCROLL_STEP;
+        ViewStart(&sx, &sy); sx *= wxHTML_SCROLL_STEP; sy *= wxHTML_SCROLL_STEP;
         wxGetMousePosition(&x, &y);
         ScreenToClient(&x, &y);
         lnk = m_Cell -> GetLink(sx + x, sy + y);