Rename delegates to try and stop name clashes, probably with wxWebKitCtrl.

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

diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
index 54ade252ffb760a6d05c6c011a298762cb6f73dd..9e3d14aa82b8e5cc9b8e99276ff98a87ba67f6ac 100644 (file)
--- a/src/mgl/dcclient.cpp
+++ b/src/mgl/dcclient.cpp
@@ -1,16 +1,12 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dcclient.cpp
+// Name:        src/mgl/dcclient.cpp

 // 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
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "dcclient.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -18,8 +14,9 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dcclient.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

-    #include "wx/dcclient.h"

     #include "wx/window.h"
 #endif
 
     #include "wx/window.h"
 #endif
 


@@ -32,6 +29,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;


@@ -68,5 +66,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);
 }