Fix crash in wxDC::GetMultiLineTextExtent() after last commit.

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

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 2e389c56e6cc464cb4a5499c375f06b19460ebeb..b3800c1dd5b645826c17d6b876474c35db04be8d 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()


@@ -609,7 +609,9 @@ int wxGnomePrintDialog::ShowModal()
     m_printDialogData.SetNoCopies( copies );
     m_printDialogData.SetCollate( collate );
 
     m_printDialogData.SetNoCopies( copies );
     m_printDialogData.SetCollate( collate );
 

-    switch (gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget ))
+    // Cast needed to avoid warnings because the gnome_print_dialog_get_range()
+    // is declared as returning a wrong enum type.
+    switch ( static_cast<int>( gs_libGnomePrint->gnome_print_dialog_get_range( (GnomePrintDialog*) m_widget )))

     {
         case GNOME_PRINT_RANGE_SELECTION:
             m_printDialogData.SetSelection( true );
     {
         case GNOME_PRINT_RANGE_SELECTION:
             m_printDialogData.SetSelection( true );


@@ -843,8 +845,6 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
     native->SetPrintJob( job );
 
 
     native->SetPrintJob( job );
 
 

-    printout->SetIsPreview(false);
-

     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)
     if (m_printDialogData.GetMinPage() < 1)
         m_printDialogData.SetMinPage(1);
     if (m_printDialogData.GetMaxPage() < 1)


@@ -860,9 +860,6 @@ bool wxGnomePrinter::Print(wxWindow *parent, wxPrintout *printout, bool prompt )
         dc = new wxGnomePrinterDC( printdata );  // TODO: check that this works
 #endif
 
         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 );
     if (!dc)
     {
         gs_libGnomePrint->gnome_print_job_close( job );


@@ -1050,7 +1047,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;
 }


