remove symbol exports, this code is private to the library

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

diff --git a/src/gtk/dc.cpp b/src/gtk/dc.cpp
index 13ffab2a442fe08dccea417da49ede0e24d8d486..52abd3b2bea78827c2aa6709ed3ddb3d9c9d1ff0 100644 (file)
--- a/src/gtk/dc.cpp
+++ b/src/gtk/dc.cpp
@@ -1,372 +1,409 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        dc.cpp
+// Name:        src/gtk/dc.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97

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

-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"

 
 

-#ifdef __GNUG__
-#pragma implementation "dc.h"
-#endif
-
-#include "wx/dc.h"
-
-//-----------------------------------------------------------------------------
-// constants
-//-----------------------------------------------------------------------------
-
-#define mm2inches              0.0393700787402
-#define inches2mm              25.4
-#define mm2twips               56.6929133859
-#define twips2mm               0.0176388888889
-#define mm2pt                  2.83464566929
-#define pt2mm                  0.352777777778
+#ifdef __WXGTK3__

 
 

-//-----------------------------------------------------------------------------
-// wxDC
-//-----------------------------------------------------------------------------
+#include "wx/window.h"
+#include "wx/dcclient.h"
+#include "wx/dcmemory.h"
+#include "wx/dcscreen.h"
+#include "wx/icon.h"
+#include "wx/gtk/dc.h"

 
 

-IMPLEMENT_ABSTRACT_CLASS(wxDC,wxObject)
+#include <gtk/gtk.h>

 
 

-wxDC::wxDC(void)
+wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner)
+    : base_type(owner)

 {
 {

-  m_ok = FALSE;
-  m_optimize = FALSE;
-  m_autoSetting = FALSE;
-  m_colour = TRUE;
-  m_clipping = FALSE;
-  
-  m_mm_to_pix_x = 1.0;
-  m_mm_to_pix_y = 1.0;
-  
-  m_logicalOriginX = 0;
-  m_logicalOriginY = 0;
-  m_deviceOriginX = 0;
-  m_deviceOriginY = 0;
-  
-  m_logicalScaleX = 1.0;
-  m_logicalScaleY = 1.0;
-  m_userScaleX = 1.0;
-  m_userScaleY = 1.0;
-  m_scaleX = 1.0;
-  m_scaleY = 1.0;
-  
-  m_mappingMode = MM_TEXT;
-  m_needComputeScaleX = FALSE;
-  m_needComputeScaleY = FALSE;
-  
-  m_signX = 1;  // default x-axis left to right
-  m_signY = 1;  // default y-axis top down
-
-  m_maxX = m_maxY = -100000;
-  m_minY = m_minY =  100000;
-
-  m_logicalFunction = wxCOPY;
-//  m_textAlignment = wxALIGN_TOP_LEFT;
-  m_backgroundMode = wxTRANSPARENT;
-  
-  m_textForegroundColour = *wxBLACK;
-  m_textBackgroundColour = *wxWHITE;
-  m_pen = *wxBLACK_PEN;
-  m_font = *wxNORMAL_FONT;
-  m_brush = *wxTRANSPARENT_BRUSH;
-  m_backgroundBrush = *wxWHITE_BRUSH;
-  
-//  m_palette = wxAPP_COLOURMAP;
+    m_width = 0;
+    m_height = 0;

 }
 
 }
 

-wxDC::~wxDC(void)
+wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, int)
+    : base_type(owner, 0)

 {
 {

+    m_width = 0;
+    m_height = 0;

 }
 
 }
 

-bool wxDC::Ok(void) const 
-{ 
-  wxASSERT_MSG( m_ok, "invalid display context" );
-  return m_ok; 
-}
-
-void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2), 
-  double WXUNUSED(xc), double WXUNUSED(yc) )
+wxGTKCairoDCImpl::wxGTKCairoDCImpl(wxDC* owner, wxWindow* window)
+    : base_type(owner, 0)

 {
 {

+    m_window = window;
+    m_font = window->GetFont();
+    m_textForegroundColour = window->GetForegroundColour();
+    m_textBackgroundColour = window->GetBackgroundColour();
+    m_width = 0;
+    m_height = 0;

 }
 
 }
 

