Merge in from trunk r64802 - r68625

[wxWidgets.git] / src / mgl / dcclient.cpp

diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
index 2afdbad27956fb864bb76d6af7a1ac8d681acfda..9e3d14aa82b8e5cc9b8e99276ff98a87ba67f6ac 100644 (file)
--- a/src/mgl/dcclient.cpp
+++ b/src/mgl/dcclient.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dcclient.cpp
+// Name:        src/mgl/dcclient.cpp
 // Purpose:
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
@@ -7,10 +7,6 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "dcclient.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -18,8 +14,9 @@
     #pragma hdrstop
 #endif
 
+#include "wx/dcclient.h"
+
 #ifndef WX_PRECOMP
-    #include "wx/dcclient.h"
     #include "wx/window.h"
 #endif
 
@@ -43,7 +40,7 @@ wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
     else
     {
         m_inPaintHandler = FALSE;
-        
+
         dc = new MGLDevCtx(MGL_wmBeginPaint(win->GetHandle()));
 
         MGLRegion clip;
@@ -69,5 +66,6 @@ wxClientDC::wxClientDC(wxWindow *win) : wxWindowDC(win)
 {
     wxRect r = m_wnd->GetClientRect();
     m_globalClippingRegion.Intersect(r);
+    SetClippingRegion(m_globalClippingRegion);
     SetDeviceOrigin(r.x, r.y);
 }