From 89966d5c0d85da5fe64c58b9064af5e89db400e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sat, 16 Oct 1999 12:27:35 +0000 Subject: [PATCH] SetFonts methods have const param now git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/htwindow.tex | 2 +- docs/latex/wx/htwinprs.tex | 2 +- include/wx/html/htmlwin.h | 10 ++-------- include/wx/html/winpars.h | 7 ++----- src/html/htmlwin.cpp | 2 +- src/html/winpars.cpp | 3 +-- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/docs/latex/wx/htwindow.tex b/docs/latex/wx/htwindow.tex index 3b426f8221..912719fa2f 100644 --- 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 0fa178d9df..6bb22d25c6 100644 --- 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 c0cb02a3fc..027064aefb 100644 --- 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 5eca52c705..34765ac387 100644 --- 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 7d81aecc17..11570576e3 100644 --- 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 4e27d50788..2764a914d0 100644 --- 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; -- 2.45.2