-void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) ) 
+void wxGTKCairoDCImpl::DoDrawBitmap(const wxBitmap& bitmap, int x, int y, bool useMask)

 {
 {

-}
-
-void wxDC::DrawPoint( wxPoint& point ) 
-{ 
-  DrawPoint( point.x, point.y ); 
-}
+    wxCHECK_RET(IsOk(), "invalid DC");

 
 

-void wxDC::DrawPolygon( wxList *list, long xoffset, long yoffset, int fillStyle )
-{
-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
-
-  int i = 0;
-  for( wxNode *node = list->First(); node; node = node->Next() )
-  {
-    wxPoint *point = (wxPoint *)node->Data();
-    points[i].x = point->x;
-    points[i++].y = point->y;
-  }
-  DrawPolygon( n, points, xoffset, yoffset, fillStyle );
-  delete[] points;
+    cairo_t* cr = NULL;
+    if (m_graphicContext)
+        cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+    if (cr)
+    {
+        cairo_save(cr);
+        bitmap.Draw(cr, x, y, useMask, &m_textForegroundColour, &m_textBackgroundColour);
+        cairo_restore(cr);
+    }

 }
 
 }
 

-void wxDC::DrawLines( wxList *list, long xoffset, long yoffset )
+void wxGTKCairoDCImpl::DoDrawIcon(const wxIcon& icon, int x, int y)

 {
 {

-  int n = list->Number();
-  wxPoint *points = new wxPoint[n];
-
-  int i = 0;
-  for( wxNode *node = list->First(); node; node = node->Next() ) 
-  {
-    wxPoint *point = (wxPoint *)node->Data();
-    points[i].x = point->x;
-    points[i++].y = point->y;
-  }
-  DrawLines( n, points, xoffset, yoffset );
-  delete []points;
+    DoDrawBitmap(icon, x, y, true);

 }
 
 }
 

-void wxDC::DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 )
-{
-  wxList list;
-  list.Append( (wxObject*)new wxPoint(x1, y1) );
-  list.Append( (wxObject*)new wxPoint(x2, y2) );
-  list.Append( (wxObject*)new wxPoint(x3, y3) );
-  DrawSpline(&list);
-  wxNode *node = list.First();
-  while (node)
-  {
-    wxPoint *p = (wxPoint*)node->Data();
-    delete p;
-    node = node->Next();
-  }
-}
+#if wxUSE_IMAGE
+bool wxDoFloodFill(wxDC* dc, int x, int y, const wxColour& col, wxFloodFillStyle style);

 
 

-void wxDC::DrawSpline( int n, wxPoint points[] )
+bool wxGTKCairoDCImpl::DoFloodFill(int x, int y, const wxColour& col, wxFloodFillStyle style)

 {
 {

-  wxList list;
-  for (int i = 0; i < n; i++) list.Append( (wxObject*)&points[i] );
-  DrawSpline( &list );
+    return wxDoFloodFill(GetOwner(), x, y, col, style);

 }
 }

+#endif

 
 

