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

removed separate wxSYS_ICONTITLE_FONT; made it the same as wxSYS_DEFAULT_GUI_FONT

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26450 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2004-03-29 11:11:59 +00:00
parent 395a82b13f
commit d09dd96e31
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/latex/wx/settings.tex
View File

@@ -87,9 +87,9 @@ Returns a system font.
\twocolitem{{\bf wxSYS\_SYSTEM\_FONT}}{System font.} \twocolitem{{\bf wxSYS\_SYSTEM\_FONT}}{System font.}
\twocolitem{{\bf wxSYS\_DEVICE\_DEFAULT\_FONT}}{Device-dependent font (Windows NT only).} \twocolitem{{\bf wxSYS\_DEVICE\_DEFAULT\_FONT}}{Device-dependent font (Windows NT only).}
\twocolitem{{\bf wxSYS\_DEFAULT\_GUI\_FONT}}{Default font for user interface \twocolitem{{\bf wxSYS\_DEFAULT\_GUI\_FONT}}{Default font for user interface
objects such as menus and dialog boxes.} objects such as menus and dialog boxes. Note that with modern GUIs nothing
\twocolitem{{\bf wxSYS\_ICONTITLE\_FONT}}{Font for the icon titles (Windows guarantees that the same font is used for all GUI elements, so some controls
only, same as default GUI font on other platforms} might use a different font by default.}
\end{twocollist} \end{twocollist}
\pythonnote{This static method is implemented in Python as a \pythonnote{This static method is implemented in Python as a

7
include/wx/settings.h
View File

@@ -29,10 +29,9 @@ enum wxSystemFont
wxSYS_DEFAULT_PALETTE, wxSYS_DEFAULT_PALETTE,
wxSYS_SYSTEM_FIXED_FONT, wxSYS_SYSTEM_FIXED_FONT,
wxSYS_DEFAULT_GUI_FONT, wxSYS_DEFAULT_GUI_FONT,
wxSYS_ICONTITLE_FONT
#ifndef __WXMSW__ // this was just a temporary aberration, do not use it any more
= wxSYS_DEFAULT_GUI_FONT wxSYS_ICONTITLE_FONT = wxSYS_DEFAULT_GUI_FONT
#endif
}; };
// possible values for wxSystemSettings::GetColour() parameter // possible values for wxSystemSettings::GetColour() parameter