don't allow setting an invalid font

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index f01f370d2e15bbf044f4fbf12e1cc5ee979be884..dc90bf665aff7ff1a9e4adb160e4fee08c1a4fcf 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -1580,6 +1580,8 @@ void wxWindowDC::Clear()
 
 void wxWindowDC::SetFont( const wxFont &font )
 {
 
 void wxWindowDC::SetFont( const wxFont &font )
 {

+    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
+

     m_font = font;
 #ifdef __WXGTK20__
     // fix fontdesc?
     m_font = font;
 #ifdef __WXGTK20__
     // fix fontdesc?

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index f01f370d2e15bbf044f4fbf12e1cc5ee979be884..dc90bf665aff7ff1a9e4adb160e4fee08c1a4fcf 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -1580,6 +1580,8 @@ void wxWindowDC::Clear()
 
 void wxWindowDC::SetFont( const wxFont &font )
 {
 
 void wxWindowDC::SetFont( const wxFont &font )
 {

+    wxCHECK_RET( font.Ok(), _T("invalid font in wxWindowDC::SetFont") );
+

     m_font = font;
 #ifdef __WXGTK20__
     // fix fontdesc?
     m_font = font;
 #ifdef __WXGTK20__
     // fix fontdesc?