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/master' into charset
[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 58b2879d07fe79cfdfa7d774d3b833fd22d11bb3..3c36f4ededbfa10c201e959af1d235b017d43683 100644
(file)
--- a/
src/ui/gui/select-cases-dialog.c
+++ b/
src/ui/gui/select-cases-dialog.c
@@
-18,12
+18,12
@@
#include "select-cases-dialog.h"
#include <gtk/gtk.h>
#include "select-cases-dialog.h"
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include "helper.h"
#include "psppire-dialog.h"
#include "psppire-data-window.h"
#include "helper.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"
@@
-42,7
+42,7
@@
struct select_cases_dialog
{
/* The XML that created the dialog */
struct select_cases_dialog
{
/* The XML that created the dialog */
- G
ladeXML
*xml;
+ G
tkBuilder
*xml;
GtkWidget *spinbutton ;
GtkWidget *spinbutton1 ;
GtkWidget *spinbutton ;
GtkWidget *spinbutton1 ;
@@
-110,7
+110,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);
@@
-134,7
+134,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);
@@
-247,7
+247,7
@@
select_cases_dialog (GObject *o, gpointer data)
GtkWidget *button_range;
GtkWidget *button_sample;
GtkWidget *button_range;
GtkWidget *button_sample;
- scd.xml =
XML_NEW ("psppire.glade
");
+ scd.xml =
builder_new ("psppire.ui
");
g_object_get (de->data_editor, "data-store", &scd.data_store, NULL);
g_object_get (de->data_editor, "data-store", &scd.data_store, NULL);
@@
-325,9
+325,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,