Fix building wxSTC as a DLL using MinGW GCC 3.x.

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

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index 06bf7595ba9550ece2932e6475af8d3b06ebdc3a..6411ccaf560d13dd077d3afb036121452e3f7393 100644 (file)
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -1,18 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dc.h
 // Purpose:     wxDC class
 /////////////////////////////////////////////////////////////////////////////
 // Name:        dc.h
 // Purpose:     wxDC class

-// Author:      AUTHOR
+// Author:      Stefan Csomor

 // Modified by:
 // Modified by:

-// Created:     ??/??/98
+// Created:     1998-01-01

 // RCS-ID:      $Id$
 // RCS-ID:      $Id$

-// Copyright:   (c) AUTHOR
-// Licence:    wxWindows licence
+// Copyright:   (c) Stefan Csomor
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_DC_H_
 #define _WX_DC_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma interface "dc.h"
 #endif
 
 #pragma interface "dc.h"
 #endif
 


@@ -21,21 +21,20 @@
 #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
 //-----------------------------------------------------------------------------
 
 #ifndef MM_TEXT
 
 //-----------------------------------------------------------------------------
 // constants
 //-----------------------------------------------------------------------------
 
 #ifndef MM_TEXT

-#define MM_TEXT                        0
-#define MM_ISOTROPIC   1
-#define MM_ANISOTROPIC 2
-#define MM_LOMETRIC            3
-#define MM_HIMETRIC            4
-#define MM_TWIPS               5
-#define MM_POINTS              6
-#define MM_METRIC              7
+#define MM_TEXT            0
+#define MM_ISOTROPIC    1
+#define MM_ANISOTROPIC    2
+#define MM_LOMETRIC        3
+#define MM_HIMETRIC        4
+#define MM_TWIPS        5
+#define MM_POINTS        6
+#define MM_METRIC        7

 #endif
 
 //-----------------------------------------------------------------------------
 #endif
 
 //-----------------------------------------------------------------------------


@@ -44,22 +43,15 @@
 
 extern int wxPageNumber;
 
 
 extern int wxPageNumber;
 

+class wxMacPortStateHelper ;

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

