toplevel code transferred to wxTopLevelWindow

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

diff --git a/src/mgl/region.cpp b/src/mgl/region.cpp
index b9a9293ac49ff9855e55044fa989b5f67944ac45..2002add8b896bce706914540840cbf76c3b5c6db 100644 (file)
--- a/src/mgl/region.cpp
+++ b/src/mgl/region.cpp
@@ -3,7 +3,7 @@
 // Purpose:   Region handling for wxWindows/MGL
 // Author:    Vaclav Slavik
 // RCS-ID:    $Id$
-// Copyright: (c) 2001 Vaclav Slavik
+// Copyright: (c) 2001 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:   wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -78,14 +78,14 @@ wxRegion::wxRegion(wxCoord x, wxCoord y, wxCoord w, wxCoord h)
 wxRegion::wxRegion(const wxPoint& topLeft, const wxPoint& bottomRight)
 {
     m_refData = new wxRegionRefData;
-    MGLRect rect(topLeft.x, topLeft.y, bottomRight.x, bottomRight.y);
+    MGLRect rect(topLeft.x, topLeft.y, bottomRight.x+1, bottomRight.y+1);
     M_REGION = rect;
 }
 
 wxRegion::wxRegion(const wxRect& r)
 {
     m_refData = new wxRegionRefData;
-    MGLRect rect(r.GetLeft(), r.GetTop(), r.GetRight(), r.GetBottom());
+    MGLRect rect(r.GetLeft(), r.GetTop(), r.GetRight()+1, r.GetBottom()+1);
     M_REGION = rect;
 }
 
@@ -324,7 +324,7 @@ wxRegionIterator::wxRegionIterator(const wxRegion& region)
 
 static wxRegionRectList *gs_rectList;
 
-static void wxMGL_region_callback(const rect_t *r)
+static void MGLAPI wxMGL_region_callback(const rect_t *r)
 {
     gs_rectList->Append(new wxRect(r->left, r->top, 
                                    r->right - r->left, r->bottom - r->top));