Some little compilation fixes, etc.

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 684e5a755b5ba5bf41fb2a7f800710a3562dcea1..3de90241e001ee2c052da51de66063461fba891e 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.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/htmldefs.h"
@@ -34,7 +34,6 @@
 // wxHtmlWinParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinParser,wxHtmlParser)
 
 wxList wxHtmlWinParser::m_Modules;
 
@@ -55,16 +54,16 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
                         for (m = 0; m < 7; m++)
                             m_FontsTable[i][j][k][l][m] = NULL;
 #ifdef __WXMSW__
-        int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30};
+        static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30};
 #else
-        int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32};
+        static int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32};
 #endif
-        SetFonts("", wxSLANT, "", wxSLANT, default_sizes);
+        SetFonts("", "", default_sizes);
     }
 
     // fill in wxHtmlParser's tables:
     wxNode *node = m_Modules.GetFirst();
-    while (node){
+    while (node) {
         wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node -> GetData();
         mod -> FillHandlersTable(this);
         node = node -> GetNext();
@@ -80,13 +79,24 @@ void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module)
 
 
 
-void wxHtmlWinParser::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes)
+void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const int *sizes)
 {
-    for (int i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
+    int i, j, k, l, m;
+
+    for (i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
     m_FontFaceFixed = fixed_face;
     m_FontFaceNormal = normal_face;
-    m_ItalicModeFixed = fixed_italic_mode;
-    m_ItalicModeNormal = normal_italic_mode;
+
+    for (i = 0; i < 2; i++)
+        for (j = 0; j < 2; j++)
+            for (k = 0; k < 2; k++)
+                for (l = 0; l < 2; l++)
+                    for (m = 0; m < 7; m++) {
+                        if (m_FontsTable[i][j][k][l][m] != NULL) {
+                            delete m_FontsTable[i][j][k][l][m];
+                            m_FontsTable[i][j][k][l][m] = NULL;
+                        }
+                    }
 }
 
 
@@ -97,17 +107,18 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     wxASSERT_MSG(m_DC != NULL, _("no DC assigned to wxHtmlWinParser!!"));
 
     m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
-    m_FontSize = 0;
+    m_FontSize = 3; //default one
     CreateCurrentFont();           // we're selecting default font into
     m_DC -> GetTextExtent("H", &m_CharWidth, &m_CharHeight);
                 /* NOTE : we're not using GetCharWidth/Height() because
                    of differences under X and win 
                  */
 
-    m_Link = "";
+    m_UseLink = FALSE;
+    m_Link = wxHtmlLinkInfo("", "");
     m_LinkColor.Set(0, 0, 0xFF);
     m_ActualColor.Set(0, 0, 0);
-    m_Align = HTML_ALIGN_LEFT;
+    m_Align = wxHTML_ALIGN_LEFT;
     m_tmpLastWasSpace = FALSE;
 
     OpenContainer();
@@ -133,7 +144,7 @@ wxObject* wxHtmlWinParser::GetProduct()
 
     CloseContainer();
     OpenContainer();
-    GetContainer() -> SetIndent(m_CharHeight, HTML_INDENT_TOP);
+    GetContainer() -> SetIndent(m_CharHeight, wxHTML_INDENT_TOP);
     top = m_Container;
     while (top -> GetParent()) top = top -> GetParent();
     return top;
@@ -167,7 +178,7 @@ void wxHtmlWinParser::AddText(const char* txt)
 {
     wxHtmlCell *c;
     int i = 0, x, lng = strlen(txt);
-    char temp[HTML_BUFLEN];
+    char temp[wxHTML_BUFLEN];
     register char d;
     int templen = 0;
 
@@ -232,6 +243,14 @@ wxHtmlContainerCell* wxHtmlWinParser::CloseContainer()
 }
 
 
+void wxHtmlWinParser::SetFontSize(int s)
+{
+    if (s < 1) s = 1;
+    else if (s > 7) s = 7;
+    m_FontSize = s;
+}
+
+
 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {
@@ -239,15 +258,14 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
         fi = GetFontItalic(),
         fu = GetFontUnderlined(),
         ff = GetFontFixed(),
-        fs = GetFontSize() + 2 /*remap from <-2;4> to <0;7>*/ ;
+        fs = GetFontSize() - 1 /*remap from <1;7> to <0;6>*/ ;
 
     if (m_FontsTable[fb][fi][fu][ff][fs] == NULL) {
         m_FontsTable[fb][fi][fu][ff][fs] =
-            //wxTheFontList -> FindOrCreateFont(
             new wxFont(
-            m_FontsSizes[fs],
-            ff ? wxMODERN : wxSWISS,
-                fi ? (ff ? m_ItalicModeFixed : m_ItalicModeNormal) : wxNORMAL,
+                m_FontsSizes[fs] * m_PixelScale,
+                ff ? wxMODERN : wxSWISS,
+                fi ? wxITALIC : wxNORMAL,
                 fb ? wxBOLD : wxNORMAL,
                 fu ? TRUE : FALSE, ff ? m_FontFaceFixed : m_FontFaceNormal);
     }
@@ -257,6 +275,14 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
 
 
 
+void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link)
+{
+    m_Link = link; 
+    m_UseLink = (link.GetHref() != wxEmptyString);
+}
+
+
+
 
 //-----------------------------------------------------------------------------
 // wxHtmlWinTagHandler