Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SetFonts methods have const param now

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4021 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-10-16 12:27:35 +00:00
parent d95e254418
commit 89966d5c0d
6 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/latex/wx/htwindow.tex
View File

@@ -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.

2
docs/latex/wx/htwinprs.tex
View File

@@ -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}

10
include/wx/html/htmlwin.h
View File

@@ -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

7
include/wx/html/winpars.h
View File

@@ -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

2
src/html/htmlwin.cpp
View File

@@ -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);

3
src/html/winpars.cpp
View File

@@ -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;