Kaydet (Commit) 71c5eb4c authored tarafından Michael Meeks's avatar Michael Meeks

gtk3: disable signalDraw for gtk2 case to avoid cairo build issues

üst cbaadc7b
...@@ -3118,7 +3118,6 @@ void GtkSalFrame::renderArea( cairo_t *cr, cairo_rectangle_t *area ) ...@@ -3118,7 +3118,6 @@ void GtkSalFrame::renderArea( cairo_t *cr, cairo_rectangle_t *area )
cairo_restore( cr ); cairo_restore( cr );
} }
} }
#endif
gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
{ {
...@@ -3132,11 +3131,9 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) ...@@ -3132,11 +3131,9 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
if (debugQueuePureRedraw > 0) if (debugQueuePureRedraw > 0)
{ {
debugQueuePureRedraw--; debugQueuePureRedraw--;
#if GTK_CHECK_VERSION(3,0,0)
fprintf (stderr, "skip signalDraw for debug %d\n", debugQueuePureRedraw); fprintf (stderr, "skip signalDraw for debug %d\n", debugQueuePureRedraw);
cairo_rectangle_t rect = { x1, y1, x2 - x1, y2 - y1 }; cairo_rectangle_t rect = { x1, y1, x2 - x1, y2 - y1 };
pThis->renderArea( cr, &rect ); pThis->renderArea( cr, &rect );
#endif
return FALSE; return FALSE;
} }
...@@ -3157,15 +3154,15 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame ) ...@@ -3157,15 +3154,15 @@ gboolean GtkSalFrame::signalDraw( GtkWidget*, cairo_t *cr, gpointer frame )
struct SalPaintEvent aEvent( rect.x, rect.y, rect.width, rect.height ); struct SalPaintEvent aEvent( rect.x, rect.y, rect.width, rect.height );
aEvent.mbImmediateUpdate = true; aEvent.mbImmediateUpdate = true;
pThis->CallCallback( SALEVENT_PAINT, &aEvent ); pThis->CallCallback( SALEVENT_PAINT, &aEvent );
#if GTK_CHECK_VERSION(3,0,0)
pThis->renderArea( cr, &rect ); pThis->renderArea( cr, &rect );
#endif
} }
pThis->m_nDuringRender--; pThis->m_nDuringRender--;
return FALSE; return FALSE;
} }
#endif // GTK_CHECK_VERSION(3,0,0)
gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame ) gboolean GtkSalFrame::signalExpose( GtkWidget*, GdkEventExpose* pEvent, gpointer frame )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment