Fix a number of mingw compile errors.

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

diff --git a/src/gtk/gnome/gprint.cpp b/src/gtk/gnome/gprint.cpp
index 407d422c8c517215e04c5f7a36b3aaed9a8d6094..abe6b7ba62d81d9e448a548d15d417a0f5186d44 100644 (file)
--- a/src/gtk/gnome/gprint.cpp
+++ b/src/gtk/gnome/gprint.cpp
@@ -843,8 +843,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 +858,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 );


@@ -1065,7 +1060,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 +1108,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 +1117,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 +1150,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 +1162,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 +1184,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;


@@ -1212,7 +1209,7 @@ void wxGnomePrinterDCImpl::DoDrawPolygon(int n, wxPoint points[],
 {
     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 +1230,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);
 


@@ -1268,7 +1265,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 +1281,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 +1305,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 +1337,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 +1421,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 +1430,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 );


@@ -2033,8 +2030,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)