[gimp/gtk3-port: 33/236] app: port to GtkWidget::draw()
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 33/236] app: port to GtkWidget::draw()
- Date: Sat, 24 Sep 2011 21:38:24 +0000 (UTC)
commit 2ef4af877405a736399de9537f474c6827cf1fcd
Author: Michael Natterer <mitch gimp org>
Date: Fri Oct 15 14:31:07 2010 +0200
app: port to GtkWidget::draw()
app/widgets/gimphistogramview.c | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/app/widgets/gimphistogramview.c b/app/widgets/gimphistogramview.c
index 6d14756..d275a88 100644
--- a/app/widgets/gimphistogramview.c
+++ b/app/widgets/gimphistogramview.c
@@ -61,8 +61,8 @@ static void gimp_histogram_view_get_property (GObject *object,
static void gimp_histogram_view_size_request (GtkWidget *widget,
GtkRequisition *requisition);
-static gboolean gimp_histogram_view_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gboolean gimp_histogram_view_draw (GtkWidget *widget,
+ cairo_t *cr);
static gboolean gimp_histogram_view_button_press (GtkWidget *widget,
GdkEventButton *bevent);
static gboolean gimp_histogram_view_button_release (GtkWidget *widget,
@@ -115,7 +115,7 @@ gimp_histogram_view_class_init (GimpHistogramViewClass *klass)
object_class->set_property = gimp_histogram_view_set_property;
widget_class->size_request = gimp_histogram_view_size_request;
- widget_class->expose_event = gimp_histogram_view_expose;
+ widget_class->draw = gimp_histogram_view_draw;
widget_class->button_press_event = gimp_histogram_view_button_press;
widget_class->button_release_event = gimp_histogram_view_button_release;
widget_class->motion_notify_event = gimp_histogram_view_motion_notify;
@@ -277,13 +277,12 @@ gimp_histogram_view_get_maximum (GimpHistogramView *view,
}
static gboolean
-gimp_histogram_view_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gimp_histogram_view_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GimpHistogramView *view = GIMP_HISTOGRAM_VIEW (widget);
GtkStyle *style = gtk_widget_get_style (widget);
GtkAllocation allocation;
- cairo_t *cr;
gint x;
gint x1, x2;
gint border;
@@ -297,11 +296,6 @@ gimp_histogram_view_expose (GtkWidget *widget,
GdkColor *bg_color_out;
GdkColor rgb_color[3];
- cr = gdk_cairo_create (gtk_widget_get_window (widget));
-
- gdk_cairo_region (cr, event->region);
- cairo_clip (cr);
-
/* Draw the background */
gdk_cairo_set_source_color (cr, &style->base[GTK_STATE_NORMAL]);
cairo_paint (cr);
@@ -425,8 +419,6 @@ gimp_histogram_view_expose (GtkWidget *widget,
}
}
- cairo_destroy (cr);
-
return FALSE;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]