regenerated all makefiles with bakefile 0.2.0; removed REZ option from config.bkl...

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

diff --git a/include/wx/mac/carbon/dc.h b/include/wx/mac/carbon/dc.h
index 4140fd6ad2084e9dccddefdead0d5de5f3b060f3..123f5569afb1c9c4b06c3101c6f002a60433c0d4 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -33,12 +33,10 @@
 #define MM_METRIC        7
 #endif
 
 #define MM_METRIC        7
 #endif
 

-//-----------------------------------------------------------------------------
-// global variables
-//-----------------------------------------------------------------------------

 
 extern int wxPageNumber;
 
 
 extern int wxPageNumber;
 

+

 class wxMacPortStateHelper ;
 
 class WXDLLEXPORT wxGraphicPath
 class wxMacPortStateHelper ;
 
 class WXDLLEXPORT wxGraphicPath


@@ -79,21 +77,15 @@ public:
     virtual wxGraphicPath* CreatePath() = 0 ;
 } ;
 
     virtual wxGraphicPath* CreatePath() = 0 ;
 } ;
 

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

 class WXDLLEXPORT wxDC: public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
     DECLARE_NO_COPY_CLASS(wxDC)
 
 class WXDLLEXPORT wxDC: public wxDCBase
 {
     DECLARE_DYNAMIC_CLASS(wxDC)
     DECLARE_NO_COPY_CLASS(wxDC)
 

-  public:
-
+public:

     wxDC();
     ~wxDC();
 
     wxDC();
     ~wxDC();
 

-

     // implement base class pure virtuals
     // ----------------------------------
 
     // implement base class pure virtuals
     // ----------------------------------
 


@@ -116,12 +108,6 @@ class WXDLLEXPORT wxDC: public wxDCBase
 
     virtual wxCoord GetCharHeight() const;
     virtual wxCoord GetCharWidth() const;
 
     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 DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;

 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;
 
     virtual bool CanDrawBitmap() const;
     virtual bool CanGetTextExtent() const;


@@ -142,8 +128,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
 
     virtual void ComputeScaleAndOrigin();
 
 
     virtual void ComputeScaleAndOrigin();
 

-  public:
-
+public:

     wxCoord XDEV2LOG(wxCoord x) const
     {
       long new_x = x - m_deviceOriginX ;
     wxCoord XDEV2LOG(wxCoord x) const
     {
       long new_x = x - m_deviceOriginX ;


@@ -152,6 +137,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         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
     {
       if (x > 0)
     wxCoord XDEV2LOGREL(wxCoord x) const
     {
       if (x > 0)


@@ -159,6 +145,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         return (wxCoord)((double)(x) / m_scaleX - 0.5);
     }
       else
         return (wxCoord)((double)(x) / m_scaleX - 0.5);
     }

+

     wxCoord YDEV2LOG(wxCoord y) const
     {
       long new_y = y - m_deviceOriginY ;
     wxCoord YDEV2LOG(wxCoord y) const
     {
       long new_y = y - m_deviceOriginY ;


@@ -167,6 +154,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         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
     {
       if (y > 0)
     wxCoord YDEV2LOGREL(wxCoord y) const
     {
       if (y > 0)


@@ -174,6 +162,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         return (wxCoord)((double)(y) / m_scaleY - 0.5);
     }
       else
         return (wxCoord)((double)(y) / m_scaleY - 0.5);
     }

+

     wxCoord XLOG2DEV(wxCoord x) const
     {
       long new_x = x - m_logicalOriginX;
     wxCoord XLOG2DEV(wxCoord x) const
     {
       long new_x = x - m_logicalOriginX;


@@ -182,6 +171,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         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
     {
       if (x > 0)
     wxCoord XLOG2DEVREL(wxCoord x) const
     {
       if (x > 0)


@@ -189,6 +179,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         return (wxCoord)((double)(x) * m_scaleX - 0.5);
     }
       else
         return (wxCoord)((double)(x) * m_scaleX - 0.5);
     }

+

     wxCoord YLOG2DEV(wxCoord y) const
     {
       long new_y = y - m_logicalOriginY ;
     wxCoord YLOG2DEV(wxCoord y) const
     {
       long new_y = y - m_logicalOriginY ;


@@ -197,6 +188,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         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
     {
       if (y > 0)
     wxCoord YLOG2DEVREL(wxCoord y) const
     {
       if (y > 0)


@@ -204,6 +196,7 @@ 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;
     wxCoord XLOG2DEVMAC(wxCoord x) const
     {
       long new_x = x - m_logicalOriginX;


@@ -212,6 +205,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         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 ;
     wxCoord YLOG2DEVMAC(wxCoord y) const
     {
       long new_y = y - m_logicalOriginY ;


@@ -220,15 +214,22 @@ class WXDLLEXPORT wxDC: public wxDCBase
       else
         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 ;
     }

+

 #if wxMAC_USE_CORE_GRAPHICS
     wxGraphicContext* GetGraphicContext() { return m_graphicContext ; }
 #else
     WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
 #endif
 #if wxMAC_USE_CORE_GRAPHICS
     wxGraphicContext* GetGraphicContext() { return m_graphicContext ; }
 #else
     WXHRGN MacGetCurrentClipRgn() { return m_macCurrentClipRgn ; }
     static void MacSetupBackgroundForCurrentPort(const wxBrush& background ) ;
 #endif

-//

 
 protected:
 
 protected:

+    virtual void DoGetTextExtent(const wxString& string,
+        wxCoord *x, wxCoord *y,
+        wxCoord *descent = NULL,
+        wxCoord *externalLeading = NULL,
+        wxFont *theFont = NULL) const;
+    virtual bool DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const;
+

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


@@ -281,63 +282,59 @@ protected:
                                wxCoord xoffset, wxCoord yoffset,
                                int fillStyle = wxODDEVEN_RULE);
 
                                wxCoord xoffset, wxCoord yoffset,
                                int fillStyle = wxODDEVEN_RULE);
 

-  protected:
-    //begin wxmac
-    // Variables used for scaling
-    double       m_mm_to_pix_x,m_mm_to_pix_y;
-    // 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;
+protected:
+    // scaling variables
+    double       m_mm_to_pix_x, m_mm_to_pix_y;

 
 

-    // Begin implementation for Mac
-    public:
+     // To be set using SetDeviceOrigin()
+     // by external classes such as wxScrolledWindow
+    long         m_externalDeviceOriginX, m_externalDeviceOriginY;

 
 #if !wxMAC_USE_CORE_GRAPHICS
 
 #if !wxMAC_USE_CORE_GRAPHICS

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

     WXHBITMAP            m_macMask ;
 #endif
 
     WXHBITMAP            m_macMask ;
 #endif
 

-    // in order to preserve the const inheritance of the virtual functions, we have to
-    // use mutable variables starting from CWPro 5
+    // not yet used
+    bool         m_needComputeScaleX, m_needComputeScaleY;

 
 

+public:
+    // implementation

     void                    MacInstallFont() const ;
     void                    MacInstallFont() const ;

-#if !wxMAC_USE_CORE_GRAPHICS
-    void                    MacInstallPen() const ;
-    void                    MacInstallBrush() const ;
-#endif

 
 

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

     wxPoint                         m_macLocalOrigin ;
     mutable void*                   m_macATSUIStyle ;
 
     WXHDC                           m_macPort ;
     wxPoint                         m_macLocalOrigin ;
     mutable void*                   m_macATSUIStyle ;
 
     WXHDC                           m_macPort ;

+

 #if wxMAC_USE_CORE_GRAPHICS
 #if wxMAC_USE_CORE_GRAPHICS

-    // CoreGraphics

     wxGraphicContext                * m_graphicContext ;
     wxPoint                         m_macLocalOriginInPort ;
 #else
     wxGraphicContext                * m_graphicContext ;
     wxPoint                         m_macLocalOriginInPort ;
 #else

+    void                            MacInstallPen() const ;
+    void                            MacInstallBrush() const ;
+
+    void                            MacSetupPort( wxMacPortStateHelper* ph ) const ;
+    void                            MacCleanupPort( wxMacPortStateHelper* ph ) const ;
+    mutable wxMacPortStateHelper*   m_macCurrentPortStateHelper ;
+

     mutable bool                    m_macFontInstalled ;
     mutable bool                    m_macPenInstalled ;
     mutable bool                    m_macBrushInstalled ;
 
     WXHRGN                          m_macBoundaryClipRgn ;
     WXHRGN                          m_macCurrentClipRgn ;
     mutable bool                    m_macFontInstalled ;
     mutable bool                    m_macPenInstalled ;
     mutable bool                    m_macBrushInstalled ;
 
     WXHRGN                          m_macBoundaryClipRgn ;
     WXHRGN                          m_macCurrentClipRgn ;

-    void                            MacSetupPort( wxMacPortStateHelper* ph ) const ;
-    void                            MacCleanupPort( wxMacPortStateHelper* ph ) const ;
-    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
     mutable bool                    m_macFormerAliasState ;
     mutable short                   m_macFormerAliasSize ;
     mutable bool                    m_macAliasWasEnabled ;
     mutable void*                   m_macForegroundPixMap ;
     mutable void*                   m_macBackgroundPixMap ;
 #endif

-    
-#if wxMAC_USE_CORE_GRAPHICS
-#endif

 };
 
 };
 

-#endif
-    // _WX_DC_H_
+#endif // _WX_DC_H_