compilation fix for non-threaded compilation (threads are still broken

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index b03d4d256a87617a19e7b57ae3d6ee8873902b94..38d76bf5604a665e7a3a8d3b28b091a711c09bf6 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -51,19 +51,21 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
             for (j = 0; j < 2; j++)
                 for (k = 0; k < 2; k++)
                     for (l = 0; l < 2; l++)
             for (j = 0; j < 2; j++)
                 for (k = 0; k < 2; k++)
                     for (l = 0; l < 2; l++)

-                        for (m = 0; m < 7; m++)
+                        for (m = 0; m < 7; m++) {

                             m_FontsTable[i][j][k][l][m] = NULL;
                             m_FontsTable[i][j][k][l][m] = NULL;

+                            m_FontsFacesTable[i][j][k][l][m] = wxEmptyString;
+                        }

 #ifdef __WXMSW__
         static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30};
 #else
         static int default_sizes[7] = {10, 12, 14, 16, 19, 24, 32};
 #endif
 #ifdef __WXMSW__
         static int default_sizes[7] = {7, 8, 10, 12, 16, 22, 30};
 #else
         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();
     }
 
     // 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();
         wxHtmlTagsModule *mod = (wxHtmlTagsModule*) node -> GetData();
         mod -> FillHandlersTable(this);
         node = node -> GetNext();


@@ -79,13 +81,24 @@ void wxHtmlWinParser::AddModule(wxHtmlTagsModule *module)
 
 
 
 
 
 

-void wxHtmlWinParser::SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const 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_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;
+                        }
+                    }

 }
 
 
 }
 
 


@@ -96,14 +109,15 @@ 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;
     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 
                  */
 
     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 = wxHTML_ALIGN_LEFT;
     m_LinkColor.Set(0, 0, 0xFF);
     m_ActualColor.Set(0, 0, 0);
     m_Align = wxHTML_ALIGN_LEFT;


@@ -140,28 +154,6 @@ wxObject* wxHtmlWinParser::GetProduct()
 
 
 
 
 
 

-wxList* wxHtmlWinParser::GetTempData()
-{
-    int i, j, k, l, m;
-    wxFont *f;
-    wxList *lst = wxHtmlParser::GetTempData();
-
-    if (lst == NULL) lst = new wxList;
-    lst -> DeleteContents(TRUE);
-
-    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++) {
-                        f = m_FontsTable[i][j][k][l][m];
-                        if (f) lst -> Append(f);
-                    }
-    return lst;
-}
-
-
-

 void wxHtmlWinParser::AddText(const char* txt)
 {
     wxHtmlCell *c;
 void wxHtmlWinParser::AddText(const char* txt)
 {
     wxHtmlCell *c;


@@ -231,6 +223,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()
 {
 
 wxFont* wxHtmlWinParser::CreateCurrentFont()
 {


@@ -238,20 +238,36 @@ wxFont* wxHtmlWinParser::CreateCurrentFont()
         fi = GetFontItalic(),
         fu = GetFontUnderlined(),
         ff = GetFontFixed(),
         fi = GetFontItalic(),
         fu = GetFontUnderlined(),
         ff = GetFontFixed(),

-        fs = GetFontSize() + 2 /*remap from <-2;4> to <0;7>*/ ;
-
-    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,
-                fb ? wxBOLD : wxNORMAL,
-                fu ? TRUE : FALSE, ff ? m_FontFaceFixed : m_FontFaceNormal);
+        fs = GetFontSize() - 1 /*remap from <1;7> to <0;6>*/ ;
+
+    wxString face = ff ? m_FontFaceFixed : m_FontFaceNormal;
+    wxString *faceptr = &(m_FontsFacesTable[fb][fi][fu][ff][fs]);
+    wxFont **fontptr = &(m_FontsTable[fb][fi][fu][ff][fs]);
+
+    if (*fontptr != NULL && *faceptr != face) {
+        delete *fontptr;
+        *fontptr = NULL;

     }
     }

-    m_DC -> SetFont(*(m_FontsTable[fb][fi][fu][ff][fs]));
-    return (m_FontsTable[fb][fi][fu][ff][fs]);
+
+    if (*fontptr == NULL) {
+        *faceptr = face;
+        *fontptr = new wxFont(
+                       m_FontsSizes[fs] * m_PixelScale,
+                       ff ? wxMODERN : wxSWISS,
+                       fi ? wxITALIC : wxNORMAL,
+                       fb ? wxBOLD : wxNORMAL,
+                       fu ? TRUE : FALSE, face);
+    }
+    m_DC -> SetFont(**fontptr);
+    return (*fontptr);
+}
+
+
+
+void wxHtmlWinParser::SetLink(const wxHtmlLinkInfo& link)
+{
+    m_Link = link; 
+    m_UseLink = (link.GetHref() != wxEmptyString);

 }
 
 
 }