SetFonts methods have const param now

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/htwindow.tex b/docs/latex/wx/htwindow.tex
index 3b426f8221e35778e114cb6f137d5dfde6c2c6e8..912719fa2f500ef4d5d8c10d03a15d3e51012439 100644 (file)
--- a/docs/latex/wx/htwindow.tex
+++ b/docs/latex/wx/htwindow.tex
@@ -117,7 +117,7 @@ this sets statusbar slot where messages will be displayed.
 
 \membersection{wxHtmlWindow::SetFonts}\label{wxhtmlwindowsetfonts}
 
-\func{void}{SetFonts}{\param{wxString }{normal\_face}, \param{int }{normal\_italic\_mode}, \param{wxString }{fixed\_face}, \param{int }{fixed\_italic\_mode}, \param{int }{*sizes}}
+\func{void}{SetFonts}{\param{wxString }{normal\_face}, \param{int }{normal\_italic\_mode}, \param{wxString }{fixed\_face}, \param{int }{fixed\_italic\_mode}, \param{const int }{*sizes}}
 
 This function sets font sizes and faces.
 

diff --git a/docs/latex/wx/htwinprs.tex b/docs/latex/wx/htwinprs.tex
index 0fa178d9df903eb6f3e6b52da3b9620bc288d566..6bb22d25c6c099f262ef44b8f6a519c78e9ee1ac 100644 (file)
--- a/docs/latex/wx/htwinprs.tex
+++ b/docs/latex/wx/htwinprs.tex
@@ -78,7 +78,7 @@ title only if some window is associated, otherwise it does nothing)
 
 \membersection{wxHtmlWinParser::SetFonts}\label{wxhtmlwinparsersetfonts}
 
-\func{void}{SetFonts}{\param{wxString }{normal\_face}, \param{int }{normal\_italic\_mode}, \param{wxString }{fixed\_face}, \param{int }{fixed\_italic\_mode}, \param{int }{*sizes}}
+\func{void}{SetFonts}{\param{wxString }{normal\_face}, \param{int }{normal\_italic\_mode}, \param{wxString }{fixed\_face}, \param{int }{fixed\_italic\_mode}, \param{const int }{*sizes}}
 
 Sets fonts. This method is identical to \helpref{wxHtmlWindow::SetFonts}{wxhtmlwindowsetfonts}
 

diff --git a/include/wx/html/htmlwin.h b/include/wx/html/htmlwin.h
index c0cb02a3fc4cfb8ae470a4bad2eb87fc7eecfd7e..027064aefb511634fe514d2887901a39878287dd 100644 (file)
--- a/include/wx/html/htmlwin.h
+++ b/include/wx/html/htmlwin.h
@@ -56,14 +56,8 @@ class WXDLLEXPORT HtmlHistoryItem : public wxObject
         int m_Pos;
 };
 
-#undef WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL WXDLLEXPORT
-     // ?? Don't know why - but Allen Van Sickel reported it to fix problems with DLL
 
-WX_DECLARE_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
-
-#undef WXDLLEXPORTLOCAL
-#define WXDLLEXPORTLOCAL
+WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
 
 
 class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
@@ -107,7 +101,7 @@ class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
                 // after(!) calling SetRelatedFrame, this sets statusbar slot where messages
                 // will be displayed. Default is -1 = no messages.
 
-        void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes);
+        void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes);
                 // sets fonts to be used when displaying HTML page.
                 // *_italic_mode can be either wxSLANT or wxITALIC
 

diff --git a/include/wx/html/winpars.h b/include/wx/html/winpars.h
index 5eca52c7055967b2b075e1db8088cc6844e12da0..34765ac387e2001eb3402f283f66cf312d5722f6 100644 (file)
--- a/include/wx/html/winpars.h
+++ b/include/wx/html/winpars.h
@@ -35,13 +35,10 @@ class wxHtmlTagsModule;
 
 class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser
 {
-    DECLARE_DYNAMIC_CLASS(wxHtmlWinParser)
-
     friend class wxHtmlWindow;
 
     public:
-        wxHtmlWinParser() : wxHtmlParser() {wxHtmlWinParser(NULL);}
-        wxHtmlWinParser(wxWindow *wnd);
+        wxHtmlWinParser(wxWindow *wnd = NULL);
 
         virtual void InitParser(const wxString& source);
         virtual void DoneParser();
@@ -60,7 +57,7 @@ class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser
         wxWindow *GetWindow() {return m_Window;}
                 // returns associated wxWindow
 
-        void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, int *sizes);
+        void SetFonts(wxString normal_face, int normal_italic_mode, wxString fixed_face, int fixed_italic_mode, const int *sizes);
                 // sets fonts to be used when displaying HTML page.
                 // *_italic_mode can be either wxSLANT or wxITALIC
 

diff --git a/src/html/htmlwin.cpp b/src/html/htmlwin.cpp
index 7d81aecc17ea02843747d3a657403eeff4c6d491..11570576e3691bdb3fe5d3ce838afc4faf277b54 100644 (file)
--- a/src/html/htmlwin.cpp
+++ b/src/html/htmlwin.cpp
@@ -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);

diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp
index 4e27d50788f47aa35482c64fae8866b64ee99d5f..2764a914d0d3564c179d102d5898a221e2723041 100644 (file)
--- a/src/html/winpars.cpp
+++ b/src/html/winpars.cpp
@@ -34,7 +34,6 @@
 // wxHtmlWinParser
 //-----------------------------------------------------------------------------
 
-IMPLEMENT_DYNAMIC_CLASS(wxHtmlWinParser,wxHtmlParser)
 
 wxList wxHtmlWinParser::m_Modules;
 
@@ -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;