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
/
find-dialog.c
diff --git
a/src/ui/gui/find-dialog.c
b/src/ui/gui/find-dialog.c
index ad9bf842efb447c9afa17927665a78da3bc9575e..5a82b6c9ec2be9ee236455b190a43fd81a6279ae 100644
(file)
--- a/
src/ui/gui/find-dialog.c
+++ b/
src/ui/gui/find-dialog.c
@@
-37,7
+37,6
@@
which match particular strings */
#include <libpspp/message.h>
#include <gtk/gtk.h>
#include <libpspp/message.h>
#include <gtk/gtk.h>
-#include <glade/glade.h>
#include <stdlib.h>
#include "xalloc.h"
#include <stdlib.h>
#include "xalloc.h"
@@
-52,7
+51,7
@@
which match particular strings */
struct find_dialog
{
struct find_dialog
{
- G
ladeXML
*xml;
+ G
tkBuilder
*xml;
PsppireDict *dict;
struct datasheet *data;
PsppireDataWindow *de;
PsppireDict *dict;
struct datasheet *data;
PsppireDataWindow *de;
@@
-200,7
+199,7
@@
find_dialog (GObject *o, gpointer data)
PsppireVarStore *vs ;
PsppireDataStore *ds ;
PsppireVarStore *vs ;
PsppireDataStore *ds ;
- fd.xml =
XML_NEW ("psppire.glade
");
+ fd.xml =
builder_new ("find.ui
");
fd.de = de;
find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
fd.de = de;
find_button = gtk_button_new_from_stock (GTK_STOCK_FIND);
@@
-242,10
+241,9
@@
find_dialog (GObject *o, gpointer data)
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de));
- attach_dictionary_to_treeview (GTK_TREE_VIEW (source),
- fd.dict,
- GTK_SELECTION_SINGLE,
- NULL);
+ g_object_set (source, "dictionary", fd.dict,
+ "selection-mode", GTK_SELECTION_SINGLE,
+ NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
source,