GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de));
GtkWidget *dialog = gtk_font_chooser_dialog_new (NULL, GTK_WINDOW (toplevel));
GtkStyleContext *style = gtk_widget_get_style_context (GTK_WIDGET(de->data_editor));
- const PangoFontDescription *current_font = gtk_style_context_get_font (style, GTK_STATE_FLAG_NORMAL);
+ const PangoFontDescription *current_font ;
+
+ gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", ¤t_font, NULL);
gtk_font_chooser_set_font_desc (GTK_FONT_CHOOSER (dialog), current_font);
static void
goto_case (PsppireDataWindow *dw)
{
-#if SHEET_MERGE
- PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor);
-
- goto_case_dialog (ds);
-#endif
+ int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor));
+ if (p == 0)
+ {
+ goto_case_dialog (JMD_SHEET (dw->data_editor->data_sheet));
+ }
}
return NULL;
}
-#if SHEET_MERGE
-
-PsppireDataWindow *
-psppire_data_window_for_data_store (PsppireDataStore *data_store)
-{
- PsppireDataWindow *pdw;
-
- ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows)
- if (pdw->data_store == data_store)
- return pdw;
-
- return NULL;
-}
-
-#endif
-
GtkWindow *
create_data_window (void)
{
return GTK_WINDOW (w);
}
-
-
-void
+GtkWindow *
open_data_window (PsppireWindow *victim, const char *file_name,
const char *encoding, gpointer hint)
{
psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint);
gtk_widget_show_all (window);
+ return GTK_WINDOW (window);
}