X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dfad0599246651d4994e348d868a3e65613c7379..169935ad4ed842421ef24470a06d1aa298f90fbe:/src/motif/dc.cpp

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index ba10348f3d..bd526de291 100644
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -14,6 +14,7 @@
 #endif
 
 #include "wx/dc.h"
+#include "wx/dcmemory.h"
 
 #if !USE_SHARED_LIBRARY
 IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
@@ -36,351 +37,376 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
 
 wxDC::wxDC(void)
 {
-  m_ok = FALSE;
-  m_optimize = 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_internalDeviceOriginX = 0;
-  m_internalDeviceOriginY = 0;
-  m_externalDeviceOriginX = 0;
-  m_externalDeviceOriginY = 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_isInteractive = FALSE;
-  
-//  m_palette = wxAPP_COLOURMAP;
+    m_ok = FALSE;
+    m_optimize = 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_internalDeviceOriginX = 0;
+    m_internalDeviceOriginY = 0;
+    m_externalDeviceOriginX = 0;
+    m_externalDeviceOriginY = 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_isInteractive = FALSE;
+    
+    //  m_palette = wxAPP_COLOURMAP;
 };
 
 wxDC::~wxDC(void)
 {
 };
 
-void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) )
+void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y))
 {
 };
 
+void wxDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask )
+{
+    if (!bitmap.Ok())
+        return;
+    
+    wxMemoryDC memDC;
+    memDC.SelectObject(bitmap);
+    
+    /* Not sure if we need this. The mask should leave the
+    * masked areas as per the original background of this DC.
+    if (useMask)
+    {
+    // There might be transparent areas, so make these
+    // the same colour as this DC
+    memDC.SetBackground(* GetBackground());
+    memDC.Clear();
+    }
+    */
+    
+    Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), & memDC, 0, 0, wxCOPY, useMask);
+    
+    memDC.SelectObject(wxNullBitmap);
+};
+
+
 void wxDC::DrawPoint( wxPoint& point ) 
 { 
-  DrawPoint( point.x, point.y ); 
+    DrawPoint( point.x, point.y ); 
 };
 
 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;
+    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;
 };
 
 void wxDC::DrawLines( wxList *list, long xoffset, long yoffset )
 {
-  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;
+    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;
 };
 
 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();
-  };
+    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();
+    };
 };
 
 void wxDC::DrawSpline( int n, wxPoint points[] )
 {
-  wxList list;
-  for (int i = 0; i < n; i++) list.Append( (wxObject*)&points[i] );
-  DrawSpline( &list );
+    wxList list;
+    for (int i = 0; i < n; i++) list.Append( (wxObject*)&points[i] );
+    DrawSpline( &list );
 };
 
 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;
+    m_clipping = TRUE;
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + width;
+    m_clipY2 = y + height;
 };
 
 void wxDC::DestroyClippingRegion(void)
 {
-  m_clipping = FALSE;
+    m_clipping = FALSE;
 };
 
 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;
