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

removed wxITALIC/wxSLANT stuff from wxHTML (no longer neccessary, we have intelligent font matching) - affects SetFonts method of wxHtmlWindow, wxHtmlWinParser and private stuff in wxHtmlHelpFrame

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5083 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
1999-12-23 18:14:26 +00:00
parent 921d0fb195
commit 8eb2940f7f
8 changed files with 20 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/html/helpfrm.h
View File

@@ -213,7 +213,6 @@ class WXDLLEXPORT wxHtmlHelpFrame : public wxFrame
wxArrayString *m_NormalFonts, *m_FixedFonts;
int m_FontSize; // 0,1,2 = small,medium,big
wxString m_NormalFace, m_FixedFace;
int m_NormalItalic, m_FixedItalic;
protected:
void Init(wxHtmlHelpData* data = NULL);

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

@@ -60,6 +60,7 @@ class WXDLLEXPORT HtmlHistoryItem : public wxObject
WX_DECLARE_EXPORTED_OBJARRAY(HtmlHistoryItem, HtmlHistoryArray);
class WXDLLEXPORT wxHtmlWindow : public wxScrolledWindow
{
DECLARE_DYNAMIC_CLASS(wxHtmlWindow)
@@ -104,9 +105,8 @@ 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, const int *sizes);
void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes);
// sets fonts to be used when displaying HTML page.
// *_italic_mode can be either wxSLANT or wxITALIC
virtual void OnSetTitle(const wxString& title);
// Sets the title of the window

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

@@ -58,9 +58,8 @@ 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, const int *sizes);
void SetFonts(wxString normal_face, wxString fixed_face, const int *sizes);
// sets fonts to be used when displaying HTML page.
// *_italic_mode can be either wxSLANT or wxITALIC
virtual wxList* GetTempData();
@@ -147,7 +146,6 @@ class WXDLLEXPORT wxHtmlWinParser : public wxHtmlParser
// all of them are used, so many items in table are usually NULL.
int m_FontsSizes[7];
wxString m_FontFaceFixed, m_FontFaceNormal;
int m_ItalicModeFixed, m_ItalicModeNormal;
// html font sizes and faces of fixed and proportional fonts
};