Commit 78667a20 authored by Jody Goldberg's avatar Jody Goldberg

More dialog conversions

still needs work
parent c1184ac5
2002-01-24 Jody Goldberg <jody@gnome.org>
* src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top.
2002-01-24 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in: fixed libgda detection for GNOME 2.
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (gnumeric_textview_get_text) : new utility.
(gnumeric_textview_set_text) : ditto.
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
......
2002-01-24 Jody Goldberg <jody@gnome.org>
* src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top.
2002-01-24 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in: fixed libgda detection for GNOME 2.
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (gnumeric_textview_get_text) : new utility.
(gnumeric_textview_set_text) : ditto.
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
......
2002-01-24 Jody Goldberg <jody@gnome.org>
* src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top.
2002-01-24 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in: fixed libgda detection for GNOME 2.
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (gnumeric_textview_get_text) : new utility.
(gnumeric_textview_set_text) : ditto.
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
......
2002-01-24 Jody Goldberg <jody@gnome.org>
* src/Makefile.am : Apparently the sources list is order dependent.
Put the built sources at the top.
2002-01-24 Rodrigo Moya <rodrigo@gnome-db.org>
* configure.in: fixed libgda detection for GNOME 2.
2002-01-23 Jody Goldberg <jody@gnome.org>
* src/gui-util.c (gnumeric_textview_get_text) : new utility.
(gnumeric_textview_set_text) : ditto.
* src/history.c : tidy up a mite.
* src/gui-util.c : Some initial conversions to gnome2. Needs work.
......
......@@ -451,6 +451,7 @@ src/pixmaps/Makefile
src/widgets/Makefile
doc/Makefile
doc/C/Makefile
omf-install/Makefile
plugins/Makefile
plugins/numtheory/Makefile
plugins/derivatives/Makefile
......
......@@ -23,6 +23,8 @@ INCLUDES = \
$(GNUMERIC_CFLAGS)
GNUMERIC_BASE = \
gui-gtkmarshalers.h \
gui-gtkmarshalers.c \
analysis-tools.c \
analysis-tools.h \
application.c \
......@@ -244,9 +246,7 @@ GNUMERIC_BASE = \
xml-io.h \
xml-io-version.h \
xml-io-autoft.c \
xml-io-autoft.h \
gui-gtkmarshalers.h \
gui-gtkmarshalers.c
xml-io-autoft.h
# TODO : split the bonobo and corba tests one day
GNUMERIC_CORBA = \
......
2002-01-23 Jody Goldberg <jody@gnome.org>
* cell-format.glade : Add use_underline to the radio buttons.
* dialog-cell-format.c (validation_rebuild_validation) : Use
gnumeric_textview_get_text.
2002-01-23 Jody Goldberg <jody@gnome.org>
* cell-format.glade : remove place holders, s/columns/n-columns/
......
......@@ -155,7 +155,7 @@
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">0</property>
<property name="focus_target">alpha-entry</property>
<property name="mnemonic_widget">alpha-entry</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
......@@ -201,7 +201,7 @@
<property name="yalign">0.5</property>
<property name="xpad">5</property>
<property name="ypad">0</property>
<property name="focus_target">replication-entry</property>
<property name="mnemonic_widget">replication-entry</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
......
......@@ -390,7 +390,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="focus_target">entry2</property>
<property name="mnemonic_widget">entry2</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
......@@ -584,7 +584,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="focus_target">entry1</property>
<property name="mnemonic_widget">entry1</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
......
......@@ -149,7 +149,7 @@
<property name="yalign">0.5</property>
<property name="xpad">4</property>
<property name="ypad">0</property>
<property name="focus_target">minutes</property>
<property name="mnemonic_widget">minutes</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
......
......@@ -5,12 +5,12 @@
<requires lib="gnome" />
<requires lib="canvas" />
<widget class="GnomePropertyBox" id="CellFormat">
<widget class="GtkDialog" id="CellFormat">
<property name="visible">no</property>
<property name="modal">no</property>
<property name="allow_shrink">no</property>
<property name="allow_grow">no</property>
<property name="window-position">GTK_WIN_POS_NONE</property>
<property name="window-position">GTK_WIN_POS_MOUSE</property>
<child internal-child="notebook">
<widget class="GtkNotebook" id="MainNotebook">
......@@ -52,6 +52,7 @@
<property name="draw_indicator">yes</property>
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -69,6 +70,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -86,6 +88,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -103,6 +106,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -120,6 +124,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -137,6 +142,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -154,6 +160,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -171,6 +178,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -188,6 +196,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -205,6 +214,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -222,6 +232,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -239,6 +250,7 @@
<property name="height-request">22</property>
<property name="visible">yes</property>
<property name="group">format_general</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -715,6 +727,7 @@
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">2</property>
......@@ -736,6 +749,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">halign_justify</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">2</property>
......@@ -757,6 +771,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">halign_justify</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">1</property>
......@@ -778,6 +793,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">halign_justify</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">1</property>
......@@ -799,6 +815,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">halign_justify</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">0</property>
......@@ -820,6 +837,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">halign_justify</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="left_attach">0</property>
......@@ -848,6 +866,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">halign_justify</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -959,6 +978,7 @@
<property name="active">no</property>
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -975,6 +995,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">valign_top</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -991,6 +1012,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">valign_top</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">0</property>
......@@ -1014,6 +1036,7 @@
<property name="draw_indicator">yes</property>
<property name="visible">yes</property>
<property name="group">valign_top</property>
<property name="use_underline">yes</property>
</widget>
<packing>
<property name="padding">5</property>
......
......@@ -78,7 +78,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="focus_target">function</property>
<property name="mnemonic_widget">function</property>
<property name="visible">yes</property>
<property name="use_underline">yes</property>
</widget>
......
......@@ -76,11 +76,10 @@ dialog_about (WorkbookControlGUI *wbcg)
#ifdef ENABLE_NLS
{
int i;
int i;
for (i = 0; authors[i] != NULL; i++){
for (i = 0; authors[i] != NULL; i++)
authors[i] = _(authors[i]);
}
}
#endif
/* Ensure we only pop up one copy per workbook */
......@@ -95,11 +94,10 @@ dialog_about (WorkbookControlGUI *wbcg)
gdk_pixbuf_new_from_file ("gnome-gnumeric.png", NULL));
hbox = gtk_hbox_new (TRUE, 0);
{
GtkWidget *href = gnome_href_new ("http://www.gnumeric.org",
_("Gnumeric Home Page"));
gtk_box_pack_start (GTK_BOX (hbox), href, FALSE, FALSE, 0);
}
gtk_box_pack_start (GTK_BOX (hbox),
gnome_href_new ("http://www.gnumeric.org", _("Gnumeric Home Page")),
FALSE, FALSE, 0);
#ifdef WEB_BIT_ROT
{
GtkWidget *href = gnome_href_new ("http://www.ximian.com/apps/gnumeric.php3",
......@@ -112,7 +110,5 @@ dialog_about (WorkbookControlGUI *wbcg)
gtk_widget_show_all (hbox);
gnumeric_keyed_dialog (wbcg, GTK_WINDOW (about), ABOUT_KEY);
/* Close on click, close with parent */
gnumeric_dialog_show (wbcg, GNOME_DIALOG (about), TRUE, TRUE);
gnumeric_dialog_show (wbcg, GTK_DIALOG (about), TRUE, TRUE);
}
......@@ -225,7 +225,7 @@ dialog_advanced_filter (WorkbookControlGUI *wbcg)
gtk_widget_grab_focus (list_range);
gtk_widget_set_sensitive (copy_to, FALSE);
loop:
v = gnumeric_dialog_run (wbcg, GNOME_DIALOG (dia));
v = gnumeric_dialog_run (wbcg, GTK_DIALOG (dia));
sheet = wb_control_cur_sheet (WORKBOOK_CONTROL (wbcg));
......
......@@ -812,7 +812,7 @@ dialog_tool_init_outputs (GenericToolState *state, GtkSignalFunc sensitivity_cb)
GNUM_EE_SINGLE_RANGE,
GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->output_entry,
wb_control_gui_cur_sheet (state->wbcg));
wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->output_entry),
1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, 0,
......@@ -900,7 +900,7 @@ dialog_tool_init (GenericToolState *state, char *gui_name, char *dialog_name,
state->input_entry = GNUMERIC_EXPR_ENTRY (gnumeric_expr_entry_new (state->wbcg));
gnumeric_expr_entry_set_flags (state->input_entry, flags, GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->input_entry,
wb_control_gui_cur_sheet (state->wbcg));
wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->input_entry),
1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, 0,
......@@ -933,7 +933,7 @@ dialog_tool_init (GenericToolState *state, char *gui_name, char *dialog_name,
(state->wbcg));
gnumeric_expr_entry_set_flags (state->input_entry_2, flags, GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->input_entry_2,
wb_control_gui_cur_sheet (state->wbcg));
wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->input_entry_2),
1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
......@@ -2922,7 +2922,7 @@ dialog_random_tool_init (RandomToolState *state)
gnumeric_expr_entry_set_flags (GNUMERIC_EXPR_ENTRY (state->par1_expr_entry),
GNUM_EE_SINGLE_RANGE, GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (GNUMERIC_EXPR_ENTRY (state->par1_expr_entry),
wb_control_gui_cur_sheet (state->wbcg));
wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, state->par1_expr_entry,
1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
......@@ -3170,7 +3170,7 @@ dialog_regression_tool_init (RegressionToolState *state)
table = GTK_TABLE (glade_xml_get_widget (state->gui, "input-table"));
state->input_entry = GNUMERIC_EXPR_ENTRY (gnumeric_expr_entry_new (state->wbcg));
gnumeric_expr_entry_set_flags (state->input_entry, 0, GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->input_entry, wb_control_gui_cur_sheet (state->wbcg));
gnumeric_expr_entry_set_scg (state->input_entry, wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->input_entry),
1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, 0,
......@@ -3195,7 +3195,7 @@ dialog_regression_tool_init (RegressionToolState *state)
gnumeric_expr_entry_set_flags (state->input_entry_2, GNUM_EE_SINGLE_RANGE,
GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->input_entry_2,
wb_control_gui_cur_sheet (state->wbcg));
wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->input_entry_2),
1, 2, 2, 3,
GTK_EXPAND | GTK_FILL, 0,
......@@ -3947,7 +3947,7 @@ dialog_histogram_tool_init (HistogramToolState *state)
table = GTK_TABLE (glade_xml_get_widget (state->gui, "input-table"));
state->input_entry = GNUMERIC_EXPR_ENTRY (gnumeric_expr_entry_new (state->wbcg));
gnumeric_expr_entry_set_flags (state->input_entry, 0, GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->input_entry, wb_control_gui_cur_sheet (state->wbcg));
gnumeric_expr_entry_set_scg (state->input_entry, wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->input_entry),
1, 2, 0, 1,
GTK_EXPAND | GTK_FILL, 0,
......@@ -3973,7 +3973,7 @@ dialog_histogram_tool_init (HistogramToolState *state)
state->input_entry_2 = GNUMERIC_EXPR_ENTRY (gnumeric_expr_entry_new (state->wbcg));
gnumeric_expr_entry_set_flags (state->input_entry_2, GNUM_EE_SINGLE_RANGE, GNUM_EE_MASK);
gnumeric_expr_entry_set_scg (state->input_entry_2,
wb_control_gui_cur_sheet (state->wbcg));
wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->input_entry_2),
1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
......
......@@ -98,7 +98,7 @@ typedef struct {
/*
* Gui elements
*/
GnomeDialog *dialog;
GtkDialog *dialog;
GtkCombo *category;
......@@ -451,7 +451,7 @@ cb_cancel_clicked (GtkButton *button, AutoFormatInfo *info)
* Return value: always TRUE indicating that we have closed the dialog.
**/
static int
cb_dialog_close (GnomeDialog *dialog, AutoFormatInfo *info)
cb_dialog_close (GtkDialog *dialog, AutoFormatInfo *info)
{
info->canceled = TRUE;
gtk_main_quit ();
......@@ -834,7 +834,7 @@ dialog_autoformat (WorkbookControlGUI *wbcg)
info->selected_template = NULL;
info->tooltips = gtk_tooltips_new ();
info->dialog = GNOME_DIALOG (glade_xml_get_widget (gui, "dialog"));
info->dialog = GTK_DIALOG (glade_xml_get_widget (gui, "dialog"));
info->category = GTK_COMBO (glade_xml_get_widget (gui, "format_category"));
......@@ -971,14 +971,7 @@ dialog_autoformat (WorkbookControlGUI *wbcg)
cb_category_popwin_hide (GTK_WIDGET (info->category), info);
}
/*
* Make sure we just hide the dialog when the close button
* is pressed, we'll handle closing the dialog ourselves.
*/
gnome_dialog_close_hides (info->dialog, TRUE);
gnome_dialog_set_default (info->dialog, 0);
gtk_dialog_set_default_response (info->dialog, GTK_RESPONSE_OK);
/*
* Show the dialog and enter gtk main loop
......
......@@ -49,7 +49,7 @@ dialog_autosave_prompt (WorkbookControlGUI *wbcg)
return 0;
}
v = gnumeric_dialog_run (wbcg, GNOME_DIALOG (dia));
v = gnumeric_dialog_run (wbcg, GTK_DIALOG (dia));
if (v != -1)
gtk_object_destroy (GTK_OBJECT (dia));
g_object_unref (G_OBJECT (gui));
......@@ -107,7 +107,7 @@ dialog_autosave (WorkbookControlGUI *wbcg)
gtk_toggle_button_set_active ((GtkToggleButton *) p.prompt_cb,
wbcg->autosave_prompt);
loop:
v = gnumeric_dialog_run (wbcg, GNOME_DIALOG (dia));
v = gnumeric_dialog_run (wbcg, GTK_DIALOG (dia));
if (v == 0) {
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (autosave_on_off))) {
......
......@@ -66,7 +66,7 @@ dialog_cell_comment (WorkbookControlGUI *wbcg, Sheet *sheet, CellPos const *pos)
gtk_widget_show (textbox);
gtk_widget_grab_focus (textbox);
v = gnumeric_dialog_run (wbcg, GNOME_DIALOG (dialog));
v = gnumeric_dialog_run (wbcg, GTK_DIALOG (dialog));
if (v == -1)
return;
......
......@@ -982,8 +982,8 @@ fmt_dialog_init_format_page (FormatState *state)
state);
/* Catch <return> in the spin box */
gnome_dialog_editable_enters (
GNOME_DIALOG (state->dialog),
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (state->format.widget[F_DECIMAL_SPIN]));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (state->format.widget[F_SEPARATOR]),
......@@ -1033,8 +1033,9 @@ fmt_dialog_init_format_page (FormatState *state)
gtk_signal_connect (GTK_OBJECT (state->format.widget[F_ENTRY]),
"changed", GTK_SIGNAL_FUNC (cb_format_entry),
state);
gnome_dialog_editable_enters (GNOME_DIALOG (state->dialog),
GTK_EDITABLE (state->format.widget[F_ENTRY]));
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (state->format.widget[F_ENTRY]));
/* Setup format buttons to toggle between the format pages */
for (i = 0; (name = format_buttons[i]) != NULL; ++i) {
......@@ -1225,8 +1226,8 @@ fmt_dialog_init_align_page (FormatState *state)
state);
/* Catch <return> in the spin box */
gnome_dialog_editable_enters (
GNOME_DIALOG (state->dialog),
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (w));
}
......@@ -1330,12 +1331,15 @@ fmt_dialog_init_font_page (FormatState *state)
gtk_box_pack_start (GTK_BOX (container), tmp, TRUE, TRUE, 0);
gtk_box_reorder_child (GTK_BOX (container), tmp, 0);
gnome_dialog_editable_enters (GNOME_DIALOG (state->dialog),
GTK_EDITABLE (font_widget->font_name_entry));
gnome_dialog_editable_enters (GNOME_DIALOG (state->dialog),
GTK_EDITABLE (font_widget->font_style_entry));
gnome_dialog_editable_enters (GNOME_DIALOG (state->dialog),
GTK_EDITABLE (font_widget->font_size_entry));
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (font_widget->font_name_entry));
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (font_widget->font_style_entry));
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (font_widget->font_size_entry));
state->font.selector = FONT_SELECTOR (font_widget);
......@@ -2041,7 +2045,7 @@ validation_rebuild_validation (FormatState *state)
ValidationStyle style = gnumeric_option_menu_get_selected_index (state->validation.error.action);
ValidationOp op = gnumeric_option_menu_get_selected_index (state->validation.op);
char *title = gtk_editable_get_chars (GTK_EDITABLE (state->validation.error.title), 0, -1);
char *msg = gtk_editable_get_chars (GTK_EDITABLE (state->validation.error.msg), 0, -1);
char *msg = gnumeric_textview_get_text (state->validation.error.msg);
mstyle_set_validation (state->result,
validation_new (style, type, op, title, msg,
validation_entry_to_expr (state->sheet, state->validation.expr0.entry),
......@@ -2179,8 +2183,10 @@ fmt_dialog_init_validation_expr_entry (FormatState *state, ExprEntry *entry,
GTK_WIDGET (entry->entry),
1, 3, 2+i, 3+i, GTK_EXPAND | GTK_FILL, 0, 0, 0);
gtk_widget_show (GTK_WIDGET (entry->entry));
gnome_dialog_editable_enters (GNOME_DIALOG (state->dialog), GTK_EDITABLE (entry->entry));
gnumeric_expr_entry_set_scg (entry->entry, wb_control_gui_cur_sheet (state->wbcg));
gnumeric_editable_enters (
GTK_WINDOW (state->dialog),
GTK_EDITABLE (entry->entry));
gnumeric_expr_entry_set_scg (entry->entry, wbcg_cur_scg (state->wbcg));
gtk_signal_connect (GTK_OBJECT (entry->entry), "changed",
GTK_SIGNAL_FUNC (cb_validation_changed), state);
}
......@@ -2212,7 +2218,9 @@ fmt_dialog_init_validation_page (FormatState *state)
state->validation.error.msg = GTK_TEXT_VIEW (glade_xml_get_widget (state->gui, "validation_error_msg"));
state->validation.error.image = GTK_IMAGE (glade_xml_get_widget (state->gui, "validation_error_image"));