X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-means.c;h=0093016150467658e1473659946841505f4ed515;hb=90235aa878616d2fac8b539416dd806b135a44e6;hp=6610f595563a561c077506d6a0c2beb3b503055e;hpb=fc6620099bbc53762095569d5356b67a81a85402;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-means.c b/src/ui/gui/psppire-dialog-action-means.c index 6610f59556..0093016150 100644 --- a/src/ui/gui/psppire-dialog-action-means.c +++ b/src/ui/gui/psppire-dialog-action-means.c @@ -36,7 +36,7 @@ G_DEFINE_TYPE (PsppireDialogActionMeans, psppire_dialog_action_means, PSPPIRE_TY static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { gint l; PsppireDialogActionMeans *scd = PSPPIRE_DIALOG_ACTION_MEANS (act); @@ -92,25 +92,25 @@ dialog_refresh (PsppireDialogAction *da) } static void -psppire_dialog_action_means_activate (GtkAction *a) +psppire_dialog_action_means_activate (PsppireDialogAction *a) { PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); PsppireDialogActionMeans *act = PSPPIRE_DIALOG_ACTION_MEANS (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) { xml = builder_new ("means.ui"); g_hash_table_insert (thing, a, xml); - } - GtkWidget *vb = get_widget_assert (xml, "alignment3"); - GtkWidget *selector = get_widget_assert (xml, "layer-selector"); + GtkWidget *vb = get_widget_assert (xml, "frame2"); + act->layer = psppire_means_layer_new (); + gtk_container_add (GTK_CONTAINER (vb), act->layer); + gtk_widget_show (act->layer); + } - act->layer = psppire_means_layer_new (); - gtk_container_add (GTK_CONTAINER (vb), act->layer); - gtk_widget_show (act->layer); + GtkWidget *selector = get_widget_assert (xml, "layer-selector"); pda->dialog = get_widget_assert (xml, "means-dialog"); pda->source = get_widget_assert (xml, "all-variables"); @@ -127,7 +127,6 @@ psppire_dialog_action_means_activate (GtkAction *a) psppire_dialog_action_set_valid_predicate (pda, (void *) dialog_state_valid); psppire_dialog_action_set_refresh (pda, dialog_refresh); - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_means_parent_class)->activate (pda); } static void