projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Font Selection: Use a local css_provider instead of the default one
[pspp]
/
src
/
ui
/
gui
/
psppire-selector.c
diff --git
a/src/ui/gui/psppire-selector.c
b/src/ui/gui/psppire-selector.c
index cd122d7bfb5dcb345cc5efb3525613608cc7dbb8..17d1c1fd66e1c52d1252277d939b897409dccb2d 100644
(file)
--- a/
src/ui/gui/psppire-selector.c
+++ b/
src/ui/gui/psppire-selector.c
@@
-133,8
+133,6
@@
static GObjectClass * parent_class = NULL;
-#define SELECTOR_DEBUGGING 0
-
static void
dump_hash_entry (gpointer key, gpointer value, gpointer obj)
{
static void
dump_hash_entry (gpointer key, gpointer value, gpointer obj)
{
@@
-213,9
+211,6
@@
static void on_click (GtkButton *b);
static void on_realize (GtkWidget *selector);
static void on_realize (GtkWidget *selector);
-static void update_subjects (PsppireSelector *selector);
-
-
static void
psppire_selector_set_property (GObject *object,
guint prop_id,
static void
psppire_selector_set_property (GObject *object,
guint prop_id,
@@
-232,15
+227,15
@@
psppire_selector_set_property (GObject *object,
break;
case PROP_PRIMARY:
selector->primary_requested = TRUE;
break;
case PROP_PRIMARY:
selector->primary_requested = TRUE;
- update_subjects (selector);
+
psppire_selector_
update_subjects (selector);
break;
case PROP_SOURCE_WIDGET:
selector->source = g_value_dup_object (value);
break;
case PROP_SOURCE_WIDGET:
selector->source = g_value_dup_object (value);
- update_subjects (selector);
+
psppire_selector_
update_subjects (selector);
break;
case PROP_DEST_WIDGET:
selector->dest = g_value_dup_object (value);
break;
case PROP_DEST_WIDGET:
selector->dest = g_value_dup_object (value);
- update_subjects (selector);
+
psppire_selector_
update_subjects (selector);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@
-1013,8
+1008,8
@@
set_default_filter (PsppireSelector *selector)
}
}
-
static
void
-update_subjects (PsppireSelector *selector)
+void
+
psppire_selector_
update_subjects (PsppireSelector *selector)
{
if ( NULL == selector->dest )
return;
{
if ( NULL == selector->dest )
return;
@@
-1058,8
+1053,7
@@
update_subjects (PsppireSelector *selector)
g_error ("Unsupported destination widget: %s", G_OBJECT_TYPE_NAME (selector->dest));
g_error ("Unsupported destination widget: %s", G_OBJECT_TYPE_NAME (selector->dest));
- /* FIXME: Remove this dependency */
- if ( PSPPIRE_IS_DICT_VIEW (selector->source) )
+ if ( PSPPIRE_IS_DICT_VIEW (selector->source) && selector->select_items == NULL)
{
GObjectClass *class = G_OBJECT_GET_CLASS (selector);
GType type = G_OBJECT_TYPE (selector->dest);
{
GObjectClass *class = G_OBJECT_GET_CLASS (selector);
GType type = G_OBJECT_TYPE (selector->dest);