Applied #11755: wxBitmapToggleButton Xml Handler

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

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 2e389c56e6cc464cb4a5499c375f06b19460ebeb..129f5a64c911513190d3e877d40ed227b4185172 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 )
 
-    DECLARE_NO_COPY_CLASS(wxGnomePrintLibrary)
+    wxDECLARE_NO_COPY_CLASS(wxGnomePrintLibrary);
 };
 
 wxGnomePrintLibrary::wxGnomePrintLibrary()
@@ -843,8 +843,6 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     native->SetPrintJob( job );
 
 
-    printout->SetIsPreview(false);
-
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
@@ -860,9 +858,6 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
         dc = new wxGnomePrinterDC( printdata );  // TODO: check that this works
 #endif
 
-    if (m_native_preview)
-        printout->SetIsPreview(true);
-
     if (!dc)
     {
         gs_libGnomePrint->gnome_print_job_close( job );
@@ -1050,7 +1045,7 @@ bool
 wxGnomePrinterDCImpl::DoFloodFill(wxCoord WXUNUSED(x1),
                             wxCoord WXUNUSED(y1),
                             const wxColour& WXUNUSED(col),
-                            int WXUNUSED(style))
+                            wxFloodFillStyle WXUNUSED(style))
 {
     return false;
 }
@@ -1208,7 +1203,7 @@ void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset,
 
 void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
                                    wxCoord xoffset, wxCoord yoffset,
-                                   int WXUNUSED(fillStyle))
+                                   wxPolygonFillMode WXUNUSED(fillStyle))
 {
     if (n==0) return;
 
@@ -1254,7 +1249,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 );
@@ -1508,7 +1503,7 @@ wxGnomePrinterDCImpl::DoBlit(wxCoord xdest, wxCoord ydest,
                       wxCoord width, wxCoord height,
                       wxDC *source,
                       wxCoord xsrc, wxCoord ysrc,
-                      int rop,
+                      wxRasterOperationMode rop,
                       bool WXUNUSED(useMask),
                       wxCoord WXUNUSED(xsrcMask), wxCoord WXUNUSED(ysrcMask))
 {
@@ -1597,12 +1592,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx
 
     bool underlined = m_font.Ok() && m_font.GetUnderlined();
 
-    // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
-#if wxUSE_UNICODE_UTF8
-    const char *data = text.utf8_str();
-#else
-    const wxCharBuffer data = text.utf8_str();
-#endif
+    const wxScopedCharBuffer data(text.utf8_str());
 
     size_t datalen = strlen(data);
     pango_layout_set_text( m_layout, data, datalen);
@@ -1802,7 +1792,7 @@ void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
     }
 }
 
-void wxGnomePrinterDCImpl::SetLogicalFunction(int WXUNUSED(function))
+void wxGnomePrinterDCImpl::SetLogicalFunction(wxRasterOperationMode WXUNUSED(function))
 {
 }
 
@@ -1913,20 +1903,15 @@ void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *widt
 
     // Set layout's text
 
-    // FIXME-UTF8: wouldn't be needed if utf8_str() always returned a buffer
-#if wxUSE_UNICODE_UTF8
-    const char *dataUTF8 = string.utf8_str();
-#else
-    const wxCharBuffer dataUTF8 = string.utf8_str();
-#endif
+    const wxScopedCharBuffer dataUTF8(string.utf8_str());
 
-    gint oldSize;
+    gint oldSize = 0;
     if ( theFont )
     {
         // scale the font and apply it
         PangoFontDescription *desc = theFont->GetNativeFontInfo()->description;
-        float size = pango_font_description_get_size(desc);
-        size = size * GetFontPointSizeAdjustment(72.0);
+        oldSize = pango_font_description_get_size(desc);
+        float size = oldSize * GetFontPointSizeAdjustment(72.0);
         pango_font_description_set_size(desc, (gint)size);
 
         pango_layout_set_font_description(m_layout, desc);