X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdata%2Fdictionary.h;h=66542469e321c630c87b2396c9d6ab0f9a84c3e2;hb=d2ee46757c7602fb0d6827136fdb00af1140e2e1;hp=d50921201bb8e3d366198997ed223f9134324703;hpb=a46ff9d9503e9db1298c896b5a219e402706eb38;p=pspp diff --git a/src/data/dictionary.h b/src/data/dictionary.h index d50921201b..66542469e3 100644 --- a/src/data/dictionary.h +++ b/src/data/dictionary.h @@ -1,5 +1,5 @@ /* PSPP - a program for statistical analysis. - Copyright (C) 2004, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2004, 2007, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -32,7 +32,6 @@ struct dictionary *dict_clone (const struct dictionary *); /* Clearing and destroying dictionaries. */ void dict_clear (struct dictionary *); -void dict_clear_aux (struct dictionary *); void dict_destroy (struct dictionary *); /* Common ways to access variables. */ @@ -65,6 +64,9 @@ struct variable *dict_clone_var_as_assert (struct dictionary *, const struct variable *, const char *); +struct variable *dict_clone_var_in_place_assert (struct dictionary *, + const struct variable *); + /* Deleting variables. */ void dict_delete_var (struct dictionary *, struct variable *); void dict_delete_vars (struct dictionary *, @@ -179,12 +181,10 @@ struct dict_callbacks void (*var_added) (struct dictionary *, int, void *); void (*var_deleted) (struct dictionary *, const struct variable *, int dict_index, int case_index, void *); - void (*var_changed) (struct dictionary *, int, void *); - void (*var_resized) (struct dictionary *, int, int, void *); + void (*var_changed) (struct dictionary *, int, unsigned int, const struct variable *, void *); void (*weight_changed) (struct dictionary *, int, void *); void (*filter_changed) (struct dictionary *, int, void *); void (*split_changed) (struct dictionary *, void *); - void (*var_display_width_changed) (struct dictionary *, int, void *); }; void dict_set_callbacks (struct dictionary *, const struct dict_callbacks *,