added wxBitmap::CopyFromIcon and wxIcon::CopyFromBitmap to wxMotif

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

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index e9a24c404e497a4208bc0f0c79dd5b88c2b4f205..60d8043928ac4377a4639e0c1ded735bcee2e844 100644 (file)
--- a/src/mgl/dc.cpp
+++ b/src/mgl/dc.cpp
@@ -4,7 +4,7 @@
 // Author:      Vaclav Slavik
 // Created:     2001/03/09
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -249,6 +249,7 @@ void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region)
     // check if the DC is scaled or moved, and if yes, then
     // convert rg to device coordinates:
     if ( m_deviceOriginX != 0 || m_deviceOriginY != 0 ||
+         m_logicalOriginX != 0 || m_logicalOriginY != 0 ||
          XLOG2DEVREL(500) != 500 || YLOG2DEVREL(500) != 500 )
     {
         region_t *mrg = rg.GetMGLRegion().rgnPointer();
@@ -558,15 +559,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         if ( !m_penSelected ) 
             SelectPen();
 
-        // VS: MGLDC::rect() does not render rectangles that have width
-        //     or height equal to 1, so we have to use MGLDC::line()
-        //     instead...
-        if ( hh == 1 || ww == 1 )
-            m_MGLDC->line(xx + m_penOfsX, yy + m_penOfsY, 
-                          xx + ww-1 + m_penOfsX, yy + hh-1 + m_penOfsY);
-        else
-            m_MGLDC->rect(xx + m_penOfsX, yy + m_penOfsY, 
-                          xx + ww + m_penOfsX, yy + hh + m_penOfsY);
+        m_MGLDC->rect(xx + m_penOfsX, yy + m_penOfsY, 
+                      xx + ww + m_penOfsX, yy + hh + m_penOfsY);
     }    
 
     CalcBoundingBox(x, y);