X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheet-row-iface.c;h=01a96afe88b66a9630b1153c96daabb8f54f5e04;hb=573068f2bdcd3f8796e9646668fed910a90f890b;hp=37d246b300d41aa53dec09265132c8144b87d666;hpb=745a5487c9da077893a46d26d64e911246640a7b;p=pspp-builds.git diff --git a/lib/gtksheet/gsheet-row-iface.c b/lib/gtksheet/gsheet-row-iface.c index 37d246b3..01a96afe 100644 --- a/lib/gtksheet/gsheet-row-iface.c +++ b/lib/gtksheet/gsheet-row-iface.c @@ -158,11 +158,12 @@ const GtkSheetButton * g_sheet_row_get_button(const GSheetRow *row_geo, gint row, const GtkSheet *sheet) { - g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), FALSE); + static GtkSheetButton button ; GSheetRowIface *iface = G_SHEET_ROW_GET_IFACE (row_geo); - static GtkSheetButton button ; + g_return_val_if_fail (G_IS_SHEET_ROW (row_geo), FALSE); + memcpy(&button, &default_button, sizeof (button)); if ( iface->get_button_label) @@ -198,14 +199,14 @@ g_sheet_row_get_row_count(const GSheetRow *geo, const GtkSheet *sheet) gint g_sheet_row_start_pixel(const GSheetRow *geo, gint row, const GtkSheet *sheet) { + gint i; + gint start_pixel = 0; + g_return_val_if_fail (G_IS_SHEET_ROW (geo), -1); g_return_val_if_fail (row >= 0, -1); g_return_val_if_fail (row < g_sheet_row_get_row_count(geo, sheet),-1); - gint i; - gint start_pixel = 0; - if ( G_SHEET_ROW_GET_IFACE(geo)->top_ypixel) return (G_SHEET_ROW_GET_IFACE(geo)->top_ypixel)(geo, row, sheet);