X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-kmeans.c;h=b25ecd475ab1a258271777c0b92a09312e173b80;hb=debddb2afee6725855f1b44e3bebbb67769def55;hp=18f7138cd6e4fc9acc9a74fd1a294d59a71f73b5;hpb=2a71889bf86463fb752bcbab248da47b25b4fd9a;p=pspp diff --git a/src/ui/gui/psppire-dialog-action-kmeans.c b/src/ui/gui/psppire-dialog-action-kmeans.c index 18f7138cd6..b25ecd475a 100644 --- a/src/ui/gui/psppire-dialog-action-kmeans.c +++ b/src/ui/gui/psppire-dialog-action-kmeans.c @@ -31,7 +31,7 @@ static void psppire_dialog_action_kmeans_class_init (PsppireDialogActionKme G_DEFINE_TYPE (PsppireDialogActionKmeans, psppire_dialog_action_kmeans, PSPPIRE_TYPE_DIALOG_ACTION); static char * -generate_syntax (PsppireDialogAction *act) +generate_syntax (const PsppireDialogAction *act) { PsppireDialogActionKmeans *km = PSPPIRE_DIALOG_ACTION_KMEANS (act); gchar *text; @@ -82,11 +82,18 @@ refresh (PsppireDialogAction *fd_) } static void -psppire_dialog_action_kmeans_activate (GtkAction *a) +psppire_dialog_action_kmeans_activate (PsppireDialogAction *a) { PsppireDialogActionKmeans *act = PSPPIRE_DIALOG_ACTION_KMEANS (a); PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a); - GtkBuilder *xml = builder_new ("k-means.ui"); + + GHashTable *thing = psppire_dialog_action_get_hash_table (pda); + GtkBuilder *xml = g_hash_table_lookup (thing, a); + if (!xml) + { + xml = builder_new ("k-means.ui"); + g_hash_table_insert (thing, a, xml); + } pda->dialog = get_widget_assert (xml, "k-means-dialog"); pda->source = get_widget_assert (xml, "dict-view"); @@ -95,13 +102,8 @@ psppire_dialog_action_kmeans_activate (GtkAction *a) act->variables = get_widget_assert (xml, "psppire-var-view1"); psppire_dialog_action_set_refresh (pda, refresh); - psppire_dialog_action_set_valid_predicate (pda, dialog_state_valid); - g_object_unref (xml); - - if (PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_kmeans_parent_class)->activate) - PSPPIRE_DIALOG_ACTION_CLASS (psppire_dialog_action_kmeans_parent_class)->activate (pda); } static void