removed unneeded ;

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

diff --git a/include/wx/mac/dc.h b/include/wx/mac/dc.h
index ea40eaec03c02ff5be045355d0a23507474f87d6..115742d7966534ebeac7a09ec38cf431d4ede458 100644 (file)
--- a/include/wx/mac/dc.h
+++ b/include/wx/mac/dc.h
@@ -21,7 +21,6 @@
 #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


@@ -44,19 +43,11 @@
 
 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
 {
   DECLARE_DYNAMIC_CLASS(wxDC)
 class WXDLLEXPORT wxDC: public wxDCBase
 {
   DECLARE_DYNAMIC_CLASS(wxDC)


@@ -118,7 +109,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
     
     wxCoord XDEV2LOG(wxCoord x) const
        {
     
     wxCoord XDEV2LOG(wxCoord x) const
        {

-         long new_x = x - m_deviceOriginX;
+         long new_x = x - m_deviceOriginX ;

          if (new_x > 0) 
            return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
          else
          if (new_x > 0) 
            return (wxCoord)((double)(new_x) / m_scaleX + 0.5) * m_signX + m_logicalOriginX;
          else


@@ -133,7 +124,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
        }
     wxCoord YDEV2LOG(wxCoord y) const
        {
        }
     wxCoord YDEV2LOG(wxCoord y) const
        {

-         long new_y = y - m_deviceOriginY;
+         long new_y = y - m_deviceOriginY ;

          if (new_y > 0)
            return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
          else
          if (new_y > 0)
            return (wxCoord)((double)(new_y) / m_scaleY + 0.5) * m_signY + m_logicalOriginY;
          else


@@ -150,9 +141,9 @@ class WXDLLEXPORT wxDC: public wxDCBase
        { 
          long new_x = x - m_logicalOriginX;
          if (new_x > 0)
        { 
          long new_x = x - m_logicalOriginX;
          if (new_x > 0)

-           return (wxCoord)((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 (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX;
+           return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX ;

        }
     wxCoord XLOG2DEVREL(wxCoord x) const
        { 
        }
     wxCoord XLOG2DEVREL(wxCoord x) const
        { 


@@ -163,11 +154,11 @@ class WXDLLEXPORT wxDC: public wxDCBase
        }
     wxCoord YLOG2DEV(wxCoord y) const
        {
        }
     wxCoord YLOG2DEV(wxCoord y) const
        {

-         long new_y = y - m_logicalOriginY;
+         long new_y = y - m_logicalOriginY ;

          if (new_y > 0)
          if (new_y > 0)

-           return (wxCoord)((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 (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY;
+           return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY ;

        }
     wxCoord YLOG2DEVREL(wxCoord y) const
        { 
        }
     wxCoord YLOG2DEVREL(wxCoord y) const
        { 


@@ -176,8 +167,25 @@ class WXDLLEXPORT wxDC: public wxDCBase
          else
            return (wxCoord)((double)(y) * m_scaleY - 0.5);
        }
          else
            return (wxCoord)((double)(y) * m_scaleY - 0.5);
        }

+    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.x ;
+         else
+           return (wxCoord)((double)(new_x) * m_scaleX - 0.5) * m_signX + m_deviceOriginX + m_macLocalOrigin.x ;
+       }
+    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.y ;
+         else
+           return (wxCoord)((double)(new_y) * m_scaleY - 0.5) * m_signY + m_deviceOriginY + m_macLocalOrigin.y ;
+       }

   
   

-    RgnHandle MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
+    WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
+    static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;

 //
 
 protected:
 //
 
 protected:


@@ -252,8 +260,8 @@ protected:
     // Begin implementation for Mac
     public:
                                                                    
     // Begin implementation for Mac
     public:
                                                                    

-       GrafPtr                         m_macPort ;
-       GWorldPtr                       m_macMask ;
+       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
 
        // in order to preserve the const inheritance of the virtual functions, we have to 
        // use mutable variables starting from CWPro 5


@@ -266,10 +274,10 @@ protected:
        mutable bool    m_macPenInstalled ;
        mutable bool    m_macBrushInstalled ;
        
        mutable bool    m_macPenInstalled ;
        mutable bool    m_macBrushInstalled ;
        

-       RgnHandle                               m_macBoundaryClipRgn ;
-       RgnHandle               m_macCurrentClipRgn ;
-       Point                                   m_macLocalOrigin ;
-       void                                    MacSetupPort( AGAPortHelper* ph ) const ;
+       WXHRGN                          m_macBoundaryClipRgn ;
+       WXHRGN               m_macCurrentClipRgn ;
+       wxPoint                                 m_macLocalOrigin ;
+       void                                    MacSetupPort( wxMacPortStateHelper* ph ) const ;

 };
 
 #endif
 };
 
 #endif