-void wxDC::SetClippingRegion( long x, long y, long width, long height )
-{
-  m_clipping = TRUE;
-  m_clipX1 = x;
-  m_clipY1 = y;
-  m_clipX2 = x + width;
-  m_clipY2 = y + height;
+wxBitmap wxGTKCairoDCImpl::DoGetAsBitmap(const wxRect* /*subrect*/) const
+{
+    wxFAIL_MSG("DoGetAsBitmap not implemented");
+    return wxBitmap();
+}
+
+bool wxGTKCairoDCImpl::DoGetPixel(int x, int y, wxColour* col) const
+{
+    if (col)
+    {
+        cairo_t* cr = NULL;
+        if (m_graphicContext)
+            cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+        if (cr)
+        {
+            cairo_surface_t* surface = cairo_get_target(cr);
+            x = LogicalToDeviceX(x);
+            y = LogicalToDeviceY(y);
+            GdkPixbuf* pixbuf = gdk_pixbuf_get_from_surface(surface, x, y, 1, 1);
+            if (pixbuf)
+            {
+                const guchar* src = gdk_pixbuf_get_pixels(pixbuf);
+                col->Set(src[0], src[1], src[2]);
+                g_object_unref(pixbuf);
+                return true;
+            }
+            *col = wxColour();
+        }
+    }
+    return false;
+}
+
+void wxGTKCairoDCImpl::DoGetSize(int* width, int* height) const
+{
+    if (width)
+        *width = m_width;
+    if (height)
+        *height = m_height;
+}
+
+bool wxGTKCairoDCImpl::DoStretchBlit(int xdest, int ydest, int dstWidth, int dstHeight, wxDC* source, int xsrc, int ysrc, int srcWidth, int srcHeight, wxRasterOperationMode rop, bool useMask, int xsrcMask, int ysrcMask)
+{
+    wxCHECK_MSG(IsOk(), false, "invalid DC");
+    wxCHECK_MSG(source && source->IsOk(), false, "invalid source DC");
+
+    cairo_t* cr = NULL;
+    if (m_graphicContext)
+        cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+    cairo_t* cr_src = NULL;
+    wxGraphicsContext* gc_src = source->GetGraphicsContext();
+    if (gc_src)
+        cr_src = static_cast<cairo_t*>(gc_src->GetNativeContext());
+
+    if (cr == NULL || cr_src == NULL)
+        return false;
+
+    const int xsrc_dev = source->LogicalToDeviceX(xsrc);
+    const int ysrc_dev = source->LogicalToDeviceY(ysrc);
+
+    cairo_surface_t* surface = cairo_get_target(cr_src);
+    cairo_surface_flush(surface);
+    cairo_save(cr);
+    cairo_translate(cr, xdest, ydest);
+    cairo_rectangle(cr, 0, 0, dstWidth, dstHeight);
+    double sx, sy;
+    source->GetUserScale(&sx, &sy);
+    cairo_scale(cr, dstWidth / (sx * srcWidth), dstHeight / (sy * srcHeight));
+    cairo_set_source_surface(cr, surface, -xsrc_dev, -ysrc_dev);
+    const wxRasterOperationMode rop_save = m_logicalFunction;
+    SetLogicalFunction(rop);
+    cairo_pattern_set_filter(cairo_get_source(cr), CAIRO_FILTER_NEAREST);
+    cairo_surface_t* maskSurf = NULL;
+    if (useMask)
+    {
+        const wxBitmap& bitmap = source->GetImpl()->GetSelectedBitmap();
+        if (bitmap.IsOk())
+        {
+            wxMask* mask = bitmap.GetMask();
+            if (mask)
+                maskSurf = *mask;
+        }
+    }
+    if (maskSurf)
+    {
+        int xsrcMask_dev = xsrc_dev;
+        int ysrcMask_dev = ysrc_dev;
+        if (xsrcMask != -1)
+            xsrcMask_dev = source->LogicalToDeviceX(xsrcMask);
+        if (ysrcMask != -1)
+            ysrcMask_dev = source->LogicalToDeviceY(ysrcMask);
+        cairo_clip(cr);
+        cairo_mask_surface(cr, maskSurf, -xsrcMask_dev, -ysrcMask_dev);
+    }
+    else
+    {
+        cairo_fill(cr);
+    }
+    cairo_restore(cr);
+    m_logicalFunction = rop_save;
+    return true;
+}
+
+void* wxGTKCairoDCImpl::GetCairoContext() const
+{
+    cairo_t* cr = NULL;
+    if (m_graphicContext)
+        cr = static_cast<cairo_t*>(m_graphicContext->GetNativeContext());
+    if (cr)
+        cairo_reference(cr);
+    return cr;

 }
 }

+//-----------------------------------------------------------------------------

 
 

