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

probably fixed blit crash in X11

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50742 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling 2007-12-16 13:54:05 +00:00
parent c21c8158e9
commit ab70c3bb5c
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/x11/dcclient.h
View File

@ -103,7 +103,7 @@ public:
virtual wxSize GetPPI() const;
virtual void DestroyClippingRegion();
WXWindow GetWindow() const { return m_window; }
WXWindow X11GetWindow() const { return m_window; }
virtual void ComputeScaleAndOrigin();

14
src/x11/dcclient.cpp
View File

@ -1487,6 +1487,14 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor
}
else // use_bitmap_method
{
wxDCImpl *impl = srcDC->GetImpl();
wxWindowDCImpl *x11_impl = wxDynamicCast(impl, wxWindowDCImpl);
if (!x11_impl)
{
SetLogicalFunction( old_logical_func );
return false;
}
if ((width != ww) || (height != hh))
{
/* Draw source window into a bitmap as we cannot scale
@ -1506,7 +1514,7 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor
// copy including child window contents
XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, IncludeInferiors );
XCopyArea( (Display*) m_display, (Window) srcDC->GetWindow(), (Window) bitmap.GetPixmap(),
XCopyArea( (Display*) m_display, (Window) x11_impl->X11GetWindow(), (Window) bitmap.GetPixmap(),
(GC) m_penGC, xsrc, ysrc, width, height, 0, 0 );
XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, ClipByChildren );
@ -1524,10 +1532,10 @@ bool wxWindowDCImpl::DoBlit( wxCoord xdest, wxCoord ydest, wxCoord width, wxCoor
else
{
// No scaling and not a memory dc with a mask either
// copy including child window contents
XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, IncludeInferiors );
XCopyArea( (Display*) m_display, (Window) srcDC->GetWindow(), (Window) m_x11window,
XCopyArea( (Display*) m_display, (Window) x11_impl->X11GetWindow(), (Window) m_x11window,
(GC) m_penGC, xsrc, ysrc, width, height, xx, yy );
XSetSubwindowMode( (Display*) m_display, (GC) m_penGC, ClipByChildren );
}