From 071f5576a0cc0926887b0e5c83da907d2c9edea6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Fri, 8 Sep 2006 15:29:55 +0000
Subject: [PATCH] fixed wxDC to correctly handle SetFoo(wxNullFoo) calls

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/dfb/dc.cpp | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/dfb/dc.cpp b/src/dfb/dc.cpp
index 60afcaa00e..a02dd8f7a1 100644
--- a/src/dfb/dc.cpp
+++ b/src/dfb/dc.cpp
@@ -30,6 +30,11 @@
 
 #include "wx/dfb/private.h"
 
+// these values are used to initialize newly created DC
+#define DEFAULT_FONT      (*wxNORMAL_FONT)
+#define DEFAULT_PEN       (*wxBLACK_PEN)
+#define DEFAULT_BRUSH     (*wxWHITE_BRUSH)
+
 // ===========================================================================
 // implementation
 // ===========================================================================
@@ -63,9 +68,9 @@ void wxDC::Init(const wxIDirectFBSurfacePtr& surface)
     m_mm_to_pix_y = (double)wxGetDisplaySize().GetHeight() /
                     (double)wxGetDisplaySizeMM().GetHeight();
 
-    SetFont(*wxNORMAL_FONT);
-    SetPen(*wxBLACK_PEN);
-    SetBrush(*wxWHITE_BRUSH);
+    SetFont(DEFAULT_FONT);
+    SetPen(DEFAULT_PEN);
+    SetBrush(DEFAULT_BRUSH);
 }
 
 
@@ -317,16 +322,14 @@ void wxDC::DoDrawRotatedText(const wxString& text,
 
 void wxDC::SetPen(const wxPen& pen)
 {
-    if ( !pen.Ok() ) return;
-    m_pen = pen;
+    m_pen = pen.Ok() ? pen : DEFAULT_PEN;
 
     SelectColour(m_pen.GetColour());
 }
 
 void wxDC::SetBrush(const wxBrush& brush)
 {
-    if ( !brush.Ok() ) return;
-    m_brush = brush;
+    m_brush = brush.Ok() ? brush : DEFAULT_BRUSH;
 }
 
 void wxDC::SelectColour(const wxColour& clr)
@@ -348,13 +351,12 @@ void wxDC::SetFont(const wxFont& font)
 {
     wxCHECK_RET( Ok(), wxT("invalid dc") );
 
-    if ( !font.Ok() )
-        return;
+    wxFont f(font.Ok() ? font : DEFAULT_FONT);
 
-    if ( !m_surface->SetFont(font.GetDirectFBFont()) )
+    if ( !m_surface->SetFont(f.GetDirectFBFont()) )
         return;
 
-    m_font = font;
+    m_font = f;
 }
 
 void wxDC::SetBackground(const wxBrush& brush)
-- 
2.47.2