-void wxDC::DestroyClippingRegion(void)
-{
-  m_clipping = FALSE;
+wxWindowDCImpl::wxWindowDCImpl(wxWindowDC* owner, wxWindow* window)
+    : base_type(owner, window)
+{
+    GtkWidget* widget = window->m_wxwindow;
+    if (widget == NULL)
+        widget = window->m_widget;
+    GdkWindow* gdkWindow = NULL;
+    if (widget)
+    {
+        gdkWindow = gtk_widget_get_window(widget);
+        m_ok = true;
+    }
+    if (gdkWindow)
+    {
+        cairo_t* cr = gdk_cairo_create(gdkWindow);
+        SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+        GtkAllocation a;
+        gtk_widget_get_allocation(widget, &a);
+        int x, y;
+        if (gtk_widget_get_has_window(widget))
+        {
+            m_width = gdk_window_get_width(gdkWindow);
+            m_height = gdk_window_get_height(gdkWindow);
+            x = m_width - a.width;
+            y = m_height - a.height;
+        }
+        else
+        {
+            m_width = a.width;
+            m_height = a.height;
+            x = a.x;
+            y = a.y;
+            cairo_rectangle(cr, a.x, a.y, a.width, a.height);
+            cairo_clip(cr);
+        }
+        if (x || y)
+            SetDeviceLocalOrigin(x, y);
+    }
+    else
+        SetGraphicsContext(wxGraphicsContext::Create());

 }
 }

+//-----------------------------------------------------------------------------

 
 

-void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
-{
-  if (m_clipping)
-  {
-    if (x) *x = m_clipX1;
-    if (y) *y = m_clipY1;
-    if (width) *width = (m_clipX2 - m_clipX1);
-    if (height) *height = (m_clipY2 - m_clipY1);
-  }
-  else
-   *x = *y = *width = *height = 0;
-}
-
-void wxDC::GetSize( int* width, int* height ) const
-{
-  *width = m_maxX-m_minX;
-  *height = m_maxY-m_minY;
+wxClientDCImpl::wxClientDCImpl(wxClientDC* owner, wxWindow* window)
+    : base_type(owner, window)
+{
+    GtkWidget* widget = window->m_wxwindow;
+    if (widget == NULL)
+        widget = window->m_widget;
+    GdkWindow* gdkWindow = NULL;
+    if (widget)
+    {
+        gdkWindow = gtk_widget_get_window(widget);
+        m_ok = true;
+    }
+    if (gdkWindow)
+    {
+        cairo_t* cr = gdk_cairo_create(gdkWindow);
+        SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));
+        if (gtk_widget_get_has_window(widget))
+        {
+            m_width = gdk_window_get_width(gdkWindow);
+            m_height = gdk_window_get_height(gdkWindow);
+        }
+        else
+        {
+            GtkAllocation a;
+            gtk_widget_get_allocation(widget, &a);
+            m_width = a.width;
+            m_height = a.height;
+            cairo_rectangle(cr, a.x, a.y, a.width, a.height);
+            cairo_clip(cr);
+            SetDeviceLocalOrigin(a.x, a.y);
+        }
+    }
+    else
+        SetGraphicsContext(wxGraphicsContext::Create());

 }
 }

+//-----------------------------------------------------------------------------

 
 

-void wxDC::GetSizeMM( long* width, long* height ) const
+wxPaintDCImpl::wxPaintDCImpl(wxPaintDC* owner, wxWindow* window)
+    : base_type(owner, window)

 {
 {

-  int w = 0;
-  int h = 0;
-  GetSize( &w, &h );
-  *width = long( double(w) / (m_scaleX*m_mm_to_pix_x) );
-  *height = long( double(h) / (m_scaleY*m_mm_to_pix_y) );
+    cairo_t* cr = window->GTKPaintContext();
+    wxCHECK_RET(cr, "using wxPaintDC without being in a native paint event");
+    GdkWindow* gdkWindow = gtk_widget_get_window(window->m_wxwindow);
+    m_width = gdk_window_get_width(gdkWindow);
+    m_height = gdk_window_get_height(gdkWindow);
+    cairo_reference(cr);
+    SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));

 }
 }

+//-----------------------------------------------------------------------------

 
 

