removed separate wxSYS_ICONTITLE_FONT; made it the same as wxSYS_DEFAULT_GUI_FONT

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

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

diff --git a/include/wx/settings.h b/include/wx/settings.h
index 4d4f6804578d4741611a9faa0b2323a26c8ab5cc..4ed8c4c64ad0fdde97a43557be72f59c92984feb 100644 (file)
--- a/include/wx/settings.h
+++ b/include/wx/settings.h
@@ -29,10 +29,9 @@ enum wxSystemFont
     wxSYS_DEFAULT_PALETTE,
     wxSYS_SYSTEM_FIXED_FONT,
     wxSYS_DEFAULT_GUI_FONT,
-    wxSYS_ICONTITLE_FONT
-#ifndef __WXMSW__
-    = wxSYS_DEFAULT_GUI_FONT
-#endif
+
+    // this was just a temporary aberration, do not use it any more
+    wxSYS_ICONTITLE_FONT = wxSYS_DEFAULT_GUI_FONT
 };
 
 // possible values for wxSystemSettings::GetColour() parameter