projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Applied patch [ 1171467 ] Fix for DocManager not checking OnNewDocument's return...
[wxWidgets.git]
/
src
/
mgl
/
dcclient.cpp
diff --git
a/src/mgl/dcclient.cpp
b/src/mgl/dcclient.cpp
index 54ade252ffb760a6d05c6c011a298762cb6f73dd..d238dbc95cb9d8edf207b11d994b0db4bf4fa724 100644
(file)
--- a/
src/mgl/dcclient.cpp
+++ b/
src/mgl/dcclient.cpp
@@
-3,11
+3,11
@@
// Purpose:
// Author: Vaclav Slavik
// RCS-ID: $Id$
// Purpose:
// Author: Vaclav Slavik
// RCS-ID: $Id$
-// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
+// Copyright: (c) 2001
-2002
SciTech Software, Inc. (www.scitechsoft.com)
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#if
def __GNUG__
+#if
defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dcclient.h"
#endif
#pragma implementation "dcclient.h"
#endif
@@
-32,6
+32,7
@@
IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
{
MGLDevCtx *dc = win->GetPaintMGLDC();
wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
{
MGLDevCtx *dc = win->GetPaintMGLDC();
+
if ( dc )
{
m_inPaintHandler = TRUE;
if ( dc )
{
m_inPaintHandler = TRUE;
@@
-42,7
+43,7
@@
wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
else
{
m_inPaintHandler = FALSE;
else
{
m_inPaintHandler = FALSE;
-
+
dc = new MGLDevCtx(MGL_wmBeginPaint(win->GetHandle()));
MGLRegion clip;
dc = new MGLDevCtx(MGL_wmBeginPaint(win->GetHandle()));
MGLRegion clip;
@@
-68,5
+69,6
@@
wxClientDC::wxClientDC(wxWindow *win) : wxWindowDC(win)
{
wxRect r = m_wnd->GetClientRect();
m_globalClippingRegion.Intersect(r);
{
wxRect r = m_wnd->GetClientRect();
m_globalClippingRegion.Intersect(r);
+ SetClippingRegion(m_globalClippingRegion);
SetDeviceOrigin(r.x, r.y);
}
SetDeviceOrigin(r.x, r.y);
}