Move wxCocoa's wxFontRefData from the header to the implementation file.

[wxWidgets.git] / include / wx / dcmirror.h

diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index fcb396113cfe1e23443998d50575597e0a3f092c..0a7d4301200a119bce70832f37bcf538e3b82e8e 100644 (file)
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     21.07.2003
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     21.07.2003
 // RCS-ID:      $Id$

-// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
+// Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwidgets.org>

 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 


@@ -18,7 +18,7 @@
 // wxMirrorDC allows to write the same code for horz/vertical layout
 // ----------------------------------------------------------------------------
 
 // wxMirrorDC allows to write the same code for horz/vertical layout
 // ----------------------------------------------------------------------------
 

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

 {
 public:
     // constructs a mirror DC associated with the given real DC
 {
 public:
     // constructs a mirror DC associated with the given real DC


@@ -53,7 +53,8 @@ public:
     virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); }
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }
     virtual bool CanGetTextExtent() const { return m_dc.CanGetTextExtent(); }
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }

-    virtual bool Ok() const { return m_dc.Ok(); }
+    virtual bool Ok() const { return IsOk(); }
+    virtual bool IsOk() const { return m_dc.Ok(); }

     virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); }
     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }
     virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); }
     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }


@@ -67,6 +68,12 @@ public:
     virtual void SetLogicalFunction(int function)
         { m_dc.SetLogicalFunction(function); }
 
     virtual void SetLogicalFunction(int function)
         { m_dc.SetLogicalFunction(function); }
 

+    // helper functions which may be useful for the users of this class
+    wxSize Reflect(const wxSize& sizeOrig)
+    {
+        return m_mirror ? wxSize(sizeOrig.y, sizeOrig.x) : sizeOrig;
+    }
+

 protected:
     // returns x and y if not mirroring or y and x if mirroring
     wxCoord GetX(wxCoord x, wxCoord y) const { return m_mirror ? y : x; }
 protected:
     // returns x and y if not mirroring or y and x if mirroring
     wxCoord GetX(wxCoord x, wxCoord y) const { return m_mirror ? y : x; }


@@ -131,7 +138,7 @@ protected:
         wxFAIL_MSG( _T("this is probably wrong") );
 
         m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1),
         wxFAIL_MSG( _T("this is probably wrong") );
 
         m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1),

-                       GetX(x2, y2), GetY(x2, y2), 
+                       GetX(x2, y2), GetY(x2, y2),

                        xc, yc);
     }
 
                        xc, yc);
     }
 


@@ -148,7 +155,7 @@ protected:
         wxFAIL_MSG( _T("this is probably wrong") );
 
         m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y),
         wxFAIL_MSG( _T("this is probably wrong") );
 
         m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y),

-                               GetX(w, h), GetY(w, h), 
+                               GetX(w, h), GetY(w, h),

                                sa, ea);
     }
 
                                sa, ea);
     }
 


@@ -182,7 +189,7 @@ protected:
     }
 
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,
     }
 
     virtual void DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y,

-                              bool useMask = FALSE)
+                              bool useMask = false)

     {
         m_dc.DoDrawBitmap(bmp, GetX(x, y), GetY(x, y), useMask);
     }
     {
         m_dc.DoDrawBitmap(bmp, GetX(x, y), GetY(x, y), useMask);
     }


@@ -203,8 +210,8 @@ protected:
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord w, wxCoord h,
                         wxDC *source, wxCoord xsrc, wxCoord ysrc,
     virtual bool DoBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord w, wxCoord h,
                         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 = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)

     {
         return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest),
                            GetX(w, h), GetY(w, h),
     {
         return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest),
                            GetX(w, h), GetY(w, h),


@@ -262,7 +269,7 @@ protected:
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
                                  wxCoord *externalLeading = NULL,

-                                 wxFont *theFont = NULL) const
+                                 const wxFont *theFont = NULL) const

     {
         // never mirrored
         m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont);
     {
         // never mirrored
         m_dc.DoGetTextExtent(string, x, y, descent, externalLeading, theFont);


@@ -272,6 +279,8 @@ private:
     wxMirrorDC& m_dc;
 
     bool m_mirror;
     wxMirrorDC& m_dc;
 
     bool m_mirror;

+
+    DECLARE_NO_COPY_CLASS(wxMirrorDC)

 };
 
 #endif // _WX_DCMIRROR_H_
 };
 
 #endif // _WX_DCMIRROR_H_