don't draw with NULL font

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

diff --git a/src/gtk/dcclient.cpp b/src/gtk/dcclient.cpp
index 1c67530fae1a6e4c8e68576d3898841aa37eda01..cdd1f139506fc6de7f7e60c60ee82b71c7b1a15d 100644 (file)
--- a/src/gtk/dcclient.cpp
+++ b/src/gtk/dcclient.cpp
@@ -762,6 +762,8 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y )
 
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
 
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 

+    wxCHECK_RET( font, wxT("invalid font") );
+

     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 

diff --git a/src/gtk1/dcclient.cpp b/src/gtk1/dcclient.cpp
index 1c67530fae1a6e4c8e68576d3898841aa37eda01..cdd1f139506fc6de7f7e60c60ee82b71c7b1a15d 100644 (file)
--- a/src/gtk1/dcclient.cpp
+++ b/src/gtk1/dcclient.cpp
@@ -762,6 +762,8 @@ void wxWindowDC::DoDrawText( const wxString &text, long x, long y )
 
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 
 
     GdkFont *font = m_font.GetInternalFont( m_scaleY );
 

+    wxCHECK_RET( font, wxT("invalid font") );
+

     x = XLOG2DEV(x);
     y = YLOG2DEV(y);
 
     x = XLOG2DEV(x);
     y = YLOG2DEV(y);