Added wxRegion version of wxWindowDC::SetClippingRegion

[wxWidgets.git] / include / wx / motif / dc.h

diff --git a/include/wx/motif/dc.h b/include/wx/motif/dc.h
index 0b3cd868acdb5e86a76a62dd34861e2808c30fdd..6c311940aaf12a18a885bde9602171fc297d23ee 100644 (file)
--- a/include/wx/motif/dc.h
+++ b/include/wx/motif/dc.h
@@ -137,7 +137,7 @@ class WXDLLEXPORT wxDC: public wxObject
     }
 
     virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );
     }
 
     virtual void DrawSpline( long x1, long y1, long x2, long y2, long x3, long y3 );

-    virtual void DrawSpline( wxList *points );
+    virtual void DrawSpline( wxList *points ) = 0;

     virtual void DrawSpline( int n, wxPoint points[] );
     
     virtual bool CanDrawBitmap(void) const = 0;
     virtual void DrawSpline( int n, wxPoint points[] );
     
     virtual bool CanDrawBitmap(void) const = 0;


@@ -238,7 +238,7 @@ class WXDLLEXPORT wxDC: public wxObject
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
     
 
     virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );
     

-    virtual void SetOptimization( bool WXUNUSED(optimize) ) {};
+    virtual void SetOptimization( bool optimize ) { m_optimize = optimize; };

     virtual bool GetOptimization(void) { return m_optimize; };
     
     virtual long DeviceToLogicalX(long x) const;
     virtual bool GetOptimization(void) { return m_optimize; };
     
     virtual long DeviceToLogicalX(long x) const;


@@ -293,6 +293,15 @@ class WXDLLEXPORT wxDC: public wxObject
          else
            return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
        }
          else
            return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
        }

+    // Without device translation, for backing pixmap purposes
+    long XLOG2DEV_2(long x) const
+       { 
+         long new_x = x - m_logicalOriginX;
+         if (new_x > 0)
+           return (long)((double)(new_x) * m_scaleX + 0.5) * m_signX;
+         else
+           return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX;
+       }

     long XLOG2DEVREL(long x) const
        { 
          if (x > 0)
     long XLOG2DEVREL(long x) const
        { 
          if (x > 0)


@@ -308,6 +317,15 @@ class WXDLLEXPORT wxDC: public wxObject
          else
            return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
        }
          else
            return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
        }

+    // Without device translation, for backing pixmap purposes
+    long YLOG2DEV_2(long y) const
+       {
+         long new_y = y - m_logicalOriginY;
+         if (new_y > 0)
+           return (long)((double)(new_y) * m_scaleY + 0.5) * m_signY;
+         else
+           return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY;
+       }

     long YLOG2DEVREL(long y) const
        { 
          if (y > 0)
     long YLOG2DEVREL(long y) const
        { 
          if (y > 0)


@@ -316,8 +334,6 @@ class WXDLLEXPORT wxDC: public wxObject
            return (long)((double)(y) * m_scaleY - 0.5);
        }
   
            return (long)((double)(y) * m_scaleY - 0.5);
        }
   

-    virtual void DrawOpenSpline( wxList *points ) = 0;
-       

   public:
     
     bool         m_ok;
   public:
     
     bool         m_ok;


@@ -326,6 +342,8 @@ class WXDLLEXPORT wxDC: public wxObject
     // not sure, what these mean
     bool         m_clipping;      // Is clipping on right now ?
     bool         m_optimize;      // wxMSW only ?
     // not sure, what these mean
     bool         m_clipping;      // Is clipping on right now ?
     bool         m_optimize;      // wxMSW only ?

+    bool         m_isInteractive; // For wxPostScriptDC
+    wxString     m_filename;      // Ditto

     
     wxPen        m_pen;
     wxBrush      m_brush;
     
     wxPen        m_pen;
     wxBrush      m_brush;