X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgtksheet%2Fgsheet-column-iface.c;h=a4cc9f36b3a54359eae56bba396f152c34b08141;hb=573068f2bdcd3f8796e9646668fed910a90f890b;hp=f1b915513774fece69f73729fb32d1db88abe1a5;hpb=745a5487c9da077893a46d26d64e911246640a7b;p=pspp-builds.git diff --git a/lib/gtksheet/gsheet-column-iface.c b/lib/gtksheet/gsheet-column-iface.c index f1b91551..a4cc9f36 100644 --- a/lib/gtksheet/gsheet-column-iface.c +++ b/lib/gtksheet/gsheet-column-iface.c @@ -163,11 +163,11 @@ inline const GtkSheetButton * g_sheet_column_get_button(const GSheetColumn *column, gint col, const GtkSheet *sheet) { - g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE); - + static GtkSheetButton button ; GSheetColumnIface *iface = G_SHEET_COLUMN_GET_IFACE (column); - static GtkSheetButton button ; + g_return_val_if_fail (G_IS_SHEET_COLUMN (column), FALSE); + memcpy(&button, &default_button, sizeof (button)); if ( iface->get_button_label) @@ -251,13 +251,13 @@ g_sheet_column_get_column_count(const GSheetColumn *geo, const GtkSheet *sheet) inline gint g_sheet_column_start_pixel(const GSheetColumn *geo, gint col, const GtkSheet *sheet) { + gint i; + gint start_pixel = 0; + g_return_val_if_fail (G_IS_SHEET_COLUMN (geo), -1); g_return_val_if_fail (col < g_sheet_column_get_column_count(geo, sheet),-1); - gint i; - gint start_pixel = 0; - for ( i = 0 ; i < col ; ++i ) { if ( g_sheet_column_get_visibility(geo, i, sheet))