projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PsppSheetView: Remove reference to colormap which is removed in Gtk3
[pspp]
/
src
/
ui
/
gui
/
psppire-window.c
diff --git
a/src/ui/gui/psppire-window.c
b/src/ui/gui/psppire-window.c
index c1784ac1f14d7df9a2e1880b27b971de8dc8e624..dcc44a8d5520a1c9bf3669034fc80caeb6c6fc0a 100644
(file)
--- a/
src/ui/gui/psppire-window.c
+++ b/
src/ui/gui/psppire-window.c
@@
-236,6
+236,8
@@
psppire_window_finalize (GObject *object)
PsppireWindowRegister *reg = psppire_window_register_new ();
PsppireWindowRegister *reg = psppire_window_register_new ();
+ g_signal_handler_disconnect (reg, window->remove_handler);
+ g_signal_handler_disconnect (reg, window->insert_handler);
psppire_window_register_remove (reg, window->list_name);
g_free (window->filename);
g_free (window->basename);
psppire_window_register_remove (reg, window->list_name);
g_free (window->filename);
g_free (window->basename);
@@
-243,12
+245,6
@@
psppire_window_finalize (GObject *object)
g_free (window->description);
g_free (window->list_name);
g_free (window->description);
g_free (window->list_name);
- g_signal_handler_disconnect (psppire_window_register_new (),
- window->remove_handler);
-
- g_signal_handler_disconnect (psppire_window_register_new (),
- window->insert_handler);
-
g_hash_table_destroy (window->menuitem_table);
if (G_OBJECT_CLASS (parent_class)->finalize)
g_hash_table_destroy (window->menuitem_table);
if (G_OBJECT_CLASS (parent_class)->finalize)
@@
-314,8
+310,10
@@
psppire_window_base_init (PsppireWindowClass *class)
static void
menu_toggled (GtkCheckMenuItem *mi, gpointer data)
{
static void
menu_toggled (GtkCheckMenuItem *mi, gpointer data)
{
+#if GTK3_TRANSITION
/* Prohibit changes to the state */
mi->active = !mi->active;
/* Prohibit changes to the state */
mi->active = !mi->active;
+#endif
}
}
@@
-359,9
+357,11
@@
insert_menuitem_into_menu (PsppireWindow *window, gpointer key)
gtk_menu_shell_append (window->menu, item);
gtk_menu_shell_append (window->menu, item);
+#if GTK3_TRANSITION
/* Set the state without emitting a signal */
GTK_CHECK_MENU_ITEM (item)->active =
(psppire_window_register_lookup (psppire_window_register_new (), key) == window);
/* Set the state without emitting a signal */
GTK_CHECK_MENU_ITEM (item)->active =
(psppire_window_register_lookup (psppire_window_register_new (), key) == window);
+#endif
g_hash_table_insert (window->menuitem_table, key, item);
}
g_hash_table_insert (window->menuitem_table, key, item);
}
@@
-664,7
+664,7
@@
psppire_window_save_as (PsppireWindow *w)
static void delete_recent (const char *file_name);
gboolean
static void delete_recent (const char *file_name);
gboolean
-psppire_window_load (PsppireWindow *w, const gchar *file)
+psppire_window_load (PsppireWindow *w, const gchar *file
, gpointer hint
)
{
gboolean ok;
PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
{
gboolean ok;
PsppireWindowIface *i = PSPPIRE_WINDOW_MODEL_GET_IFACE (w);
@@
-675,7
+675,7
@@
psppire_window_load (PsppireWindow *w, const gchar *file)
g_return_val_if_fail (i->load, FALSE);
g_return_val_if_fail (i->load, FALSE);
- ok = i->load (w, file);
+ ok = i->load (w, file
, hint
);
if ( ok )
{
if ( ok )
{
@@
-808,7
+808,7
@@
psppire_window_open (PsppireWindow *de)
gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
if (any_reader_may_open (sysname))
gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
if (any_reader_may_open (sysname))
- open_data_window (de, name);
+ open_data_window (de, name
, NULL
);
else
open_syntax_window (name, encoding);
else
open_syntax_window (name, encoding);