use a smaller tip font for MSW

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

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 88bf5cc52972a224a80d393462bbafedba3e369c..b03d4d256a87617a19e7b57ae3d6ee8873902b94 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,9 +54,9 @@ 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);
     }
@@ -80,7 +79,7 @@ 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, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes)
 {
     for (int i = 0; i < 7; i++) m_FontsSizes[i] = sizes[i];
     m_FontFaceFixed = fixed_face;
@@ -107,7 +106,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
     m_Link = "";
     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 +132,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 +166,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;
 
@@ -285,5 +284,5 @@ bool wxHtmlTagsModule::OnInit()
 void wxHtmlTagsModule::OnExit()
 {
 }
+#endif
 
-#endif
\ No newline at end of file