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

fixed wxDC to correctly handle SetFoo(wxNullFoo) calls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41071 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2006-09-08 15:29:55 +00:00
parent 0ac091aecd
commit 071f5576a0
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/dfb/dc.cpp
View File

@@ -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() )
wxFont f(font.Ok() ? font : DEFAULT_FONT);
if ( !m_surface->SetFont(f.GetDirectFBFont()) )
return;
if ( !m_surface->SetFont(font.GetDirectFBFont()) )
return;
m_font = font;
m_font = f;
}
void wxDC::SetBackground(const wxBrush& brush)