Corrected frame.cpp to recognise wxNO_BORDER properly

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

diff --git a/src/gtk1/dc.cpp b/src/gtk1/dc.cpp
index 6c939ef83c215d15108088afa1b0fc0f8b539a0a..da0b27c97aacfc682066728f05b7178b1f872bf7 100644 (file)
--- a/src/gtk1/dc.cpp
+++ b/src/gtk1/dc.cpp
@@ -4,370 +4,215 @@
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Markus Holzem
 // Author:      Robert Roebling
 // RCS-ID:      $Id$
 // Copyright:   (c) 1998 Robert Roebling, Markus Holzem

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 
 #ifdef __GNUG__

-#pragma implementation "dc.h"
+    #pragma implementation "dc.h"

 #endif
 
 #include "wx/dc.h"
 
 #endif
 
 #include "wx/dc.h"
 

+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+

 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 //-----------------------------------------------------------------------------
 // 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
+#define mm2inches        0.0393700787402
+#define inches2mm        25.4
+#define mm2twips         56.6929133859
+#define twips2mm         0.0176388888889
+#define mm2pt            2.83464566929
+#define pt2mm            0.352777777778

 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 // wxDC
 //-----------------------------------------------------------------------------
 

-IMPLEMENT_ABSTRACT_CLASS(wxDC,wxObject)
+IMPLEMENT_ABSTRACT_CLASS(wxDC, wxDCBase)

 
 

-wxDC::wxDC(void)
+wxDC::wxDC()

 {
 {

-  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_ok = FALSE;

 
 

-wxDC::~wxDC(void)
-{
-}
+    m_mm_to_pix_x = 1.0;
+    m_mm_to_pix_y = 1.0;

 
 

-bool wxDC::Ok(void) const 
-{ 
-  wxASSERT_MSG( m_ok, "invalid display context" );
-  return m_ok; 
-}
+    m_needComputeScaleX = FALSE; /* not used yet */
+    m_needComputeScaleY = FALSE; /* not used yet */

 
 

-void wxDC::DrawArc( long WXUNUSED(x1), long WXUNUSED(y1), long WXUNUSED(x2), long WXUNUSED(y2), 
-  double WXUNUSED(xc), double WXUNUSED(yc) )
-{
-}
+    m_logicalFunction = wxCOPY;

 
 

-void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y), bool WXUNUSED(useMask) ) 
-{
+    m_pen = *wxBLACK_PEN;
+    m_font = *wxNORMAL_FONT;
+    m_brush = *wxWHITE_BRUSH;

 }
 
 }
 

-void wxDC::DrawPoint( wxPoint& point ) 
-{ 
-  DrawPoint( point.x, point.y ); 
-}
-
-void wxDC::DrawPolygon( wxList *list, long xoffset, long yoffset, int fillStyle )
+void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )

 {
 {

-  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;
+    m_clipping = TRUE;
+    m_clipX1 = x;
+    m_clipY1 = y;
+    m_clipX2 = x + width;
+    m_clipY2 = y + height;

 }
 
 }
 

-void wxDC::DrawLines( wxList *list, long xoffset, long yoffset )
+void wxDC::DestroyClippingRegion()

 {
 {

-  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;
+    m_clipping = FALSE;

 }
 
 }
 

-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();
-  }
-}
-
-void wxDC::DrawSpline( int n, wxPoint points[] )
-{
-  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;
-}
+// ---------------------------------------------------------------------------
+// get DC capabilities
+// ---------------------------------------------------------------------------

 
 

-void wxDC::DestroyClippingRegion(void)
+void wxDC::DoGetSize( int* width, int* height ) const

 {
 {

-  m_clipping = FALSE;
+    if (width) *width = m_maxX-m_minX;
+    if (height) *height = m_maxY-m_minY;

 }
 
 }
 

-void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
+void wxDC::DoGetSizeMM( int* width, int* 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;
+    int w = 0;
+    int h = 0;
+    GetSize( &w, &h );
+    if (width) *width = int( double(w) / (m_scaleX*m_mm_to_pix_x) );
+    if (height) *height = int( double(h) / (m_scaleY*m_mm_to_pix_y) );

 }
 
 }
 

-void wxDC::GetSize( int* width, int* height ) const
+// Resolution in pixels per logical inch
+wxSize wxDC::GetPPI() const

 {
 {

-  *width = m_maxX-m_minX;
-  *height = m_maxY-m_minY;
+    // TODO (should probably be pure virtual)
+    return wxSize(0, 0);

 }
 
 }
 

-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) );
-}
+// ---------------------------------------------------------------------------
+// set various DC parameters
+// ---------------------------------------------------------------------------

 
 