@@ -1065,7 +1062,8 @@ wxGnomePrinterDCImpl::DoGetPixel(wxCoord WXUNUSED(x1),
 
 void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {
 
 void wxGnomePrinterDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2)
 {

-    if  (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
+    if ( m_pen.IsTransparent() )
+        return;

 
     SetPen( m_pen );
 
 
     SetPen( m_pen );
 


@@ -1112,7 +1110,7 @@ void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2
         while (alpha2 > 360)  alpha2 -= 360;
     }
 
         while (alpha2 > 360)  alpha2 -= 360;
     }
 

-    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
         gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );
     {
         SetBrush( m_brush );
         gs_libGnomePrint->gnome_print_moveto ( m_gpc, XLOG2DEV(xc), YLOG2DEV(yc) );


@@ -1121,7 +1119,7 @@ void wxGnomePrinterDCImpl::DoDrawArc(wxCoord x1,wxCoord y1,wxCoord x2,wxCoord y2
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 

-    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
         gs_libGnomePrint->gnome_print_newpath( m_gpc );
     {
         SetPen (m_pen);
         gs_libGnomePrint->gnome_print_newpath( m_gpc );


@@ -1154,7 +1152,7 @@ void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoo
     xx = 0.0;
     yy = 0.0;
 
     xx = 0.0;
     yy = 0.0;
 

-    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -1166,7 +1164,7 @@ void wxGnomePrinterDCImpl::DoDrawEllipticArc(wxCoord x,wxCoord y,wxCoord w,wxCoo
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 

-    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -1188,10 +1186,11 @@ void wxGnomePrinterDCImpl::DoDrawPoint(wxCoord WXUNUSED(x), wxCoord WXUNUSED(y))
 
 void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {
 
 void wxGnomePrinterDCImpl::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset)
 {

-    if (m_pen.GetStyle() == wxPENSTYLE_TRANSPARENT) return;
-

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

+    if ( m_pen.IsTransparent() )
+        return;
+

     SetPen (m_pen);
 
     int i;
     SetPen (m_pen);
 
     int i;


@@ -1208,11 +1207,11 @@ 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;
 

-    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -1233,7 +1232,7 @@ void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 
         gs_libGnomePrint->gnome_print_fill( m_gpc );
     }
 

-    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -1254,7 +1253,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 );


@@ -1268,7 +1267,7 @@ void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width,
     width--;
     height--;
 
     width--;
     height--;
 

-    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
 
     {
         SetBrush( m_brush );
 


@@ -1284,7 +1283,7 @@ void wxGnomePrinterDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width,
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
 
     {
         SetPen (m_pen);
 


@@ -1308,7 +1307,7 @@ void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord
 
     wxCoord rad = wxRound( radius );
 
 
     wxCoord rad = wxRound( radius );
 

-    if (m_brush.GetStyle() != wxBRUSHSTYLE_TRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush(m_brush);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);
     {
         SetBrush(m_brush);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);


@@ -1340,7 +1339,7 @@ void wxGnomePrinterDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord
         CalcBoundingBox(x+width,y+height);
     }
 
         CalcBoundingBox(x+width,y+height);
     }
 

-    if (m_pen.GetStyle() != wxPENSTYLE_TRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen(m_pen);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);
     {
         SetPen(m_pen);
         gs_libGnomePrint->gnome_print_newpath(m_gpc);


@@ -1424,7 +1423,7 @@ void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wx
     width--;
     height--;
 
     width--;
     height--;
 

-    if (m_brush.GetStyle () != wxBRUSHSTYLE_TRANSPARENT)
+    if ( m_brush.IsNonTransparent() )

     {
         SetBrush( m_brush );
         makeEllipticalPath( x, y, width, height );
     {
         SetBrush( m_brush );
         makeEllipticalPath( x, y, width, height );


@@ -1433,7 +1432,7 @@ void wxGnomePrinterDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wx
         CalcBoundingBox( x + width, y + height );
     }
 
         CalcBoundingBox( x + width, y + height );
     }
 

-    if (m_pen.GetStyle () != wxPENSTYLE_TRANSPARENT)
+    if ( m_pen.IsNonTransparent() )

     {
         SetPen (m_pen);
         makeEllipticalPath( x, y, width, height );
     {
         SetPen (m_pen);
         makeEllipticalPath( x, y, width, height );


@@ -1508,7 +1507,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))
 {


@@ -1537,7 +1536,7 @@ wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,
                              wxCoord x, wxCoord y,
                              bool WXUNUSED(useMask))
 {
                              wxCoord x, wxCoord y,
                              bool WXUNUSED(useMask))
 {

-    if (!bitmap.Ok()) return;
+    if (!bitmap.IsOk()) return;

 
     if (bitmap.HasPixbuf())
     {
 
     if (bitmap.HasPixbuf())
     {


@@ -1568,7 +1567,7 @@ wxGnomePrinterDCImpl::DoDrawBitmap(const wxBitmap& bitmap,
     {
         wxImage image = bitmap.ConvertToImage();
 
     {
         wxImage image = bitmap.ConvertToImage();
 

-        if (!image.Ok()) return;
+        if (!image.IsOk()) return;

 
         gs_libGnomePrint->gnome_print_gsave( m_gpc );
         double matrix[6];
 
         gs_libGnomePrint->gnome_print_gsave( m_gpc );
         double matrix[6];


@@ -1595,30 +1594,12 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx
     double xx = XLOG2DEV(x);
     double yy = YLOG2DEV(y);
 
     double xx = XLOG2DEV(x);
     double yy = YLOG2DEV(y);
 

-    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);
-
-    if (underlined)
-    {
-        PangoAttrList *attrs = pango_attr_list_new();
-        PangoAttribute *a = pango_attr_underline_new(PANGO_UNDERLINE_SINGLE);
-        a->start_index = 0;
-        a->end_index = datalen;
-        pango_attr_list_insert(attrs, a);
-        pango_layout_set_attributes(m_layout, attrs);
-        pango_attr_list_unref(attrs);
-    }
+    pango_layout_set_text(m_layout, data, data.length());
+    const bool setAttrs = m_font.GTKSetPangoAttrs(m_layout);

 
 

-    if (m_textForegroundColour.Ok())
+    if (m_textForegroundColour.IsOk())

     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();
     {
         unsigned char red = m_textForegroundColour.Red();
         unsigned char blue = m_textForegroundColour.Blue();


@@ -1664,7 +1645,7 @@ void wxGnomePrinterDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wx
 
     gs_libGnomePrint->gnome_print_grestore( m_gpc );
 
 
     gs_libGnomePrint->gnome_print_grestore( m_gpc );
 

-    if (underlined)
+    if (setAttrs)

     {
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);
     {
         // undo underline attributes setting:
         pango_layout_set_attributes(m_layout, NULL);


@@ -1682,7 +1663,7 @@ void wxGnomePrinterDCImpl::SetFont( const wxFont& font )
 {
     m_font = font;
 
 {
     m_font = font;
 

-    if (m_font.Ok())
+    if (m_font.IsOk())

     {
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );
     {
         if (m_fontdesc)
             pango_font_description_free( m_fontdesc );


@@ -1699,7 +1680,7 @@ void wxGnomePrinterDCImpl::SetFont( const wxFont& font )
 
 void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
 {
 
 void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
 {

-    if (!pen.Ok()) return;
+    if (!pen.IsOk()) return;

 
     m_pen = pen;
 
 
     m_pen = pen;
 


@@ -1765,7 +1746,7 @@ void wxGnomePrinterDCImpl::SetPen( const wxPen& pen )
 
 void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
 {
 
 void wxGnomePrinterDCImpl::SetBrush( const wxBrush& brush )
 {

-    if (!brush.Ok()) return;
+    if (!brush.IsOk()) return;

 
     m_brush = brush;
 
 
     m_brush = brush;
 


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

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

 {
 }
 
 {
 }
 


@@ -1913,20 +1894,15 @@ void wxGnomePrinterDCImpl::DoGetTextExtent(const wxString& string, wxCoord *widt
 
     // Set layout's text
 
 
     // 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;
     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);
         pango_font_description_set_size(desc, (gint)size);
 
         pango_layout_set_font_description(m_layout, desc);


@@ -2043,8 +2019,7 @@ bool wxGnomePrintModule::OnInit()
 
 void wxGnomePrintModule::OnExit()
 {
 
 void wxGnomePrintModule::OnExit()
 {

-    delete gs_libGnomePrint;
-    gs_libGnomePrint = NULL;
+    wxDELETE(gs_libGnomePrint);

 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(wxGnomePrintModule, wxModule)