applied patch #928786: "Fix memory leak produced by ConvertArgsToUnicode()"

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

diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
index c0e73aabc06687d4d1244fb7dc017b1de9da439f..d238dbc95cb9d8edf207b11d994b0db4bf4fa724 100644 (file)
--- a/src/mgl/dcclient.cpp
+++ b/src/mgl/dcclient.cpp
@@ -1,19 +1,74 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        gtk/dcclient.cpp
+// Name:        dcclient.cpp
 // Purpose:
-// Author:      Robert Roebling
+// Author:      Vaclav Slavik
 // RCS-ID:      $Id$
-// Copyright:   (c) 1998 Robert Roebling, Markus Holzem, Chris Breeze
+// Copyright:   (c) 2001-2002 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma implementation "dcclient.h"
 #endif
 
-#include "wx/dcclient.h"
-#include "wx/dcmemory.h"
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
+
+#ifndef WX_PRECOMP
+    #include "wx/dcclient.h"
+    #include "wx/window.h"
+#endif
+
+#include <mgraph.hpp>
 
 IMPLEMENT_DYNAMIC_CLASS(wxWindowDC, wxDC)
-IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC)
+IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
+
+wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
+{
+    MGLDevCtx *dc = win->GetPaintMGLDC();
+
+    if ( dc )
+    {
+        m_inPaintHandler = TRUE;
+
+        m_globalClippingRegion = win->GetUpdateRegion();
+        SetMGLDC(dc, FALSE);
+    }
+    else
+    {
+        m_inPaintHandler = FALSE;
+        
+        dc = new MGLDevCtx(MGL_wmBeginPaint(win->GetHandle()));
+
+        MGLRegion clip;
+        dc->getClipRegion(clip);
+        m_globalClippingRegion = wxRegion(clip);
+        SetMGLDC(dc, TRUE);
+        // TRUE means that dtor will delete MGLDevCtx object
+        // but it won't destroy MGLDC returned by MGL_wmBeginPaint because
+        // ~MGLDevCtx() doesn't call destroy()
+    }
+}
+
+wxWindowDC::~wxWindowDC()
+{
+    if ( !m_inPaintHandler )
+    {
+        GetMGLDC()->setDC(NULL);
+        MGL_wmEndPaint(m_wnd->GetHandle());
+    }
+}
+
+wxClientDC::wxClientDC(wxWindow *win) : wxWindowDC(win)
+{
+    wxRect r = m_wnd->GetClientRect();
+    m_globalClippingRegion.Intersect(r);
+    SetClippingRegion(m_globalClippingRegion);
+    SetDeviceOrigin(r.x, r.y);
+}