wxDC::SetFont can now handle invalid font and doesn't assert anymore (other ports...

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

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index 6d1111607dbdcbea5ba0e0e9950c491ee819a048..692ac021d420f8f06e7b6ccf1324cb327aa49a2b 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -1114,9 +1114,11 @@ void wxDC::SetPalette(const wxPalette& palette)
 
 void wxDC::SetFont(const wxFont& font)
 {
-    wxCHECK_RET( font.Ok(), wxT("invalid font") );
-    m_font = font;
-    m_mglFont = NULL;
+    if ( font.Ok() )
+    {
+        m_font = font;
+        m_mglFont = NULL;
+    }
 }
 
 void wxDC::SetBackground(const wxBrush& brush)