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

allow using SetFont(wxNullFont) to reset the font as per documented behaviour (#3238)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@54664 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-07-16 15:53:44 +00:00
parent 063b161dec
commit 71d4b88bdf
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -121,6 +121,7 @@ wxMSW:
- Compile fix for WinCE in window.cpp (no VkKeyScan in Windows CE). - Compile fix for WinCE in window.cpp (no VkKeyScan in Windows CE).
- Fix quoting of arguments passed to wxExecute(char **) (Brian Ravnsgaard Riis). - Fix quoting of arguments passed to wxExecute(char **) (Brian Ravnsgaard Riis).
- Support disabling items before adding them to the menu (Christian Walther). - Support disabling items before adding them to the menu (Christian Walther).
- Allow to call SetFont(wxNullFont) to reset the font to default.
wxGTK: wxGTK:

6
src/msw/window.cpp
View File

@@ -811,7 +811,11 @@ bool wxWindowMSW::SetFont(const wxFont& font)
HWND hWnd = GetHwnd(); HWND hWnd = GetHwnd();
if ( hWnd != 0 ) if ( hWnd != 0 )
{ {
WXHANDLE hFont = m_font.GetResourceHandle(); // note the use of GetFont() instead of m_font: our own font could have
// just been reset and in this case we need to change the font used by
// the native window to the default for this class, i.e. exactly what
// GetFont() returns
WXHANDLE hFont = GetFont().GetResourceHandle();
wxASSERT_MSG( hFont, wxT("should have valid font") ); wxASSERT_MSG( hFont, wxT("should have valid font") );