Fix for Bug #229543

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

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 82c959b4c7b3e81c07269098dffd2462f094007d..19b29a926dd567272a7f8f8cdbac64948374af17 100644 (file)
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -21,6 +21,7 @@
 #include "wx/icon.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"
 #include "wx/icon.h"
 #include "wx/font.h"
 #include "wx/gdicmn.h"

+#include "wx/mac/aga.h"

 
 //-----------------------------------------------------------------------------
 // constants
 
 //-----------------------------------------------------------------------------
 // constants


@@ -47,15 +48,65 @@ extern int wxPageNumber;
 // wxDC
 //-----------------------------------------------------------------------------
 
 // wxDC
 //-----------------------------------------------------------------------------
 

-class WXDLLEXPORT wxDC: public wxObject
+class WXDLLEXPORT wxDC: public wxDCBase

 {
 {

-  DECLARE_ABSTRACT_CLASS(wxDC)
+  DECLARE_DYNAMIC_CLASS(wxDC)

 
   public:
 
 
   public:
 

-    wxDC(void);
-    ~wxDC(void);
+    wxDC();
+    ~wxDC();

     
     

+
+    // implement base class pure virtuals
+    // ----------------------------------
+
+    virtual void Clear();
+
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; };
+    virtual void EndDoc(void) {};
+    
+    virtual void StartPage(void) {};
+    virtual void EndPage(void) {};
+
+    virtual void SetFont(const wxFont& font);
+    virtual void SetPen(const wxPen& pen);
+    virtual void SetBrush(const wxBrush& brush);
+    virtual void SetBackground(const wxBrush& brush);
+    virtual void SetBackgroundMode(int mode);
+    virtual void SetPalette(const wxPalette& palette);
+
+    virtual void DestroyClippingRegion();
+
+    virtual wxCoord GetCharHeight() const;
+    virtual wxCoord GetCharWidth() const;
+    virtual void DoGetTextExtent(const wxString& string,
+                                 wxCoord *x, wxCoord *y,
+                                 wxCoord *descent = NULL,
+                                 wxCoord *externalLeading = NULL,
+                                 wxFont *theFont = NULL) const;
+
+    virtual bool CanDrawBitmap() const;
+    virtual bool CanGetTextExtent() const;
+    virtual int GetDepth() const;
+    virtual wxSize GetPPI() const;
+
+    virtual void SetMapMode(int mode);
+    virtual void SetUserScale(double x, double y);
+
+    virtual void SetLogicalScale(double x, double y);
+    virtual void SetLogicalOrigin(wxCoord x, wxCoord y);
+    virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
+    virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
+    virtual void SetLogicalFunction(int function);
+
+    virtual void SetTextForeground(const wxColour& colour) ;
+    virtual void SetTextBackground(const wxColour& colour) ;
+
+//
+//
+
+/*

     void BeginDrawing(void) {};
     void EndDrawing(void) {};
     
     void BeginDrawing(void) {};
     void EndDrawing(void) {};
     


@@ -165,20 +216,9 @@ class WXDLLEXPORT wxDC: public wxObject
     }
 
     virtual bool CanGetTextExtent(void) const ;
     }
 
     virtual bool CanGetTextExtent(void) const ;

-    virtual void GetTextExtent( const wxString &string, long *width, long *height,
-                     long *descent = NULL, long *externalLeading = NULL,
-                     wxFont *theFont = NULL, bool use16 = FALSE ) const ;

     virtual void GetTextExtent( const wxString &string, int *width, int *height,
                      int *descent = NULL, int *externalLeading = NULL,
     virtual void GetTextExtent( const wxString &string, int *width, int *height,
                      int *descent = NULL, int *externalLeading = NULL,

-                     wxFont *theFont = NULL, bool use16 = FALSE ) const 
-    {
-       long lwidth,lheight,ldescent,lexternal ;
-       GetTextExtent( string, &lwidth,&lheight,&ldescent,&lexternal,theFont,use16 ) ;
-       *width = lwidth ;
-       *height = lheight ;
-       if (descent) *descent = ldescent ;
-       if (externalLeading) *externalLeading = lexternal ;
-    }
+                     wxFont *theFont = NULL, bool use16 = FALSE ) const ;

     virtual wxCoord GetCharWidth(void) const;
     virtual wxCoord GetCharHeight(void) const;
     
     virtual wxCoord GetCharWidth(void) const;
     virtual wxCoord GetCharHeight(void) const;
     


@@ -227,27 +267,16 @@ class WXDLLEXPORT wxDC: public wxObject
     inline wxSize GetSize(void) const { int w, h; GetSize(&w, &h); return wxSize(w, h); }
     virtual void GetSizeMM( long* width, long* height ) const;
     
     inline wxSize GetSize(void) const { int w, h; GetSize(&w, &h); return wxSize(w, h); }
     virtual void GetSizeMM( long* width, long* height ) const;
     

-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; };
-    virtual void EndDoc(void) {};
-    virtual void StartPage(void) {};
-    virtual void EndPage(void) {};

     
     

-    virtual void SetMapMode( int mode );

     virtual int GetMapMode(void) const { return m_mappingMode; };
     
     virtual int GetMapMode(void) const { return m_mappingMode; };
     

-    virtual void SetUserScale( double x, double y );

     virtual void GetUserScale( double *x, double *y );
     virtual void GetUserScale( double *x, double *y );

-    virtual void SetLogicalScale( double x, double y );

     virtual void GetLogicalScale( double *x, double *y );
     
     virtual void GetLogicalScale( double *x, double *y );
     

-    virtual void SetLogicalOrigin( long x, long y );

     virtual void GetLogicalOrigin( long *x, long *y );
     virtual void GetLogicalOrigin( long *x, long *y );

-    virtual void SetDeviceOrigin( long x, long y );

     virtual void GetDeviceOrigin( long *x, long *y );
     virtual void SetInternalDeviceOrigin( long x, long y );
     virtual void GetInternalDeviceOrigin( long *x, long *y );
     virtual void GetDeviceOrigin( long *x, long *y );
     virtual void SetInternalDeviceOrigin( long x, long y );
     virtual void GetInternalDeviceOrigin( long *x, long *y );

-
-    virtual void SetAxisOrientation( bool xLeftRight, bool yBottomUp );

     
     virtual void SetOptimization( bool WXUNUSED(optimize) ) {};
     virtual bool GetOptimization(void) { return m_optimize; };
     
     virtual void SetOptimization( bool WXUNUSED(optimize) ) {};
     virtual bool GetOptimization(void) { return m_optimize; };


@@ -261,101 +290,140 @@ class WXDLLEXPORT wxDC: public wxObject
     virtual long LogicalToDeviceXRel(long x) const;
     virtual long LogicalToDeviceYRel(long y) const;
 
     virtual long LogicalToDeviceXRel(long x) const;
     virtual long LogicalToDeviceYRel(long y) const;
 

-  public:
-  

     void CalcBoundingBox( long x, long y );
     void CalcBoundingBox( long x, long y );

+*/
+

     void ComputeScaleAndOrigin(void);
     void ComputeScaleAndOrigin(void);

+  public:
+  

     
     

-    long XDEV2LOG(long x) const
+    wxCoord XDEV2LOG(wxCoord x) const

        {
          long new_x = x - m_deviceOriginX;
          if (new_x > 0) 
        {
          long new_x = x - m_deviceOriginX;
          if (new_x > 0) 

-           return (long)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
+           return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;

          else
          else

-           return (long)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
+           return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;

        }
        }

-    long XDEV2LOGREL(long x) const
+    wxCoord XDEV2LOGREL(wxCoord x) const

        { 
          if (x > 0) 
        { 
          if (x > 0) 

-           return (long)((double)(x) / m_scaleX + 0.5);
+           return (wxCoord)((double)(x) / m_scaleX + 0.5);

          else
          else

-           return (long)((double)(x) / m_scaleX - 0.5);
+           return (wxCoord)((double)(x) / m_scaleX - 0.5);

        }
        }

-    long YDEV2LOG(long y) const
+    wxCoord YDEV2LOG(wxCoord y) const

        {
          long new_y = y - m_deviceOriginY;
          if (new_y > 0)
        {
          long new_y = y - m_deviceOriginY;
          if (new_y > 0)

-           return (long)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
+           return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;

          else
          else

-           return (long)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
+           return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;

        }
        }

-    long YDEV2LOGREL(long y) const
+    wxCoord YDEV2LOGREL(wxCoord y) const

        { 
          if (y > 0)
        { 
          if (y > 0)

-           return (long)((double)(y) / m_scaleY + 0.5);
+           return (wxCoord)((double)(y) / m_scaleY + 0.5);

          else
          else

-           return (long)((double)(y) / m_scaleY - 0.5);
+           return (wxCoord)((double)(y) / m_scaleY - 0.5);

        }
        }

-    long XLOG2DEV(long x) const
+    wxCoord XLOG2DEV(wxCoord x) const

        { 
          long new_x = x - m_logicalOriginX;
          if (new_x > 0)
        { 
          long new_x = x - m_logicalOriginX;
          if (new_x > 0)

-           return (long)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;
+           return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX;

          else
          else

-           return (long)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
+           return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;

        }
        }

-    long XLOG2DEVREL(long x) const
+    wxCoord XLOG2DEVREL(wxCoord x) const

        { 
          if (x > 0)
        { 
          if (x > 0)

-           return (long)((double)(x) * m_scaleX + 0.5);
+           return (wxCoord)((double)(x) * m_scaleX + 0.5);

          else
          else

-           return (long)((double)(x) * m_scaleX - 0.5);
+           return (wxCoord)((double)(x) * m_scaleX - 0.5);

        }
        }

-    long YLOG2DEV(long y) const
+    wxCoord YLOG2DEV(wxCoord y) const

        {
          long new_y = y - m_logicalOriginY;
          if (new_y > 0)
        {
          long new_y = y - m_logicalOriginY;
          if (new_y > 0)

-           return (long)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;
+           return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY;

          else
          else

-           return (long)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
+           return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;

        }
        }

-    long YLOG2DEVREL(long y) const
+    wxCoord YLOG2DEVREL(wxCoord y) const

        { 
          if (y > 0)
        { 
          if (y > 0)

-           return (long)((double)(y) * m_scaleY + 0.5);
+           return (wxCoord)((double)(y) * m_scaleY + 0.5);

          else
          else

-           return (long)((double)(y) * m_scaleY - 0.5);
+           return (wxCoord)((double)(y) * m_scaleY - 0.5);

        }
   
        }
   

-  public:
-    
-    bool         m_ok;
-    bool         m_colour;
-    
-    // not sure, what these mean
-    bool         m_clipping;      // Is clipping on right now ?
-    bool         m_isInteractive; // Is GetPixel possible ?
-    bool         m_autoSetting;   // wxMSW only ?
-    bool         m_dontDelete;    // wxMSW only ?
-    bool         m_optimize;      // wxMSW only ?
-    wxString     m_filename;      // Not sure where this belongs.
-    
-    wxPen        m_pen;
-    wxBrush      m_brush;
-    wxBrush      m_backgroundBrush;
-    wxColour     m_textForegroundColour;
-    wxColour     m_textBackgroundColour;
-    wxFont       m_font;
-    
-    int          m_logicalFunction;
-    int          m_backgroundMode;
-    int          m_textAlignment;    // gone in wxWin 2.0 ?
-    
-    int          m_mappingMode;
+//
+
+protected:
+    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+                             int style = wxFLOOD_SURFACE);
+
+    virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
+
+    virtual void DoDrawPoint(wxCoord x, wxCoord y);
+    virtual void DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2);
+
+    virtual void DoDrawArc(wxCoord x1, wxCoord y1,
+                           wxCoord x2, wxCoord y2,
+                           wxCoord xc, wxCoord yc);

     
     

