projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
src
/
ui
/
gui
/
select-cases-dialog.c
diff --git
a/src/ui/gui/select-cases-dialog.c
b/src/ui/gui/select-cases-dialog.c
index d953308a09fbe8b27c92c84ff54c045e8eac4e27..56b10d2c5482e382da1b8b2df32f5646bb8fe127 100644
(file)
--- a/
src/ui/gui/select-cases-dialog.c
+++ b/
src/ui/gui/select-cases-dialog.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2007, 2008
, 2009
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
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
@@
-18,14
+18,16
@@
#include "select-cases-dialog.h"
#include <gtk/gtk.h>
#include "select-cases-dialog.h"
#include <gtk/gtk.h>
-#include "
helpe
r.h"
+#include "
executo
r.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
-#include "
dialog-common
.h"
+#include "
psppire-selector
.h"
#include "dict-display.h"
#include "dict-display.h"
+#include "dialog-common.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
#include "helper.h"
#include "widget-io.h"
#include <language/syntax-string-source.h>
#include "helper.h"
+#include <xalloc.h>
#include <gettext.h>
#include <gettext.h>
@@
-109,7
+111,7
@@
sample_subdialog (GtkButton *b, gpointer data)
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox1, 1, 2, 0, 1);
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox1, 1, 2, 0, 1);
- g_signal_connect (
G_OBJECT (percent)
, "toggled",
+ g_signal_connect (
percent
, "toggled",
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (percent), TRUE);
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox1);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (percent), TRUE);
@@
-133,7
+135,7
@@
sample_subdialog (GtkButton *b, gpointer data)
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox2, 1, 2, 1, 2);
gtk_table_attach_defaults (GTK_TABLE (table),
scd->hbox2, 1, 2, 1, 2);
- g_signal_connect (
G_OBJECT (sample_n_cases)
, "toggled",
+ g_signal_connect (
sample_n_cases
, "toggled",
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox2);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sample_n_cases), FALSE);
G_CALLBACK (set_sensitivity_from_toggle), scd->hbox2);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sample_n_cases), FALSE);
@@
-324,9
+326,10
@@
select_cases_dialog (GObject *o, gpointer data)
{
GtkWidget *source = get_widget_assert (scd.xml, "select-cases-treeview");
{
GtkWidget *source = get_widget_assert (scd.xml, "select-cases-treeview");
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- scd.data_store->dict,
- GTK_SELECTION_SINGLE, NULL);
+ g_object_set (source, "dictionary",
+ scd.data_store->dict,
+ "selection-mode",
+ GTK_SELECTION_SINGLE, NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
@@
-386,7
+389,7
@@
generate_syntax (const struct select_cases_dialog *scd)
(GTK_TOGGLE_BUTTON (get_widget_assert (scd->xml,
"radiobutton-all"))))
{
(GTK_TOGGLE_BUTTON (get_widget_assert (scd->xml,
"radiobutton-all"))))
{
- return strdup ("\n");
+ return
x
strdup ("\n");
}
string = g_string_new ("");
}
string = g_string_new ("");