-void wxDC::SetTextForeground( const wxColour &col )
+wxScreenDCImpl::wxScreenDCImpl(wxScreenDC* owner)
+    : base_type(owner, 0)

 {
 {

-  if (!Ok()) return;
-  m_textForegroundColour = col;
+    GdkWindow* window = gdk_get_default_root_window();
+    m_width = gdk_window_get_width(window);
+    m_height = gdk_window_get_height(window);
+    cairo_t* cr = gdk_cairo_create(window);
+    SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));

 }
 }

+//-----------------------------------------------------------------------------

 
 

-void wxDC::SetTextBackground( const wxColour &col )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner)
+    : base_type(owner)

 {
 {

-  if (!Ok()) return;
-  m_textBackgroundColour = col;
+    m_ok = false;

 }
 
 }
 

-void wxDC::SetMapMode( int mode )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxBitmap& bitmap)
+    : base_type(owner, 0)
+    , m_bitmap(bitmap)

 {
 {

-  switch (mode) 
-  {
-    case MM_TWIPS:
-      SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
-      break;
-    case MM_POINTS:
-      SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
-      break;
-    case MM_METRIC:
-      SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
-      break;
-    case MM_LOMETRIC:
-      SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
-      break;
-    default:
-    case MM_TEXT:
-      SetLogicalScale( 1.0, 1.0 );
-      break;
-  }
-  if (mode != MM_TEXT)
-  {
-    m_needComputeScaleX = TRUE;
-    m_needComputeScaleY = TRUE;
-  }
+    Setup();

 }
 
 }
 

-void wxDC::SetUserScale( double x, double y )
+wxMemoryDCImpl::wxMemoryDCImpl(wxMemoryDC* owner, wxDC*)
+    : base_type(owner)

 {
 {

-  // allow negative ? -> no
-  m_userScaleX = x;
-  m_userScaleY = y;
-  ComputeScaleAndOrigin();
+    m_ok = false;

 }
 
 }
 

-void wxDC::GetUserScale( double *x, double *y )
+wxBitmap wxMemoryDCImpl::DoGetAsBitmap(const wxRect* subrect) const

 {
 {

-  if (x) *x = m_userScaleX;
-  if (y) *y = m_userScaleY;
+    return subrect ? m_bitmap.GetSubBitmap(*subrect) : m_bitmap;

 }
 
 }
 

-void wxDC::SetLogicalScale( double x, double y )
+void wxMemoryDCImpl::DoSelect(const wxBitmap& bitmap)

 {
 {

-  // allow negative ?
-  m_logicalScaleX = x;
-  m_logicalScaleY = y;
-  ComputeScaleAndOrigin();
+    m_bitmap = bitmap;
+    Setup();

 }
 
 }
 

-void wxDC::GetLogicalScale( double *x, double *y )
+const wxBitmap& wxMemoryDCImpl::GetSelectedBitmap() const

 {
 {

-  if (x) *x = m_logicalScaleX;
-  if (y) *y = m_logicalScaleY;
+    return m_bitmap;

 }
 
 }
 

-void wxDC::SetLogicalOrigin( long x, long y )
+wxBitmap& wxMemoryDCImpl::GetSelectedBitmap()

 {
 {

-  m_logicalOriginX = x * m_signX;   // is this still correct ?
-  m_logicalOriginY = y * m_signY;
-  ComputeScaleAndOrigin();
+    return m_bitmap;

 }
 
 }
 

-void wxDC::GetLogicalOrigin( long *x, long *y )
+void wxMemoryDCImpl::Setup()

 {
 {

-  if (x) *x = m_logicalOriginX;
-  if (y) *y = m_logicalOriginY;
+    wxGraphicsContext* gc = NULL;
+    m_ok = m_bitmap.IsOk();
+    if (m_ok)
+    {
+        m_width = m_bitmap.GetWidth();
+        m_height = m_bitmap.GetHeight();
+        cairo_t* cr = m_bitmap.CairoCreate();
+        gc = wxGraphicsContext::CreateFromNative(cr);
+    }
+    SetGraphicsContext(gc);

 }
 }

+//-----------------------------------------------------------------------------

 
 

