warning fix

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

diff --git a/src/motif/dc.cpp b/src/motif/dc.cpp
index 319fe79b5f914eed5e0b39f29420978d0bb77d42..cc5c5359a40be7d4cef5683d2b29c5bc72abf11f 100644 (file)
--- a/src/motif/dc.cpp
+++ b/src/motif/dc.cpp
@@ -6,237 +6,121 @@
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

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

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

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

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

+#include "wx/defs.h"

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
-#endif
+    IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)

 
 //-----------------------------------------------------------------------------
 // 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
 //-----------------------------------------------------------------------------
 

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

 {
     m_ok = FALSE;
 {
     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_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 = wxMM_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 = 0;
-    m_minX = m_minY = 0;
-    
-    m_logicalFunction = wxCOPY;
-    //  m_textAlignment = wxALIGN_TOP_LEFT;
+

     m_backgroundMode = wxTRANSPARENT;
     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_isInteractive = FALSE;

-    
-    //  m_palette = wxAPP_COLOURMAP;
-};
+}

 
 

-wxDC::~wxDC(void)
+void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y)

 {
 {

-};
+    wxCHECK_RET( Ok(), "invalid dc" );
+    wxCHECK_RET( icon.Ok(), "invalid icon" );

 
 

-void wxDC::DrawIcon( const wxIcon &WXUNUSED(icon), long WXUNUSED(x), long WXUNUSED(y))
-{
-};
+    DoDrawBitmap(icon, x, y, TRUE);
+}

 
 

-void wxDC::DrawBitmap( const wxBitmap& bitmap, long x, long y, bool useMask )
+void wxDC::DoDrawBitmap( const wxBitmap& bitmap, wxCoord x, wxCoord y, bool useMask )

 {
 {

-    if (!bitmap.Ok())
-        return;
-    
+    wxCHECK_RET( bitmap.Ok(), "invalid bitmap" );
+

     wxMemoryDC memDC;
     memDC.SelectObject(bitmap);
     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 0
+    // Not sure if we need this. The mask should leave the masked areas as per
+    // the original background of this DC.

     if (useMask)
     {
     if (useMask)
     {

-    // There might be transparent areas, so make these
-    // the same colour as this DC
-    memDC.SetBackground(* GetBackground());
-    memDC.Clear();
+        // 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 ); 
-};
+#endif // 0

 
 

-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;
-};
-
-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;
-};
-
-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();
-    };
-};
+    Blit(x, y, bitmap.GetWidth(), bitmap.GetHeight(), &memDC, 0, 0, wxCOPY, useMask);

 
 

-void wxDC::DrawSpline( int n, wxPoint points[] )
-{
-    wxList list;
-    for (int i = 0; i < n; i++) list.Append( (wxObject*)&points[i] );
-    DrawSpline( &list );
-};
+    memDC.SelectObject(wxNullBitmap);
+}

 
 

-void wxDC::SetClippingRegion( long x, long y, long width, long height )
+void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord 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)
+void wxDC::DestroyClippingRegion()

 {
     m_clipping = FALSE;
 {
     m_clipping = FALSE;

-};
+}

 
 

-void wxDC::GetClippingBox( long *x, long *y, long *width, long *height ) const
+void wxDC::DoGetSize( 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;
-};
+    if ( width )
+        *width = m_maxX - m_minX;
+    if ( height )
+        *height = m_maxY - m_minY;
+}

 
 

-void wxDC::GetSize( int* width, int* height ) const
+void wxDC::DoGetSizeMM( int* width, int* height ) const

 {
 {

-    *width = m_maxX-m_minX;
-    *height = m_maxY-m_minY;
-};
-
-void wxDC::GetSizeMM( long* width, long* height ) const
-{
-    int w = 0;
-    int h = 0;
+    int w, h;

     GetSize( &w, &h );
     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 ( 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::SetTextBackground( const wxColour &col )
+// Resolution in pixels per logical inch
+wxSize wxDC::GetPPI() const

 {
 {

-    if (!Ok()) return;
-    m_textBackgroundColour = col;
-};
+    // TODO (should probably be pure virtual)
+    return wxSize(0, 0);
+}

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

-    switch (mode) 
+    switch (mode)

     {
     case wxMM_TWIPS:
         SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
     {
     case wxMM_TWIPS:
         SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );


@@ -254,13 +138,13 @@ void wxDC::SetMapMode( int mode )
     case wxMM_TEXT:
         SetLogicalScale( 1.0, 1.0 );
         break;
     case wxMM_TEXT:
         SetLogicalScale( 1.0, 1.0 );
         break;

-    };
+    }

     if (mode != wxMM_TEXT)
     {
         m_needComputeScaleX = TRUE;
         m_needComputeScaleY = TRUE;
     if (mode != wxMM_TEXT)
     {
         m_needComputeScaleX = TRUE;
         m_needComputeScaleY = TRUE;

-    };
-};
+    }
+}

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


@@ -268,13 +152,7 @@ void wxDC::SetUserScale( double x, double y )
     m_userScaleX = x;
     m_userScaleY = y;
     ComputeScaleAndOrigin();
     m_userScaleX = x;
     m_userScaleY = y;
     ComputeScaleAndOrigin();

-};
-
-void wxDC::GetUserScale( double *x, double *y )
-{
-    if (x) *x = m_userScaleX;
-    if (y) *y = m_userScaleY;
-};
+}

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


@@ -282,131 +160,73 @@ void wxDC::SetLogicalScale( double x, double y )
     m_logicalScaleX = x;
     m_logicalScaleY = y;
     ComputeScaleAndOrigin();
     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 )
+void wxDC::SetLogicalOrigin( wxCoord x, wxCoord 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 )
+void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y )

 {
 {

-    if (x) *x = m_logicalOriginX;
-    if (y) *y = m_logicalOriginY;
-};
-
-void wxDC::SetDeviceOrigin( long x, long y )
-{
-    m_externalDeviceOriginX = x;
-    m_externalDeviceOriginY = y;
+    // only wxPostScripDC has m_signX = -1, we override SetDeviceOrigin there
+    m_deviceOriginX = x;
+    m_deviceOriginY = y;

     ComputeScaleAndOrigin();
     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;
-};
-
-void wxDC::SetInternalDeviceOrigin( long x, long y )
-{
-    m_internalDeviceOriginX = x;
-    m_internalDeviceOriginY = y;
-    ComputeScaleAndOrigin();
-};
-
-void wxDC::GetInternalDeviceOrigin( long *x, long *y )
-{
-    if (x) *x = m_internalDeviceOriginX;
-    if (y) *y = m_internalDeviceOriginY;
-};
+}

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

-    m_signX = (xLeftRight ?  1 : -1);
-    m_signY = (yBottomUp  ? -1 :  1);
+    m_signX = xLeftRight ?  1 : -1;
+    m_signY = yBottomUp  ? -1 :  1;

     ComputeScaleAndOrigin();
     ComputeScaleAndOrigin();

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

 
 

-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
+wxCoord wxDCBase::LogicalToDeviceXRel(wxCoord x) const

 {
 {

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

 
 

-void wxDC::CalcBoundingBox( long x, long y )
+wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) 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)->YLOG2DEVREL(y);
+}

 
 

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

 {
 {

-    // 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_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);
-    }
-};
+}