move FixMath include into non darwin part

[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 441068025322fecf4319ceaa9a70c8b820b765c3..0532fffe13555314c7119e3be1bef855f1abb8f2 100644 (file)
--- a/include/wx/mac/carbon/dc.h
+++ b/include/wx/mac/carbon/dc.h
@@ -44,6 +44,7 @@
 extern int wxPageNumber;
 
 class wxMacPortStateHelper ;
 extern int wxPageNumber;
 
 class wxMacPortStateHelper ;

+class wxMacCGContext ;

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


@@ -64,7 +65,7 @@ class WXDLLEXPORT wxDC: public wxDCBase
 
     virtual void Clear();
 
 
     virtual void Clear();
 

-    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return TRUE; }
+    virtual bool StartDoc( const wxString& WXUNUSED(message) ) { return true; }

     virtual void EndDoc(void) {};
 
     virtual void StartPage(void) {};
     virtual void EndDoc(void) {};
 
     virtual void StartPage(void) {};


@@ -105,9 +106,9 @@ class WXDLLEXPORT wxDC: public wxDCBase
     virtual void SetTextForeground(const wxColour& colour) ;
     virtual void SetTextBackground(const wxColour& colour) ;
 
     virtual void SetTextForeground(const wxColour& colour) ;
     virtual void SetTextBackground(const wxColour& colour) ;
 

-    void ComputeScaleAndOrigin(void);
-  public:
+    virtual void ComputeScaleAndOrigin();

 
 

+  public:

 
     wxCoord XDEV2LOG(wxCoord x) const
     {
 
     wxCoord XDEV2LOG(wxCoord x) const
     {


@@ -216,7 +217,7 @@ protected:
 
     virtual void DoDrawIcon(const wxIcon& icon, wxCoord x, wxCoord y);
     virtual void DoDrawBitmap(const wxBitmap &bmp, 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);
+                              bool useMask = false);

 
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
 
     virtual void DoDrawText(const wxString& text, wxCoord x, wxCoord y);
     virtual void DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,


@@ -224,7 +225,7 @@ protected:
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
 
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,

-                        int rop = wxCOPY, bool useMask = FALSE, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);
+                        int rop = wxCOPY, bool useMask = false, wxCoord xsrcMask = -1, wxCoord ysrcMask = -1);

 
     // this is gnarly - we can't even call this function DoSetClippingRegion()
     // because of virtual function hiding
 
     // this is gnarly - we can't even call this function DoSetClippingRegion()
     // because of virtual function hiding


@@ -282,6 +283,11 @@ protected:
     mutable bool                    m_macAliasWasEnabled ;
     mutable void*                   m_macForegroundPixMap ;
     mutable void*                   m_macBackgroundPixMap ;
     mutable bool                    m_macAliasWasEnabled ;
     mutable void*                   m_macForegroundPixMap ;
     mutable void*                   m_macBackgroundPixMap ;

+    
+    // CoreGraphics
+    
+    wxMacCGContext      * m_macGraphicContext ;
+    void                MacSetupGraphicContext() ;

 };
 
 #endif
 };
 
 #endif