Slightly more efficient wxDataViewCtrl::StartEditor().

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

diff --git a/include/wx/dcmirror.h b/include/wx/dcmirror.h
index 5ffb9382a57552f58ca036147048e9453e2e4bba..98858240b650f42e93fb9f7355fd7d2fe91cfb89 100644 (file)
--- a/include/wx/dcmirror.h
+++ b/include/wx/dcmirror.h
@@ -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 wxMirrorDCImpl : public wxDCImpl
+class WXDLLIMPEXP_CORE wxMirrorDCImpl : public wxDCImpl

 {
 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,7 @@ public:
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }
     virtual bool IsOk() const { return m_dc.IsOk(); }
     virtual int GetDepth() const { return m_dc.GetDepth(); }
     virtual wxSize GetPPI() const { return m_dc.GetPPI(); }
     virtual bool IsOk() const { return m_dc.IsOk(); }

-    virtual void SetMapMode(int mode) { m_dc.SetMapMode(mode); }
+    virtual void SetMapMode(wxMappingMode mode) { m_dc.SetMapMode(mode); }

     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y)
     virtual void SetUserScale(double x, double y)
         { m_dc.SetUserScale(GetX(x, y), GetY(x, y)); }
     virtual void SetLogicalOrigin(wxCoord x, wxCoord y)


@@ -63,7 +63,7 @@ public:
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
         { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp),
                                   GetY(xLeftRight, yBottomUp)); }
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp)
         { m_dc.SetAxisOrientation(GetX(xLeftRight, yBottomUp),
                                   GetY(xLeftRight, yBottomUp)); }

-    virtual void SetLogicalFunction(int function)
+    virtual void SetLogicalFunction(wxRasterOperationMode function)

         { m_dc.SetLogicalFunction(function); }
 
 protected:
         { m_dc.SetLogicalFunction(function); }
 
 protected:


@@ -102,7 +102,7 @@ protected:
 
     // wxDCBase functions
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,
 
     // wxDCBase functions
     virtual bool DoFloodFill(wxCoord x, wxCoord y, const wxColour& col,

-                             int style = wxFLOOD_SURFACE)
+                             wxFloodFillStyle style = wxFLOOD_SURFACE)

     {
         return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style);
     }
     {
         return m_dc.DoFloodFill(GetX(x, y), GetY(x, y), col, style);
     }


@@ -127,7 +127,7 @@ protected:
                            wxCoord x2, wxCoord y2,
                            wxCoord xc, wxCoord yc)
     {
                            wxCoord x2, wxCoord y2,
                            wxCoord xc, wxCoord yc)
     {

-        wxFAIL_MSG( _T("this is probably wrong") );
+        wxFAIL_MSG( wxT("this is probably wrong") );

 
         m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1),
                        GetX(x2, y2), GetY(x2, y2),
 
         m_dc.DoDrawArc(GetX(x1, y1), GetY(x1, y1),
                        GetX(x2, y2), GetY(x2, y2),


@@ -144,7 +144,7 @@ protected:
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                                    double sa, double ea)
     {
     virtual void DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h,
                                    double sa, double ea)
     {

-        wxFAIL_MSG( _T("this is probably wrong") );
+        wxFAIL_MSG( wxT("this is probably wrong") );

 
         m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y),
                                GetX(w, h), GetY(w, h),
 
         m_dc.DoDrawEllipticArc(GetX(x, y), GetY(x, y),
                                GetX(w, h), GetY(w, h),


@@ -202,7 +202,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,
+                        wxRasterOperationMode rop = wxCOPY,
+                        bool useMask = false,

                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
     {
         return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest),
                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord)
     {
         return m_dc.DoBlit(GetX(xdest, ydest), GetY(xdest, ydest),


@@ -235,7 +236,7 @@ protected:
 
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,
 
     virtual void DoDrawPolygon(int n, wxPoint points[],
                                wxCoord xoffset, wxCoord yoffset,

-                               int fillStyle = wxODDEVEN_RULE)
+                               wxPolygonFillMode fillStyle = wxODDEVEN_RULE)

     {
         Mirror(n, points);
 
     {
         Mirror(n, points);
 


@@ -246,9 +247,9 @@ protected:
         Mirror(n, points);
     }
 
         Mirror(n, points);
     }
 

-    virtual void DoSetClippingRegionAsRegion(const wxRegion& WXUNUSED(region))
+    virtual void DoSetDeviceClippingRegion(const wxRegion& WXUNUSED(region))

     {
     {

-        wxFAIL_MSG( _T("not implemented") );
+        wxFAIL_MSG( wxT("not implemented") );

     }
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,
     }
 
     virtual void DoSetClippingRegion(wxCoord x, wxCoord y,


@@ -272,10 +273,10 @@ private:
 
     bool m_mirror;
 
 
     bool m_mirror;
 

-    DECLARE_NO_COPY_CLASS(wxMirrorDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMirrorDCImpl);

 };
 
 };
 

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

 {
 public:
     wxMirrorDC(wxDC& dc, bool mirror)
 {
 public:
     wxMirrorDC(wxDC& dc, bool mirror)


@@ -293,7 +294,7 @@ public:
 private:
     bool m_mirror;
 
 private:
     bool m_mirror;
 

-    DECLARE_NO_COPY_CLASS(wxMirrorDC)
+    wxDECLARE_NO_COPY_CLASS(wxMirrorDC);

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