-void wxDC::SetDeviceOrigin( long x, long y )
+wxGTKCairoDC::wxGTKCairoDC(cairo_t* cr)
+    : base_type(new wxGTKCairoDCImpl(this, 0))

 {
 {

-  m_deviceOriginX = x;
-  m_deviceOriginY = y;
-  ComputeScaleAndOrigin();
+    cairo_reference(cr);
+    SetGraphicsContext(wxGraphicsContext::CreateFromNative(cr));

 }
 
 }
 

-void wxDC::GetDeviceOrigin( long *x, long *y )
-{
-  if (x) *x = m_deviceOriginX;
-  if (y) *y = m_deviceOriginY;
-}
+#else

 
 

-void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
-{
-  m_signX = (xLeftRight ?  1 : -1);
-  m_signY = (yBottomUp  ? -1 :  1);
-  ComputeScaleAndOrigin();
-}
+#include "wx/gtk/dc.h"

 
 

-long wxDC::DeviceToLogicalX(long x) const
-{
-  return XDEV2LOG(x);
-}
+//-----------------------------------------------------------------------------
+// wxGTKDCImpl
+//-----------------------------------------------------------------------------

 
 

-long wxDC::DeviceToLogicalY(long y) const
-{
-  return YDEV2LOG(y);
-}
+IMPLEMENT_ABSTRACT_CLASS(wxGTKDCImpl, wxDCImpl)

 
 

-long wxDC::DeviceToLogicalXRel(long x) const
+wxGTKDCImpl::wxGTKDCImpl( wxDC *owner )
+   : wxDCImpl( owner )

 {
 {

-  return XDEV2LOGREL(x);
-}
+    m_ok = FALSE;

 
 

-long wxDC::DeviceToLogicalYRel(long y) const
-{
-  return YDEV2LOGREL(y);
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;

 }
 
 }
 

-long wxDC::LogicalToDeviceX(long x) const
+wxGTKDCImpl::~wxGTKDCImpl()

 {
 {

-  return XLOG2DEV(x);

 }
 
 }
 

-long wxDC::LogicalToDeviceY(long y) const
+void wxGTKDCImpl::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  return YLOG2DEV(y);
+    m_clipping = TRUE;
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + width;
+    m_clipY2 = y + height;

 }
 
 }
 

-long wxDC::LogicalToDeviceXRel(long x) const
-{
-  return XLOG2DEVREL(x);
-}
+// ---------------------------------------------------------------------------
+// get DC capabilities
+// ---------------------------------------------------------------------------

 
 

-long wxDC::LogicalToDeviceYRel(long y) const
-{
-  return YLOG2DEVREL(y);
-}
-    
-void wxDC::CalcBoundingBox( long x, long y )
+void wxGTKDCImpl::DoGetSizeMM( int* width, int* height ) const

 {
 {

-  if (x < m_minX) m_minX = x;
-  if (y < m_minY) m_minY = y;
-  if (x > m_maxX) m_maxX = x;
-  if (y > m_maxY) m_maxY = y;
+    int w = 0;
+    int h = 0;
+    GetOwner()->GetSize( &w, &h );
+    if (width) *width = int( double(w) / (m_userScaleX*m_mm_to_pix_x) );
+    if (height) *height = int( double(h) / (m_userScaleY*m_mm_to_pix_y) );

 }
 
 }
 

-void wxDC::ComputeScaleAndOrigin(void)
+// Resolution in pixels per logical inch
+wxSize wxGTKDCImpl::GetPPI() const

 {
 {

-  // CMB: copy scale to see if it changes
-  double origScaleX = m_scaleX;
-  double origScaleY = m_scaleY;
-
-  m_scaleX = m_logicalScaleX * m_userScaleX;
-  m_scaleY = m_logicalScaleY * m_userScaleY;
-
-  // CMB: if scale has changed call SetPen to recalulate the line width 
-  if (m_scaleX != origScaleX || m_scaleY != origScaleY)
-  {
-    // this is a bit artificial, but we need to force wxDC to think
-    // the pen has changed
-    wxPen* pen = GetPen();
-    wxPen tempPen;
-    m_pen = tempPen;
-    SetPen(pen);
-  }
+    // TODO (should probably be pure virtual)
+    return wxSize(0, 0);

 }
 }

-
+#endif