Applied rowspan patch #15276 (dghart)

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

diff --git a/include/wx/msw/dc.h b/include/wx/msw/dc.h
index 908e24bcff8fbf8d3ad5b029968d9f92b16c3eab..cd0895021068e5a3422b9738bf917f6f2da3947a 100644 (file)
--- a/include/wx/msw/dc.h
+++ b/include/wx/msw/dc.h
@@ -87,6 +87,13 @@ public:
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 
     virtual void SetDeviceOrigin(wxCoord x, wxCoord y);
     virtual void SetAxisOrientation(bool xLeftRight, bool yBottomUp);
 

+#if wxUSE_DC_TRANSFORM_MATRIX
+    virtual bool CanUseTransformMatrix() const;
+    virtual bool SetTransformMatrix(const wxAffineMatrix2D& matrix);
+    virtual wxAffineMatrix2D GetTransformMatrix() const;
+    virtual void ResetTransformMatrix();
+#endif // wxUSE_DC_TRANSFORM_MATRIX
+

     virtual void SetLogicalFunction(wxRasterOperationMode function);
 
     // implementation from now on
     virtual void SetLogicalFunction(wxRasterOperationMode function);
 
     // implementation from now on


@@ -119,6 +126,8 @@ public:
         m_clipX2 = 0;
     }
 
         m_clipX2 = 0;
     }
 

+    void* GetHandle() const { return (void*)GetHDC(); }
+    

     const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }
     wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; }
 
     const wxBitmap& GetSelectedBitmap() const { return m_selectedBitmap; }
     wxBitmap& GetSelectedBitmap() { return m_selectedBitmap; }
 


@@ -165,6 +174,12 @@ protected:
     void RealizeScaleAndOrigin();
 
 public:
     void RealizeScaleAndOrigin();
 
 public:

+    virtual void DoGetFontMetrics(int *height,
+                                  int *ascent,
+                                  int *descent,
+                                  int *internalLeading,
+                                  int *externalLeading,
+                                  int *averageWidth) const;

     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,
     virtual void DoGetTextExtent(const wxString& string,
                                  wxCoord *x, wxCoord *y,
                                  wxCoord *descent = NULL,


@@ -215,7 +230,7 @@ public:
 
     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,

-                        wxRasterOperationMode rop = wxCOPY, bool useMask = false, 
+                        wxRasterOperationMode rop = wxCOPY, bool useMask = false,

                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,
                         wxCoord xsrcMask = wxDefaultCoord, wxCoord ysrcMask = wxDefaultCoord);
 
     virtual bool DoStretchBlit(wxCoord xdest, wxCoord ydest,


@@ -234,12 +249,12 @@ public:
 
     virtual void DoGetSizeMM(int* width, int* height) const;
 
 
     virtual void DoGetSizeMM(int* width, int* height) const;
 

-    virtual void DoDrawLines(int n, wxPoint points[],
+    virtual void DoDrawLines(int n, const wxPoint points[],

                              wxCoord xoffset, wxCoord yoffset);
                              wxCoord xoffset, wxCoord yoffset);

-    virtual void DoDrawPolygon(int n, wxPoint points[],
+    virtual void DoDrawPolygon(int n, const wxPoint points[],

                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
                                wxCoord xoffset, wxCoord yoffset,
                                wxPolygonFillMode fillStyle = wxODDEVEN_RULE);

-    virtual void DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+    virtual void DoDrawPolyPolygon(int n, const int count[], const wxPoint points[],

                                    wxCoord xoffset, wxCoord yoffset,
                                    wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const
                                    wxCoord xoffset, wxCoord yoffset,
                                    wxPolygonFillMode fillStyle = wxODDEVEN_RULE);
     virtual wxBitmap DoGetAsBitmap(const wxRect *subrect) const


@@ -310,7 +325,7 @@ protected:
 #endif
 
     DECLARE_CLASS(wxMSWDCImpl)
 #endif
 
     DECLARE_CLASS(wxMSWDCImpl)

-    DECLARE_NO_COPY_CLASS(wxMSWDCImpl)
+    wxDECLARE_NO_COPY_CLASS(wxMSWDCImpl);

 };
 
 // ----------------------------------------------------------------------------
 };
 
 // ----------------------------------------------------------------------------


@@ -338,7 +353,7 @@ public:
     virtual void DoGetSize(int *w, int *h) const
     {
         wxASSERT_MSG( m_size.IsFullySpecified(),
     virtual void DoGetSize(int *w, int *h) const
     {
         wxASSERT_MSG( m_size.IsFullySpecified(),

-                      _T("size of this DC hadn't been set and is unknown") );
+                      wxT("size of this DC hadn't been set and is unknown") );

 
         if ( w )
             *w = m_size.x;
 
         if ( w )
             *w = m_size.x;


@@ -351,7 +366,7 @@ private:
     // find it ourselves
     const wxSize m_size;
 
     // find it ourselves
     const wxSize m_size;
 

-    DECLARE_NO_COPY_CLASS(wxDCTempImpl)
+    wxDECLARE_NO_COPY_CLASS(wxDCTempImpl);

 };
 
 class WXDLLIMPEXP_CORE wxDCTemp : public wxDC
 };
 
 class WXDLLIMPEXP_CORE wxDCTemp : public wxDC