-void wxDC::SetTextForeground( const wxColour &col )
+void wxDC::ComputeScaleAndOrigin()

 {
 {

-  if (!Ok()) return;
-  m_textForegroundColour = col;
-}
-
-void wxDC::SetTextBackground( const wxColour &col )
-{
-  if (!Ok()) return;
-  m_textBackgroundColour = col;
+    m_scaleX = m_logicalScaleX * m_userScaleX;
+    m_scaleY = m_logicalScaleY * m_userScaleY;

 }
 
 void wxDC::SetMapMode( int mode )
 {
 }
 
 void wxDC::SetMapMode( int mode )
 {

-  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;
-  }
+    switch (mode)
+    {
+        case wxMM_TWIPS:
+          SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
+          break;
+        case wxMM_POINTS:
+          SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y );
+          break;
+        case wxMM_METRIC:
+          SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y );
+          break;
+        case wxMM_LOMETRIC:
+          SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 );
+          break;
+        default:
+        case wxMM_TEXT:
+          SetLogicalScale( 1.0, 1.0 );
+          break;
+    }
+    m_mappingMode = mode;
+    
+/*  we don't do this mega optimisation
+    if (mode != wxMM_TEXT)
+    {
+        m_needComputeScaleX = TRUE;
+        m_needComputeScaleY = TRUE;
+    }
+*/

 }
 
 void wxDC::SetUserScale( double x, double y )
 {
 }
 
 void wxDC::SetUserScale( double x, double y )
 {

-  // 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;
+    // allow negative ? -> no
+    m_userScaleX = x;
+    m_userScaleY = y;
+    ComputeScaleAndOrigin();

 }
 
 void wxDC::SetLogicalScale( double x, double y )
 {
 }
 
 void wxDC::SetLogicalScale( double x, double y )
 {

-  // 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;
-}
-
-void wxDC::SetLogicalOrigin( long x, long y )
-{
-  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;
+    // allow negative ?
+    m_logicalScaleX = x;
+    m_logicalScaleY = y;
+    ComputeScaleAndOrigin();

 }
 
 }
 

-void wxDC::SetDeviceOrigin( long x, long y )
+void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y )

 {
 {

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

 }
 
 }
 

-void wxDC::GetDeviceOrigin( long *x, long *y )
+void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )

 {
 {

-  if (x) *x = m_deviceOriginX;
-  if (y) *y = m_deviceOriginY;
+    // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
+    m_deviceOriginX = x;
+    m_deviceOriginY = y;
+    ComputeScaleAndOrigin();

 }
 
 void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {
 }
 
 void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp )
 {

-  m_signX = (xLeftRight ?  1 : -1);
-  m_signY = (yBottomUp  ? -1 :  1);
-  ComputeScaleAndOrigin();
+    // only wxPostScripDC has m_signX = -1, we override SetAxisOrientation there
+    m_signX = (xLeftRight ?  1 : -1);
+    m_signY = (yBottomUp  ? -1 :  1);
+    ComputeScaleAndOrigin();

 }
 
 }
 

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

 
 

-long wxDC::DeviceToLogicalY(long y) const
+wxCoord wxDCBase::DeviceToLogicalX(wxCoord x) const

 {
 {

-  return YDEV2LOG(y);
+    return ((wxDC *)this)->XDEV2LOG(x);

 }
 
 }
 

-long wxDC::DeviceToLogicalXRel(long x) const
+wxCoord wxDCBase::DeviceToLogicalY(wxCoord y) const

 {
 {

-  return XDEV2LOGREL(x);
+    return ((wxDC *)this)->YDEV2LOG(y);

 }
 
 }
 

-long wxDC::DeviceToLogicalYRel(long y) const
+wxCoord wxDCBase::DeviceToLogicalXRel(wxCoord x) const

 {
 {

-  return YDEV2LOGREL(y);
+    return ((wxDC *)this)->XDEV2LOGREL(x);

 }
 
 }
 

-long wxDC::LogicalToDeviceX(long x) const
+wxCoord wxDCBase::DeviceToLogicalYRel(wxCoord y) const

 {
 {

-  return XLOG2DEV(x);
+    return ((wxDC *)this)->YDEV2LOGREL(y);

 }
 
 }
 

-long wxDC::LogicalToDeviceY(long y) const
+wxCoord wxDCBase::LogicalToDeviceX(wxCoord x) const

 {
 {

-  return YLOG2DEV(y);
+    return ((wxDC *)this)->XLOG2DEV(x);

 }
 
 }
 

-long wxDC::LogicalToDeviceXRel(long x) const
+wxCoord wxDCBase::LogicalToDeviceY(wxCoord y) const

 {
 {

-  return XLOG2DEVREL(x);
+    return ((wxDC *)this)->YLOG2DEV(y);

 }
 
 }
 

-long wxDC::LogicalToDeviceYRel(long y) const
-{
-  return YLOG2DEVREL(y);
-}
-    
-void wxDC::CalcBoundingBox( long x, long y )
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) 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;
+    return ((wxDC *)this)->XLOG2DEVREL(x);

 }
 
 }
 

-void wxDC::ComputeScaleAndOrigin(void)
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) 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
-      // Using this code, wxDC will ignore the new settings
-      // so it's complete non-sense, Robert Roebling TODO!!
-    wxPen* pen = GetPen();
-    wxPen tempPen;
-    m_pen = tempPen;
-    SetPen(pen);
-  }
+    return ((wxDC *)this)->YLOG2DEVREL(y);

 }
 
 }