projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFont can now raelly use the native fonts
[wxWidgets.git]
/
src
/
mgl
/
dcmemory.cpp
diff --git
a/src/mgl/dcmemory.cpp
b/src/mgl/dcmemory.cpp
index 8ed99b6022eec3f593b4e57d76f89ca0882848ec..c8818c224227ce0c0150e90bdc4ef0ed4695f638 100644
(file)
--- a/
src/mgl/dcmemory.cpp
+++ b/
src/mgl/dcmemory.cpp
@@
-3,7
+3,8
@@
// Purpose:
// Author: Robert Roebling, Vaclav Slavik
// RCS-ID: $Id$
// Purpose:
// Author: Robert Roebling, Vaclav Slavik
// RCS-ID: $Id$
-// Copyright: (c) 1998 Robert Roebling, 2001 Vaclav Slavik
+// Copyright: (c) 1998 Robert Roebling,
+// 2001 SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
@@
-43,11
+44,11
@@
wxMemoryDC::~wxMemoryDC()
void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
{
void wxMemoryDC::SelectObject(const wxBitmap& bitmap)
{
- SetMGLDC(NULL, TRUE);
- m_selected = bitmap;
-
if ( bitmap.Ok() )
if ( bitmap.Ok() )
+ {
+ m_selected = bitmap;
SetMGLDC(m_selected.CreateTmpDC(), TRUE);
SetMGLDC(m_selected.CreateTmpDC(), TRUE);
+ }
}
void wxMemoryDC::SetPen(const wxPen &pen)
}
void wxMemoryDC::SetPen(const wxPen &pen)