Some Updates for latest CVS.

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

diff --git a/src/mgl/dcclient.cpp b/src/mgl/dcclient.cpp
index c0e73aabc06687d4d1244fb7dc017b1de9da439f..f3bef5fbd7648c6995f80e8592242149a5a8e0f0 100644 (file)
--- a/src/mgl/dcclient.cpp
+++ b/src/mgl/dcclient.cpp
@@ -1,9 +1,9 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        gtk/dcclient.cpp
+// Name:        dcclient.cpp

 // Purpose:
 // Purpose:

-// Author:      Robert Roebling
+// Author:      Vaclav Slavik

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) 1998 Robert Roebling, Markus Holzem, Chris Breeze
+// Copyright:   (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -11,9 +11,40 @@
 #pragma implementation "dcclient.h"
 #endif
 
 #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(wxWindowDC, wxDC)
 IMPLEMENT_DYNAMIC_CLASS(wxPaintDC, wxClientDC)
 IMPLEMENT_DYNAMIC_CLASS(wxClientDC,wxWindowDC)

+
+wxWindowDC::wxWindowDC(wxWindow *win) : m_wnd(win)
+{
+    MGLDC *dc = MGL_wmBeginPaint(m_wnd->GetHandle());
+    SetMGLDC(new MGLDevCtx(dc), FALSE);
+    // FIXME_MGL -- correctly handle setting device origin and
+    //              clipping regions
+}
+
+wxWindowDC::~wxWindowDC()
+{
+    MGL_wmEndPaint(m_wnd->GetHandle());
+}
+
+wxClientDC::wxClientDC(wxWindow *win) : wxWindowDC(win)
+{
+    wxRect r = m_wnd->GetClientRect();
+    SetClippingRegion(r);
+    SetDeviceOrigin(r.x, r.y);
+}