+    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;
+    *width = m_maxX-m_minX;
+    *height = m_maxY-m_minY;
 };
 
 void wxDC::GetSizeMM( long* width, long* height ) const
 {
-  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) );
+    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) );
 };
 
 void wxDC::SetTextForeground( const wxColour &col )
 {
-  if (!Ok()) return;
-  m_textForegroundColour = col;
+    if (!Ok()) return;
+    m_textForegroundColour = col;
 };
 
 void wxDC::SetTextBackground( const wxColour &col )
 {
-  if (!Ok()) return;
-  m_textBackgroundColour = col;
+    if (!Ok()) return;
+    m_textBackgroundColour = col;
 };
 
 void wxDC::SetMapMode( int mode )
 {
-  switch (mode) 
-  {
+    switch (mode) 
+    {
     case MM_TWIPS:
-      SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
-      break;
+        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;
+        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;
+        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;
+        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;
-  };
+        SetLogicalScale( 1.0, 1.0 );
+        break;
+    };
+    if (mode != MM_TEXT)
+    {
+        m_needComputeScaleX = TRUE;
+        m_needComputeScaleY = TRUE;
+    };
 };
 
 void wxDC::SetUserScale( double x, double y )
 {
-  // allow negative ? -> no
-  m_userScaleX = x;
-  m_userScaleY = y;
-  ComputeScaleAndOrigin();
+    // allow negative ? -> no
+    m_userScaleX = x;
+    m_userScaleY = y;
+    ComputeScaleAndOrigin();
 };
 
 void wxDC::GetUserScale( double *x, double *y )
 {
-  if (x) *x = m_userScaleX;
-  if (y) *y = m_userScaleY;
+    if (x) *x = m_userScaleX;
+    if (y) *y = m_userScaleY;
 };
 
 void wxDC::SetLogicalScale( double x, double y )
 {
-  // allow negative ?
-  m_logicalScaleX = x;
-  m_logicalScaleY = y;
-  ComputeScaleAndOrigin();
+    // allow negative ?
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;
+    ComputeScaleAndOrigin();
 };
 
 void wxDC::GetLogicalScale( double *x, double *y )
 {
-  if (x) *x = m_logicalScaleX;
-  if (y) *y = m_logicalScaleY;
+    if (x) *x = m_logicalScaleX;
+    if (y) *y = m_logicalScaleY;
 };
 
 void wxDC::SetLogicalOrigin( long x, long y )
 {
-  m_logicalOriginX = x * m_signX;   // is this still correct ?
-  m_logicalOriginY = y * m_signY;
-  ComputeScaleAndOrigin();
+    m_logicalOriginX = x * m_signX;   // is this still correct ?
+    m_logicalOriginY = y * m_signY;
+    ComputeScaleAndOrigin();
 };
 
 void wxDC::GetLogicalOrigin( long *x, long *y )
 {
-  if (x) *x = m_logicalOriginX;
-  if (y) *y = m_logicalOriginY;
+    if (x) *x = m_logicalOriginX;
+    if (y) *y = m_logicalOriginY;
 };
 
 void wxDC::SetDeviceOrigin( long x, long y )
 {
-  m_externalDeviceOriginX = x;
-  m_externalDeviceOriginY = y;
-  ComputeScaleAndOrigin();
+    m_externalDeviceOriginX = x;
+    m_externalDeviceOriginY = y;
+    ComputeScaleAndOrigin();
 };
 
 void wxDC::GetDeviceOrigin( long *x, long *y )
 {
-//  if (x) *x = m_externalDeviceOriginX;
-//  if (y) *y = m_externalDeviceOriginY;
-  if (x) *x = m_deviceOriginX;
-  if (y) *y = m_deviceOriginY;
+    //  if (x) *x = m_externalDeviceOriginX;
+    //  if (y) *y = m_externalDeviceOriginY;
+    if (x) *x = m_deviceOriginX;
+    if (y) *y = m_deviceOriginY;
 };
 
 void wxDC::SetInternalDeviceOrigin( long x, long y )
 {
-  m_internalDeviceOriginX = x;
-  m_internalDeviceOriginY = y;
-  ComputeScaleAndOrigin();
+    m_internalDeviceOriginX = x;
+    m_internalDeviceOriginY = y;
+    ComputeScaleAndOrigin();
 };
 
 void wxDC::GetInternalDeviceOrigin( long *x, long *y )
 {
-  if (x) *x = m_internalDeviceOriginX;
-  if (y) *y = m_internalDeviceOriginY;
+    if (x) *x = m_internalDeviceOriginX;
+    if (y) *y = m_internalDeviceOriginY;
 };
 
 void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
-  m_signX = (xLeftRight ?  1 : -1);
-  m_signY = (yBottomUp  ? -1 :  1);
-  ComputeScaleAndOrigin();
+    m_signX = (xLeftRight ?  1 : -1);
+    m_signY = (yBottomUp  ? -1 :  1);
+    ComputeScaleAndOrigin();
 };
 
 long wxDC::DeviceToLogicalX(long x) const
 {
-  return XDEV2LOG(x);
+    return XDEV2LOG(x);
 };
 
 long wxDC::DeviceToLogicalY(long y) const
 {
-  return YDEV2LOG(y);
+    return YDEV2LOG(y);
 };
 
 long wxDC::DeviceToLogicalXRel(long x) const
 {
-  return XDEV2LOGREL(x);
+    return XDEV2LOGREL(x);
 };
 
 long wxDC::DeviceToLogicalYRel(long y) const
 {
-  return YDEV2LOGREL(y);
+    return YDEV2LOGREL(y);
 };
 
 long wxDC::LogicalToDeviceX(long x) const
 {
-  return XLOG2DEV(x);
+    return XLOG2DEV(x);
 };
 
 long wxDC::LogicalToDeviceY(long y) const
 {
-  return YLOG2DEV(y);
+    return YLOG2DEV(y);
 };
 
 long wxDC::LogicalToDeviceXRel(long x) const
 {
-  return XLOG2DEVREL(x);
+    return XLOG2DEVREL(x);
 };
 
 long wxDC::LogicalToDeviceYRel(long y) const
 {
-  return YLOG2DEVREL(y);
+    return YLOG2DEVREL(y);
 };
-    
+
 void wxDC::CalcBoundingBox( long x, long y )
 {
-  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;
+    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;
 };
 
 void wxDC::ComputeScaleAndOrigin(void)
 {
-  // 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;
-
-  m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX;
-  m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY;
-
-  // 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);
-  }
+    // 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;
+    
+    m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX;
+    m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY;
+    
+    // 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);
+    }
 };