X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-histogram.c;h=bd0c8ea1f9612ebf807b34c47f82032a4bc4b3a3;hb=4246294842a8abedecaaf55aa87507225f03f58c;hp=08ffc1ad22c5b9811c4c24d9eb4a2077fc6cc0a2;hpb=fc6620099bbc53762095569d5356b67a81a85402;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-histogram.c b/src/ui/gui/psppire-dialog-action-histogram.c index 08ffc1ad22..bd0c8ea1f9 100644 --- a/src/ui/gui/psppire-dialog-action-histogram.c +++ b/src/ui/gui/psppire-dialog-action-histogram.c @@ -14,7 +14,6 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - #include #include "psppire-dialog-action-histogram.h" @@ -60,12 +59,12 @@ refresh (PsppireDialogAction *rd_) } static void -psppire_dialog_action_histogram_activate (GtkAction *a) +psppire_dialog_action_histogram_activate (PsppireDialogAction *a) { PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GHashTable *thing = psppire_dialog_action_get_pointer (pda); + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); GtkBuilder *xml = g_hash_table_lookup (thing, a); if (!xml) { @@ -84,14 +83,12 @@ psppire_dialog_action_histogram_activate (GtkAction *a) psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_histogram_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_histogram_parent_class)->activate (pda); } static char * -generate_syntax (PsppireDialogAction *a) +generate_syntax (const PsppireDialogAction *a) { PsppireDialogActionHistogram *rd = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a); gchar *text; @@ -118,9 +115,7 @@ generate_syntax (PsppireDialogAction *a) static void psppire_dialog_action_histogram_class_init (PsppireDialogActionHistogramClass *class) { - GtkActionClass *action_class = GTK_ACTION_CLASS (class); - - action_class->activate = psppire_dialog_action_histogram_activate; + psppire_dialog_action_set_activation (class, psppire_dialog_action_histogram_activate); PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax; }