-    // not sure what for, but what is a mm on a screen you don't know the size of?
+    virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
+                                   double sa, double ea);
+
+    virtual void DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+    virtual void DoDrawRoundedRectangle(wxCoord x, wxCoord y,
+                                        wxCoord width, wxCoord height,
+                                        double radius);
+    virtual void DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height);
+
+    virtual void DoCrossHair(wxCoord x, wxCoord y);
+
+    virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
+    virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
+                              bool useMask = FALSE);
+
+    virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
+    virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+                                   double angle);
+
+    virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
+                        wxDC *source, wxCoord xsrc, wxCoord ysrc,
+                        int rop = wxCOPY, bool useMask = FALSE);
+
+    // this is gnarly - we can't even call this function DoSetClippingRegion()
+    // because of virtual function hiding
+    virtual void DoSetClippingRegionAsRegion(const wxRegion& region);
+    virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
+                                     wxCoord width, wxCoord height);
+    virtual void DoGetClippingRegion(wxCoord *x, wxCoord *y,
+                                     wxCoord *width, wxCoord *height)
+    {
+        GetClippingBox(x, y, width, height);
+    }
+
+    virtual void DoGetSize(int *width, int *height) const;
+    virtual void DoGetSizeMM(int* width, int* height) const;
+
+    virtual void DoDrawLines(int n, wxPoint points[],
+                             wxCoord xoffset, wxCoord yoffset);
+    virtual void DoDrawPolygon(int n, wxPoint points[],
+                               wxCoord xoffset, wxCoord yoffset,
+                               int fillStyle = wxODDEVEN_RULE);
+
+
+
+//
+
+  public:
+//begin wxmac

     double       m_mm_to_pix_x,m_mm_to_pix_y; 
     double       m_mm_to_pix_x,m_mm_to_pix_y; 

-    
+    bool         m_needComputeScaleX,m_needComputeScaleY;         // not yet used

     long         m_internalDeviceOriginX,m_internalDeviceOriginY;   // If un-scrolled is non-zero or
                                                                    // d.o. changes with scrolling.
                                                                    // Set using SetInternalDeviceOrigin().
     long         m_internalDeviceOriginX,m_internalDeviceOriginY;   // If un-scrolled is non-zero or
                                                                    // d.o. changes with scrolling.
                                                                    // Set using SetInternalDeviceOrigin().


@@ -363,25 +431,8 @@ class WXDLLEXPORT wxDC: public wxObject
     long         m_externalDeviceOriginX,m_externalDeviceOriginY;   // To be set by external classes
                                                                     // such as wxScrolledWindow
                                                                    // using SetDeviceOrigin()
     long         m_externalDeviceOriginX,m_externalDeviceOriginY;   // To be set by external classes
                                                                     // such as wxScrolledWindow
                                                                    // using SetDeviceOrigin()

-                                                                   
-    long         m_deviceOriginX,m_deviceOriginY;                   // Sum of the two above.
-    
-    long         m_logicalOriginX,m_logicalOriginY;                 // User defined.
-
-    double       m_scaleX,m_scaleY;
-    double       m_logicalScaleX,m_logicalScaleY;
-    double       m_userScaleX,m_userScaleY;
-    long         m_signX,m_signY;
-    
-    bool         m_needComputeScaleX,m_needComputeScaleY;         // not yet used
-    
-    float        m_scaleFactor;  // wxPSDC wants to have this. Will disappear.
-    
-    long         m_clipX1,m_clipY1,m_clipX2,m_clipY2;
-    long         m_minX,m_maxX,m_minY,m_maxY;
-
-//begin wxmac

        GrafPtr                         m_macPort ;
        GrafPtr                         m_macPort ;

+       GWorldPtr                       m_macMask ;

 
        // in order to preserve the const inheritance of the virtual functions, we have to 
        // use mutable variables starting from CWPro 5
 
        // in order to preserve the const inheritance of the virtual functions, we have to 
        // use mutable variables starting from CWPro 5


@@ -398,10 +449,10 @@ class WXDLLEXPORT wxDC: public wxObject
        GrafPtr                         m_macOrigPort ;
        Rect                                    m_macClipRect ;
        Point                                   m_macLocalOrigin ;
        GrafPtr                         m_macOrigPort ;
        Rect                                    m_macClipRect ;
        Point                                   m_macLocalOrigin ;

-       
+       mutable AGAPortHelper   m_macPortHelper ;

        void                                    MacSetupPort() const ;
        void                                    MacVerifySetup() const { if ( m_macPortId != m_macCurrentPortId ) MacSetupPort() ; } 
        void                                    MacSetupPort() const ;
        void                                    MacVerifySetup() const { if ( m_macPortId != m_macCurrentPortId ) MacSetupPort() ; } 

-
+       static void                             MacInvalidateSetup() { m_macCurrentPortId++ ; }

        static long m_macCurrentPortId ;
 };
 
        static long m_macCurrentPortId ;
 };