X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dialog-action-histogram.c;h=3949886c92fe076b3396695be8bc74b5a3d248df;hb=62b5101a28fc2c4a9b8b26a998fb6c4ec12d84c7;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..3949886c92 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"
@@ -59,19 +58,13 @@ refresh (PsppireDialogAction *rd_)
gtk_entry_set_text (GTK_ENTRY (rd->variable), "");
}
-static void
-psppire_dialog_action_histogram_activate (GtkAction *a)
+static GtkBuilder *
+psppire_dialog_action_histogram_activate (PsppireDialogAction *a, GVariant *param)
{
PsppireDialogActionHistogram *act = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
PsppireDialogAction *pda = PSPPIRE_DIALOG_ACTION (a);
- GHashTable *thing = psppire_dialog_action_get_pointer (pda);
- GtkBuilder *xml = g_hash_table_lookup (thing, a);
- if (!xml)
- {
- xml = builder_new ("histogram.ui");
- g_hash_table_insert (thing, a, xml);
- }
+ GtkBuilder *xml = builder_new ( "histogram.ui");
pda->dialog = get_widget_assert (xml, "histogram-dialog");
pda->source = get_widget_assert (xml, "dict-view");
@@ -84,14 +77,13 @@ 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);
+ return xml;
}
static char *
-generate_syntax (PsppireDialogAction *a)
+generate_syntax (const PsppireDialogAction *a)
{
PsppireDialogActionHistogram *rd = PSPPIRE_DIALOG_ACTION_HISTOGRAM (a);
gchar *text;
@@ -118,9 +110,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_CLASS (class)->initial_activate = psppire_dialog_action_histogram_activate;
PSPPIRE_DIALOG_ACTION_CLASS (class)->generate_syntax = generate_syntax;
}