-class WXDLLEXPORT wxMacPortSetter
-{
-public :
-       wxMacPortSetter( const wxDC* dc ) ;
-       ~wxMacPortSetter() ;
-private :
-       AGAPortHelper m_ph ;
-} ;
-

 class WXDLLEXPORT wxDC: public wxDCBase
 {
 class WXDLLEXPORT wxDC: public wxDCBase
 {

-  DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_DYNAMIC_CLASS(wxDC)
+    DECLARE_NO_COPY_CLASS(wxDC)

 
   public:
 
 
   public:
 


@@ -117,88 +109,88 @@ class WXDLLEXPORT wxDC: public wxDCBase
   
     
     wxCoord XDEV2LOG(wxCoord x) const
   
     
     wxCoord XDEV2LOG(wxCoord x) const

-       {
-         long new_x = x - m_deviceOriginX ;
-         if (new_x > 0) 
-           return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
-         else
-           return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
-       }
+    {
+      long new_x = x - m_deviceOriginX ;
+      if (new_x > 0)
+        return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
+      else
+        return (wxCoord)((double)(new_x) / m_scaleX - 0.5) * m_signX + m_logicalOriginX;
+    }

     wxCoord XDEV2LOGREL(wxCoord x) const
     wxCoord XDEV2LOGREL(wxCoord x) const

-       { 
-         if (x > 0) 
-           return (wxCoord)((double)(x) / m_scaleX + 0.5);
-         else
-           return (wxCoord)((double)(x) / m_scaleX - 0.5);
-       }
+    { 
+      if (x > 0)
+        return (wxCoord)((double)(x) / m_scaleX + 0.5);
+      else
+        return (wxCoord)((double)(x) / m_scaleX - 0.5);
+    }

     wxCoord YDEV2LOG(wxCoord y) const
     wxCoord YDEV2LOG(wxCoord y) const

-       {
-         long new_y = y - m_deviceOriginY ;
-         if (new_y > 0)
-           return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
-         else
-           return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
-       }
+    {
+      long new_y = y - m_deviceOriginY ;
+      if (new_y > 0)
+        return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
+      else
+        return (wxCoord)((double)(new_y) / m_scaleY - 0.5) * m_signY + m_logicalOriginY;
+    }

     wxCoord YDEV2LOGREL(wxCoord y) const
     wxCoord YDEV2LOGREL(wxCoord y) const

-       { 
-         if (y > 0)
-           return (wxCoord)((double)(y) / m_scaleY + 0.5);
-         else
-           return (wxCoord)((double)(y) / m_scaleY - 0.5);
-       }
+    { 
+      if (y > 0)
+        return (wxCoord)((double)(y) / m_scaleY + 0.5);
+      else
+        return (wxCoord)((double)(y) / m_scaleY - 0.5);
+    }

     wxCoord XLOG2DEV(wxCoord x) const
     wxCoord XLOG2DEV(wxCoord x) const

-       { 
-         long new_x = x - m_logicalOriginX;
-         if (new_x > 0)
-           return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX  ;
-         else
-           return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ;
-       }
+    { 
+      long new_x = x - m_logicalOriginX;
+      if (new_x > 0)
+        return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX  ;
+      else
+        return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ;
+    }

     wxCoord XLOG2DEVREL(wxCoord x) const
     wxCoord XLOG2DEVREL(wxCoord x) const

-       { 
-         if (x > 0)
-           return (wxCoord)((double)(x) * m_scaleX + 0.5);
-         else
-           return (wxCoord)((double)(x) * m_scaleX - 0.5);
-       }
+    { 
+      if (x > 0)
+        return (wxCoord)((double)(x) * m_scaleX + 0.5);
+      else
+        return (wxCoord)((double)(x) * m_scaleX - 0.5);
+    }

     wxCoord YLOG2DEV(wxCoord y) const
     wxCoord YLOG2DEV(wxCoord y) const

-       {
-         long new_y = y - m_logicalOriginY ;
-         if (new_y > 0)
-           return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY ;
-         else
-           return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ;
-       }
+    {
+      long new_y = y - m_logicalOriginY ;
+      if (new_y > 0)
+        return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY ;
+      else
+        return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ;
+    }

     wxCoord YLOG2DEVREL(wxCoord y) const
     wxCoord YLOG2DEVREL(wxCoord y) const

-       { 
-         if (y > 0)
-           return (wxCoord)((double)(y) * m_scaleY + 0.5);
-         else
-           return (wxCoord)((double)(y) * m_scaleY - 0.5);
-       }
+    { 
+      if (y > 0)
+        return (wxCoord)((double)(y) * m_scaleY + 0.5);
+      else
+        return (wxCoord)((double)(y) * m_scaleY - 0.5);
+    }

     wxCoord XLOG2DEVMAC(wxCoord x) const
     wxCoord XLOG2DEVMAC(wxCoord x) const

-       { 
-         long new_x = x - m_logicalOriginX;
-         if (new_x > 0)
-           return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.h ;
-         else
-           return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.h ;
-       }
+    { 
+      long new_x = x - m_logicalOriginX;
+      if (new_x > 0)
+        return (wxCoord)((double)(new_x) * m_scaleX + 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
+      else
+        return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
+    }

     wxCoord YLOG2DEVMAC(wxCoord y) const
     wxCoord YLOG2DEVMAC(wxCoord y) const

-       {
-         long new_y = y - m_logicalOriginY ;
-         if (new_y > 0)
-           return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.v ;
-         else
-           return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.v ;
-       }
-  
-    RgnHandle MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
+    {
+      long new_y = y - m_logicalOriginY ;
+      if (new_y > 0)
+        return (wxCoord)((double)(new_y) * m_scaleY + 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
+      else
+        return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
+    }
+
+    WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }

     static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
 //
 
 protected:
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
 //
 
 protected:

-    virtual void DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
+    virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,

                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;
                              int style = wxFLOOD_SURFACE);
 
     virtual bool DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const;


@@ -244,7 +236,6 @@ protected:
         GetClippingBox(x, y, width, 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[],
     virtual void DoGetSizeMM(int* width, int* height) const;
 
     virtual void DoDrawLines(int n, wxPoint points[],


@@ -260,33 +251,41 @@ protected:
     // not yet used
     bool         m_needComputeScaleX,m_needComputeScaleY;         
     // If un-scrolled is non-zero or d.o. changes with scrolling.
     // not yet used
     bool         m_needComputeScaleX,m_needComputeScaleY;         
     // If un-scrolled is non-zero or d.o. changes with scrolling.

-       // Set using SetInternalDeviceOrigin().
-       long         m_internalDeviceOriginX,m_internalDeviceOriginY;  
-        // To be set by external classes such as wxScrolledWindow
-        // using SetDeviceOrigin()
-    long         m_externalDeviceOriginX,m_externalDeviceOriginY;  
+    // Set using SetInternalDeviceOrigin().
+    long         m_internalDeviceOriginX,m_internalDeviceOriginY;
+     // To be set by external classes such as wxScrolledWindow
+     // using SetDeviceOrigin()
+    long         m_externalDeviceOriginX,m_externalDeviceOriginY;

                                                                     
     // Begin implementation for Mac
     public:
                                                                     
     // Begin implementation for Mac
     public:

-                                                                   
-       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
-
-       void                                    MacInstallFont() const ;
-       void                                    MacInstallPen() const ;
-       void                                    MacInstallBrush() const ;
-       
-       mutable bool    m_macFontInstalled ;
-       mutable bool    m_macPenInstalled ;
-       mutable bool    m_macBrushInstalled ;
-       
-       RgnHandle                               m_macBoundaryClipRgn ;
-       RgnHandle               m_macCurrentClipRgn ;
-       Point                                   m_macLocalOrigin ;
-       void                                    MacSetupPort( AGAPortHelper* ph ) const ;
+                                    
+    WXHDC                m_macPort ;
+    WXHBITMAP            m_macMask ;
+
+    // in order to preserve the const inheritance of the virtual functions, we have to 
+    // use mutable variables starting from CWPro 5
+
+    void                    MacInstallFont() const ;
+    void                    MacInstallPen() const ;
+    void                    MacInstallBrush() const ;
+
+    mutable bool    m_macFontInstalled ;
+    mutable bool    m_macPenInstalled ;
+    mutable bool    m_macBrushInstalled ;
+
+    WXHRGN                    m_macBoundaryClipRgn ;
+    WXHRGN                  m_macCurrentClipRgn ;
+    wxPoint                    m_macLocalOrigin ;
+    void                    MacSetupPort( wxMacPortStateHelper* ph ) const ;
+    void                    MacCleanupPort( wxMacPortStateHelper* ph ) const ;
+    mutable void*                   m_macATSUIStyle ;
+    mutable wxMacPortStateHelper*   m_macCurrentPortStateHelper ;
+    mutable bool                    m_macFormerAliasState ;
+    mutable short                   m_macFormerAliasSize ;
+    mutable bool                    m_macAliasWasEnabled ;
+    mutable void*                   m_macForegroundPixMap ;
+    mutable void*                   m_macBackgroundPixMap ;

 };
 
 #endif
 };
 
 #endif