[retro-gtk] retro-cairo-display: Normalize draw()
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [retro-gtk] retro-cairo-display: Normalize draw()
- Date: Sat, 29 Feb 2020 06:45:00 +0000 (UTC)
commit d3baf508c59d4cc6e9567c9651ad009566a4ce00
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Sat Feb 22 18:04:41 2020 +0500
retro-cairo-display: Normalize draw()
Rename the function from real_draw() to draw(), remove checks as it's a
vfunc, simplify overriding.
retro-gtk/retro-cairo-display.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/retro-gtk/retro-cairo-display.c b/retro-gtk/retro-cairo-display.c
index 717e74f..a110b1a 100644
--- a/retro-gtk/retro-cairo-display.c
+++ b/retro-gtk/retro-cairo-display.c
@@ -78,10 +78,10 @@ retro_cairo_display_draw_background (RetroCairoDisplay *self,
}
static gboolean
-retro_cairo_display_real_draw (GtkWidget *base,
- cairo_t *cr)
+retro_cairo_display_draw (GtkWidget *widget,
+ cairo_t *cr)
{
- RetroCairoDisplay *self = RETRO_CAIRO_DISPLAY (base);
+ RetroCairoDisplay *self = RETRO_CAIRO_DISPLAY (widget);
GdkPixbuf *to_draw;
gboolean has_alpha;
gint width;
@@ -96,9 +96,6 @@ retro_cairo_display_real_draw (GtkWidget *base,
gdouble ys;
cairo_pattern_t *source;
- g_return_val_if_fail (self != NULL, FALSE);
- g_return_val_if_fail (cr != NULL, FALSE);
-
retro_cairo_display_draw_background (self, cr);
if (self->pixbuf == NULL)
@@ -199,8 +196,7 @@ retro_cairo_display_class_init (RetroCairoDisplayClass *klass)
GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
- ((GtkWidgetClass *) klass)->draw = (gboolean (*) (GtkWidget *, cairo_t *)) retro_cairo_display_real_draw;
-
+ widget_class->draw = retro_cairo_display_draw;
object_class->finalize = retro_cairo_display_finalize;
object_class->get_property = retro_cairo_display_get_property;
object_class->set_property = retro_cairo_display_set_property;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]