Added wxDC::GetPartialTextExtents

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

diff --git a/src/mgl/dc.cpp b/src/mgl/dc.cpp
index e9a24c404e497a4208bc0f0c79dd5b88c2b4f205..ba6ff76f3cb2466c33c870b6a04cb67e31902b6c 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$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -16,7 +16,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
 // headers
 // ---------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dc.h"
 #endif
 
     #pragma implementation "dc.h"
 #endif
 


@@ -33,6 +33,7 @@
 #endif
 
 #include "wx/fontutil.h"
 #endif
 
 #include "wx/fontutil.h"

+#include "wx/encinfo.h"

 #include "wx/fontmap.h"
 #include "wx/mgl/private.h"
 #include "wx/log.h"
 #include "wx/fontmap.h"
 #include "wx/mgl/private.h"
 #include "wx/log.h"


@@ -249,6 +250,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 ||
     // 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();
          XLOG2DEVREL(500) != 500 || YLOG2DEVREL(500) != 500 )
     {
         region_t *mrg = rg.GetMGLRegion().rgnPointer();


@@ -331,9 +333,13 @@ void wxDC::Clear()
     }
 }
 
     }
 }
 

-void wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style)
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y, 
+                          const wxColour & col, int style);
+
+bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
+                       const wxColour& col, int style)

 {
 {

-    wxFAIL_MSG( wxT("wxDC::DoFloodFill not implemented") );
+    return wxDoFloodFill(this, x, y, col, style);

 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const
 }
 
 bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const


@@ -558,15 +564,8 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
         if ( !m_penSelected ) 
             SelectPen();
 
         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);
     }    
 
     CalcBoundingBox(x, y);


@@ -738,7 +737,7 @@ bool wxDC::SelectMGLFont()
              !wxTestFontEncoding(nativeEnc) )
         {
 #if wxUSE_FONTMAP
              !wxTestFontEncoding(nativeEnc) )
         {
 #if wxUSE_FONTMAP

-            if ( !wxTheFontMapper->GetAltForEncoding(encoding, &nativeEnc) )
+            if ( !wxFontMapper::Get()->GetAltForEncoding(encoding, &nativeEnc) )

 #endif
             {
                 nativeEnc.mglEncoding = MGL_ENCODING_ASCII;
 #endif
             {
                 nativeEnc.mglEncoding = MGL_ENCODING_ASCII;