add wxSize overloads to wxBitmap ctors and to wxBitmap::Create

[wxWidgets.git] / src / gtk / gnome / gprint.cpp

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index d3e6fbe58d2b281e56de68366bb70c6ab29362cc..923cb6c28e4c46e0d51d8cafeaf0d59b7becebb2 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -184,7 +184,7 @@ public:
     wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
         (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
 
     wxDL_METHOD_DEFINE( GtkWidget*, gnome_print_job_preview_new,
         (GnomePrintJob *gpm, const guchar *title), (gpm, title), NULL )
 

-    DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary)
+    wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary);

 };
 
 wxGnomePrintLibrary::wxGnomePrintLibrary()
 };
 
 wxGnomePrintLibrary::wxGnomePrintLibrary()


@@ -1050,7 +1050,7 @@ bool
 wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
                             wxCoord WXUNUSED(y1),
                             const wxColour& WXUNUSED(col),
 wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
                             wxCoord WXUNUSED(y1),
                             const wxColour& WXUNUSED(col),

-                            int WXUNUSED(style))
+                            wxFloodFillStyle WXUNUSED(style))

 {
     return false;
 }
 {
     return false;
 }


@@ -1208,7 +1208,7 @@ void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset,
 
 void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
 
 void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,

-                                   int WXUNUSED(fillStyle))
+                                   wxPolygonFillMode WXUNUSED(fillStyle))

 {
     if (n==0) return;
 
 {
     if (n==0) return;
 


@@ -1254,7 +1254,7 @@ void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
     }
 }
 
     }
 }
 

-void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle)
+void wxGnomePrinterDCImpl::DoDrawPolyPolygon(int n, int count[], wxPoint points[], wxCoord xoffset, wxCoord yoffset, wxPolygonFillMode fillStyle)

 {
 #if wxUSE_NEW_DC
     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );
 {
 #if wxUSE_NEW_DC
     wxDCImpl::DoDrawPolyPolygon( n, count, points, xoffset, yoffset, fillStyle );


@@ -1508,7 +1508,7 @@ wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
                       wxCoord width, wxCoord height,
                       wxDC *source,
                       wxCoord xsrc, wxCoord ysrc,
                       wxCoord width, wxCoord height,
                       wxDC *source,
                       wxCoord xsrc, wxCoord ysrc,

-                      int rop,
+                      wxRasterOperationMode rop,

                       bool WXUNUSED(useMask),
                       wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
                       bool WXUNUSED(useMask),
                       wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {


@@ -1802,7 +1802,7 @@ void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
     }
 }
 
     }
 }
 

-void wxGnomePrinterDCImpl::SetLogicalFunction(int WXUNUSED(function))
+void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))

 {
 }
 
 {
 }
 


@@ -1920,7 +1920,7 @@ void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *widt
     const wxCharBuffer dataUTF8 = string.utf8_str();
 #endif
 
     const wxCharBuffer dataUTF8 = string.utf8_str();
 #endif
 

-    gint oldSize;
+    gint oldSize = 0;

     if ( theFont )
     {
         // scale the font and apply it
     if ( theFont )
     {
         // scale the font and apply it