X-Authentication-Warning: delorie.com: mail set sender to geda-user-bounces using -f X-Recipient: geda-user AT delorie DOT com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=x0FhX2Q+Z3R6gcsgF2YeKgZAEDTxbFK8t3C3hueGchY=; b=B+sQZzUA5tm6DoPRet7/u1PaDZzHWJPgMSzzo0p0DG2EqrcUA80TqFBuwmGv0jq3E1 W0/4fCsirwtE0xM53/oxO+YlKYWCnWtQXefvJlwA6PG3WzJpWSKdJ5yh1Wss1Wu2+YAH CRrCuNwUTmdpw81bjk7Pzpq0HW0FGN9WEUbXlUcqFRrnohMD/iMqhXDzp0TY3RUVK8gm MCIf3uqhlJWqOGsMmRsMV1GnwpKHlqwM892tM4yKCGq/sqN32+9dhc6ymMIJV3jHgAc+ vSpGvYuJbOz8Vxa2hDTIIxsUyfnRjXZuVXK2eBwhaIC77mGr8WpPzuM1ziTonSbqKy0/ /yaw== X-Received: by 10.180.37.229 with SMTP id b5mr7458068wik.61.1413317873480; Tue, 14 Oct 2014 13:17:53 -0700 (PDT) From: Riccardo Lucchese To: geda-user AT delorie DOT com Cc: paubert AT iram DOT es, Riccardo Lucchese Subject: [geda-user] [PATCH V2 04/43] Remove deprecated use of GTK_WIDGET_DRAWABLE() Date: Tue, 14 Oct 2014 22:16:56 +0200 Message-Id: <1413317855-10673-5-git-send-email-riccardo.lucchese@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1413317855-10673-1-git-send-email-riccardo.lucchese@gmail.com> References: <1413317855-10673-1-git-send-email-riccardo DOT lucchese AT gmail DOT com> Reply-To: geda-user AT delorie DOT com Errors-To: nobody AT delorie DOT com X-Mailing-List: geda-user AT delorie DOT com X-Unsubscribes-To: listserv AT delorie DOT com Precedence: bulk Verbatim from Gtk+ 2 Reference Manual: "GTK_WIDGET_DRAWABLE has been deprecated since version 2.20 and should not be used in newly-written code. Use gtk_widget_is_drawable() instead." --- gattrib/src/gtksheet_2_2.c | 18 +++++++++--------- gschem/src/gschem_accel_label.c | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gattrib/src/gtksheet_2_2.c b/gattrib/src/gtksheet_2_2.c index e74f7c6..f18c5c4 100644 --- a/gattrib/src/gtksheet_2_2.c +++ b/gattrib/src/gtksheet_2_2.c @@ -2165,7 +2165,7 @@ gtk_sheet_flash(gpointer data) sheet=GTK_SHEET(data); if(!GTK_WIDGET_REALIZED(GTK_WIDGET(sheet))) return TRUE; - if(!GTK_WIDGET_DRAWABLE(GTK_WIDGET(sheet))) return TRUE; + if(!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return TRUE; if(!gtk_sheet_range_isvisible(sheet, sheet->clip_range)) return TRUE; if(GTK_SHEET_IN_XDRAG(sheet)) return TRUE; if(GTK_SHEET_IN_YDRAG(sheet)) return TRUE; @@ -2936,7 +2936,7 @@ gtk_sheet_cell_draw_default (GtkSheet *sheet, gint row, gint col) g_return_if_fail (sheet != NULL); /* bail now if we arn't drawable yet */ - if (!GTK_WIDGET_DRAWABLE (sheet)) return; + if (!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; if (row < 0 || row > sheet->maxrow) return; if (col < 0 || col > sheet->maxcol) return; @@ -2987,7 +2987,7 @@ gtk_sheet_cell_draw_border (GtkSheet *sheet, gint row, gint col, gint mask) g_return_if_fail (sheet != NULL); /* bail now if we arn't drawable yet */ - if (!GTK_WIDGET_DRAWABLE (sheet)) return; + if (!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; if (row < 0 || row > sheet->maxrow) return; if (col < 0 || col > sheet->maxcol) return; @@ -3062,7 +3062,7 @@ gtk_sheet_cell_draw_label (GtkSheet *sheet, gint row, gint col) g_return_if_fail (sheet != NULL); /* bail now if we aren't drawable yet */ - if (!GTK_WIDGET_DRAWABLE (sheet)) + if (!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; if (row > sheet->maxallocrow) return; @@ -3217,7 +3217,7 @@ gtk_sheet_range_draw(GtkSheet *sheet, const GtkSheetRange *range) g_return_if_fail(sheet != NULL); g_return_if_fail(GTK_SHEET(sheet)); - if(!GTK_WIDGET_DRAWABLE(GTK_WIDGET(sheet))) return; + if(!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; if(!GTK_WIDGET_REALIZED(GTK_WIDGET(sheet))) return; if(!GTK_WIDGET_MAPPED(GTK_WIDGET(sheet))) return; @@ -4126,7 +4126,7 @@ gtk_sheet_draw_active_cell(GtkSheet *sheet) { gint row, col; - if(!GTK_WIDGET_DRAWABLE(GTK_WIDGET(sheet))) return; + if(!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; if(!GTK_WIDGET_REALIZED(GTK_WIDGET(sheet))) return; row = sheet->active_cell.row; @@ -4732,7 +4732,7 @@ gtk_sheet_expose (GtkWidget * widget, sheet = GTK_SHEET (widget); - if (GTK_WIDGET_DRAWABLE (widget)) + if (gtk_widget_is_drawable(widget)) { range.row0=ROW_FROM_YPIXEL(sheet,event->area.y); range.col0=COLUMN_FROM_XPIXEL(sheet,event->area.x); @@ -6009,7 +6009,7 @@ size_allocate_column_title_buttons (GtkSheet * sheet) sheet->column_title_area.width, sheet->column_title_area.height); - if(!GTK_WIDGET_DRAWABLE(sheet)) return; + if(!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; for (i = MIN_VISIBLE_COLUMN(sheet); i <= MAX_VISIBLE_COLUMN(sheet); i++) gtk_sheet_button_draw(sheet,-1,i); @@ -6049,7 +6049,7 @@ size_allocate_row_title_buttons (GtkSheet * sheet) sheet->row_title_area.width, sheet->row_title_area.height); - if(!GTK_WIDGET_DRAWABLE(sheet)) return; + if(!gtk_widget_is_drawable(GTK_WIDGET(sheet))) return; for(i = MIN_VISIBLE_ROW(sheet); i <= MAX_VISIBLE_ROW(sheet); i++) gtk_sheet_button_draw(sheet,i,-1); diff --git a/gschem/src/gschem_accel_label.c b/gschem/src/gschem_accel_label.c index dd90d87..7f45c80 100644 --- a/gschem/src/gschem_accel_label.c +++ b/gschem/src/gschem_accel_label.c @@ -208,7 +208,7 @@ gschem_accel_label_expose_event (GtkWidget *widget, direction = gtk_widget_get_direction (widget); - if (GTK_WIDGET_DRAWABLE (accel_label)) + if (gtk_widget_is_drawable(GTK_WIDGET(accel_label))) { guint ac_width; -- 2.1.0