X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb14d960c3b9b727074acd24199e56dafe002850..845a6bbf743a33a1975827f517fbd667c13ef6ac:/src/gtk/print.cpp?ds=inline

diff --git a/src/gtk/print.cpp b/src/gtk/print.cpp
index 615e986dc5..b72d8e6d8a 100644
--- a/src/gtk/print.cpp
+++ b/src/gtk/print.cpp
@@ -1173,7 +1173,7 @@ void* wxGtkPrinterDCImpl::GetCairoContext() const
 bool wxGtkPrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
                                wxCoord WXUNUSED(y1),
                                const wxColour& WXUNUSED(col),
-                               int WXUNUSED(style))
+                               wxFloodFillStyle WXUNUSED(style))
 {
     // We can't access the given coord as a Cairo context is scalable, ie a
     // coord doesn't mean anything in this context.
@@ -1427,7 +1427,9 @@ void wxGtkPrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, w
     cairo_stroke ( m_cairo);
 }
 
-void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
+                                       wxCoord xoffset, wxCoord yoffset,
+                                       wxPolygonFillMode fillStyle)
 {
     if (n==0) return;
 
@@ -1461,7 +1463,9 @@ void wxGtkPrinterDCImpl::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset,
     cairo_restore(m_cairo);
 }
 
-void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGtkPrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[],
+                                           wxCoord xoffset, wxCoord yoffset,
+                                           wxPolygonFillMode fillStyle)
 {
     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
 }
@@ -1620,7 +1624,7 @@ void wxGtkPrinterDCImpl::DoDrawSpline(const wxPointList *points)
 bool wxGtkPrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
                           wxCoord width, wxCoord height,
                           wxDC *source, wxCoord xsrc, wxCoord ysrc,
-                          int rop, bool useMask,
+                          wxRasterOperationMode rop, bool useMask,
                           wxCoord WXUNUSED_UNLESS_DEBUG(xsrcMask),
                           wxCoord WXUNUSED_UNLESS_DEBUG(ysrcMask))
 {
@@ -1696,7 +1700,7 @@ void wxGtkPrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCo
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
-    const wxUTF8Buf data = text.utf8_str();
+    const wxScopedCharBuffer data = text.utf8_str();
 
     size_t datalen = strlen(data);
     pango_layout_set_text( m_layout, data, datalen);
@@ -1987,7 +1991,7 @@ void wxGtkPrinterDCImpl::SetBrush( const wxBrush& brush )
     }
 }
 
-void wxGtkPrinterDCImpl::SetLogicalFunction( int function )
+void wxGtkPrinterDCImpl::SetLogicalFunction( wxRasterOperationMode function )
 {
     if (function == wxCLEAR)
         cairo_set_operator (m_cairo, CAIRO_OPERATOR_CLEAR);
@@ -2098,7 +2102,7 @@ void wxGtkPrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *width,
     cairo_scale(m_cairo, m_scaleX, m_scaleY);
 
     // Set layout's text
-    const wxUTF8Buf dataUTF8 = string.utf8_str();
+    const wxScopedCharBuffer dataUTF8 = string.utf8_str();
 
     gint oldSize=0;
     if ( theFont )