Commit 254d3db2 authored by Andreas J. Guelzow's avatar Andreas J. Guelzow Committed by Andreas J. Guelzow

set flags (cb_fmt_dialog_set_focus) : remove code now in

2002-02-25  Andreas J. Guelzow <aguelzow@taliesin.ca>

	* dialog-cell-format.c (fmt_dialog_init_validation_expr_entry) :
	  set flags
	(cb_fmt_dialog_set_focus) : remove code now in wbcg_edit_attach_guru
	* dialog-cell-sort.c (dialog_set_focus) : deleted
	* dialog-consolidate.c (cb_dialog_set_focus) : deleted
	(setup_widgets) : set expr entry flags
	* dialog-define-names.c (cb_name_guru_set_focus) : deleted
	(name_guru_init) : set expr entry flags
	* dialog-goal-seek.c (dialog_set_focus) : deleted
	* dialog-printer-setup.c (cb_do_print_set_focus) : deleted
	* dialog-search-replace.c (set_focus) : deleted
	* dialog-search.c (set_focus) : deleted
	* dialog-solver.c (dialog_set_focus) : deleted
	* dialog-tabulate.c (set_focus) : deleted

2002-02-25  Andreas J. Guelzow <aguelzow@taliesin.ca>

	* src/sheet-object-widget.c (cb_scrollbar_set_focus) : remove code
	  now handeld in wbcg_edit_attach_guru
	(cb_checkbox_set_focus) : ditto
	(sheet_widget_scrollbar_user_config) : rearrange signal callbacks
	(sheet_widget_checkbox_user_config) : ditto

2002-02-25  Andreas J. Guelzow <aguelzow@taliesin.ca>

	* gnumeric-expr-entry.c (gee_focus_in_event, gee_focus_out_event) :
	  deleted
	(gnumeric_expr_entry_new) remove ref to gee_focus_*_event
parent 2fbe2212
2002-02-25 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/sheet-object-widget.c (cb_scrollbar_set_focus) : remove code
now handeld in wbcg_edit_attach_guru
(cb_checkbox_set_focus) : ditto
(sheet_widget_scrollbar_user_config) : rearrange signal callbacks
(sheet_widget_checkbox_user_config) : ditto
2002-02-25 Morten Welinder <terra@diku.dk>
* src/mathfunc.c (random_01): Reduce the number of system calls
......
2002-02-25 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/sheet-object-widget.c (cb_scrollbar_set_focus) : remove code
now handeld in wbcg_edit_attach_guru
(cb_checkbox_set_focus) : ditto
(sheet_widget_scrollbar_user_config) : rearrange signal callbacks
(sheet_widget_checkbox_user_config) : ditto
2002-02-25 Morten Welinder <terra@diku.dk>
* src/mathfunc.c (random_01): Reduce the number of system calls
......
2002-02-25 Andreas J. Guelzow <aguelzow@taliesin.ca>
* src/sheet-object-widget.c (cb_scrollbar_set_focus) : remove code
now handeld in wbcg_edit_attach_guru
(cb_checkbox_set_focus) : ditto
(sheet_widget_scrollbar_user_config) : rearrange signal callbacks
(sheet_widget_checkbox_user_config) : ditto
2002-02-25 Morten Welinder <terra@diku.dk>
* src/mathfunc.c (random_01): Reduce the number of system calls
......
2002-02-25 Andreas J. Guelzow <aguelzow@taliesin.ca>
* dialog-cell-format.c (fmt_dialog_init_validation_expr_entry) :
set flags
(cb_fmt_dialog_set_focus) : remove code now in wbcg_edit_attach_guru
* dialog-cell-sort.c (dialog_set_focus) : deleted
* dialog-consolidate.c (cb_dialog_set_focus) : deleted
(setup_widgets) : set expr entry flags
* dialog-define-names.c (cb_name_guru_set_focus) : deleted
(name_guru_init) : set expr entry flags
* dialog-goal-seek.c (dialog_set_focus) : deleted
* dialog-printer-setup.c (cb_do_print_set_focus) : deleted
* dialog-search-replace.c (set_focus) : deleted
* dialog-search.c (set_focus) : deleted
* dialog-solver.c (dialog_set_focus) : deleted
* dialog-tabulate.c (set_focus) : deleted
2002-02-25 Andreas J. Guelzow <aguelzow@taliesin.ca>
* dialog-advanced-filter.c (dialog_init) : remove ref to
......
......@@ -2167,6 +2167,8 @@ static void
fmt_dialog_init_validation_expr_entry (FormatState *state, ExprEntry *entry,
char const *name, int i)
{
GnumericExprEntryFlags flags = GNUM_EE_ABS_ROW | GNUM_EE_ABS_COL | GNUM_EE_SHEET_OPTIONAL;
entry->name = GTK_LABEL (glade_xml_get_widget (state->gui, name));
entry->entry = gnumeric_expr_entry_new (state->wbcg, TRUE);
gtk_table_attach (state->validation.criteria_table,
......@@ -2179,6 +2181,7 @@ fmt_dialog_init_validation_expr_entry (FormatState *state, ExprEntry *entry,
gnm_expr_entry_set_scg (entry->entry, wbcg_cur_scg (state->wbcg));
g_signal_connect (GTK_OBJECT (entry->entry), "changed",
G_CALLBACK (cb_validation_changed), state);
gnm_expr_entry_set_flags (entry->entry, flags, flags | GNUM_EE_SINGLE_RANGE);
}
static void
......@@ -2367,20 +2370,6 @@ cb_fmt_dialog_set_focus (GtkWidget *window, GtkWidget *focus_widget,
{
if (state->validation.changed)
validation_rebuild_validation (state);
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
GnumericExprEntryFlags flags;
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
flags = GNUM_EE_ABS_ROW | GNUM_EE_ABS_COL | GNUM_EE_SHEET_OPTIONAL;
gnm_expr_entry_set_flags (state->validation.expr0.entry,
flags, flags | GNUM_EE_SINGLE_RANGE);
gnm_expr_entry_set_flags (state->validation.expr1.entry,
flags, flags | GNUM_EE_SINGLE_RANGE);
} else
wbcg_set_entry (state->wbcg, NULL);
}
/* Set initial focus */
......@@ -2661,9 +2650,6 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno)
"clicked",
G_CALLBACK (cb_fmt_dialog_dialog_buttons), state);
g_signal_connect (G_OBJECT (dialog),
"set-focus",
G_CALLBACK (cb_fmt_dialog_set_focus), state);
set_initial_focus (state);
gtk_notebook_set_scrollable (state->notebook, TRUE);
......@@ -2685,6 +2671,10 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno)
"destroy",
G_CALLBACK (cb_fmt_dialog_dialog_destroy), state);
wbcg_edit_attach_guru (state->wbcg, GTK_WIDGET (state->dialog));
g_signal_connect (G_OBJECT (dialog),
"set-focus",
G_CALLBACK (cb_fmt_dialog_set_focus), state);
gnumeric_non_modal_dialog (state->wbcg, GTK_WINDOW (state->dialog));
gtk_widget_show (GTK_WIDGET (state->dialog));
}
......
......@@ -79,19 +79,6 @@ enum {
NUM_COLMNS
};
static void
dialog_set_focus (GtkWidget *window, GtkWidget *focus_widget,
SortFlowState *state)
{
if (focus_widget != NULL && IS_GNUMERIC_EXPR_ENTRY (focus_widget->parent)) {
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget->parent));
} else {
wbcg_set_entry (state->wbcg, NULL);
}
}
static gchar *
col_row_name (Sheet *sheet, int col, int row, gboolean header, gboolean is_cols)
{
......@@ -818,9 +805,6 @@ dialog_init (SortFlowState *state)
/* Finish dialog signals */
wbcg_edit_attach_guru (state->wbcg, state->dialog);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (dialog_set_focus), state);
g_signal_connect (GTK_OBJECT (state->dialog),
"destroy",
G_CALLBACK (dialog_destroy), state);
......
......@@ -199,23 +199,6 @@ cb_dialog_destroy (GtkObject *object, ConsolidateState *state)
return FALSE;
}
static void
cb_dialog_set_focus (GtkWidget *window, GtkWidget *focus_widget,
ConsolidateState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
GnumericExprEntryFlags flags;
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
flags = GNUM_EE_SINGLE_RANGE;
gnm_expr_entry_set_flags (state->gui.destination, flags, flags);
gnm_expr_entry_set_flags (state->gui.source, flags, flags);
} else
wbcg_set_entry (state->wbcg, NULL);
}
static void
cb_dialog_clicked (GtkWidget *widget, ConsolidateState *state)
{
......@@ -372,6 +355,8 @@ connect_signal_btn_clicked (ConsolidateState *state, GtkButton *button)
static void
setup_widgets (ConsolidateState *state, GladeXML *glade_gui)
{
GnumericExprEntryFlags flags;
state->gui.dialog = GTK_DIALOG (glade_xml_get_widget (glade_gui, "dialog"));
state->gui.function = GTK_OPTION_MENU (glade_xml_get_widget (glade_gui, "function"));
......@@ -406,14 +391,15 @@ setup_widgets (ConsolidateState *state, GladeXML *glade_gui)
gnm_expr_entry_set_scg (state->gui.destination, wbcg_cur_scg (state->wbcg));
gnm_expr_entry_set_scg (state->gui.source, wbcg_cur_scg (state->wbcg));
flags = GNUM_EE_SINGLE_RANGE;
gnm_expr_entry_set_flags (state->gui.destination, flags, flags);
gnm_expr_entry_set_flags (state->gui.source, flags, flags);
gnumeric_editable_enters (GTK_WINDOW (state->gui.dialog),
GTK_WIDGET (state->gui.destination));
gnumeric_editable_enters (GTK_WINDOW (state->gui.dialog),
GTK_WIDGET (state->gui.source));
g_signal_connect (G_OBJECT (state->gui.dialog),
"set-focus",
G_CALLBACK (cb_dialog_set_focus), state);
g_signal_connect (G_OBJECT (state->gui.dialog),
"destroy",
G_CALLBACK (cb_dialog_destroy), state);
......
......@@ -465,18 +465,6 @@ cb_name_guru_destroy (GtkObject *w, NameGuruState *state)
return FALSE;
}
static void
cb_name_guru_set_focus (GtkWidget *window, GtkWidget *focus_widget,
NameGuruState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
gnm_expr_entry_set_absolute (state->expr_entry);
} else
wbcg_set_entry (state->wbcg, NULL);
}
static gboolean
name_guru_init (NameGuruState *state, WorkbookControlGUI *wbcg)
{
......@@ -503,6 +491,7 @@ name_guru_init (NameGuruState *state, WorkbookControlGUI *wbcg)
1, 2, 1, 2,
GTK_EXPAND | GTK_FILL, 0,
0, 0);
gnm_expr_entry_set_absolute (state->expr_entry);
gtk_widget_show (GTK_WIDGET (state->expr_entry));
state->sheet_scope = GTK_TOGGLE_BUTTON (glade_xml_get_widget (state->gui, "sheet_scope"));
state->wb_scope = GTK_TOGGLE_BUTTON (glade_xml_get_widget (state->gui, "workbook_scope"));
......@@ -527,9 +516,6 @@ name_guru_init (NameGuruState *state, WorkbookControlGUI *wbcg)
g_signal_connect (G_OBJECT (state->list),
"selection_changed",
G_CALLBACK (cb_name_guru_select_name), state);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (cb_name_guru_set_focus), state);
g_signal_connect (G_OBJECT (state->name),
"changed",
G_CALLBACK (cb_name_guru_update_sensitivity), state);
......
......@@ -489,25 +489,6 @@ cb_dialog_apply_clicked (GtkWidget *button, GoalSeekState *state)
return;
}
/**
* dialog_set_focus:
* @window:
* @focus_widget:
* @state:
*
**/
static void
dialog_set_focus (GtkWidget *window, GtkWidget *focus_widget,
GoalSeekState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
gnm_expr_entry_set_absolute (GNUMERIC_EXPR_ENTRY (focus_widget));
} else
wbcg_set_entry (state->wbcg, NULL);
}
/**
* dialog_realized:
* @widget
......@@ -576,7 +557,8 @@ dialog_init (GoalSeekState *state)
table = GTK_TABLE (glade_xml_get_widget (state->gui, "goal-table"));
state->set_cell_entry = gnumeric_expr_entry_new (state->wbcg, TRUE);
gnm_expr_entry_set_flags (state->set_cell_entry,
GNUM_EE_SINGLE_RANGE | GNUM_EE_SHEET_OPTIONAL,
GNUM_EE_SINGLE_RANGE | GNUM_EE_SHEET_OPTIONAL |
GNUM_EE_ABS_ROW | GNUM_EE_ABS_COL,
GNUM_EE_MASK);
gnm_expr_entry_set_scg (state->set_cell_entry, wbcg_cur_scg (state->wbcg));
gtk_table_attach (table, GTK_WIDGET (state->set_cell_entry),
......@@ -602,9 +584,6 @@ dialog_init (GoalSeekState *state)
wbcg_edit_attach_guru (state->wbcg, state->dialog);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (dialog_set_focus), state);
g_signal_connect (G_OBJECT (state->dialog),
"realize",
G_CALLBACK (dialog_realized), state);
......
......@@ -1587,17 +1587,6 @@ cb_do_print_ok (GtkWidget *w, PrinterSetupState *state)
gnome_dialog_close (GNOME_DIALOG (state->dialog));
}
static void
cb_do_print_set_focus (GtkWidget *window, GtkWidget *focus_widget,
PrinterSetupState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget))
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
else
wbcg_set_entry (state->wbcg, NULL);
}
static void
cb_do_print_destroy (GtkWidget *button, PrinterSetupState *state)
{
......@@ -1646,9 +1635,6 @@ do_setup_main_dialog (PrinterSetupState *state)
gtk_widget_hide (w);
wbcg_edit_attach_guru (state->wbcg, state->dialog);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (cb_do_print_set_focus), state);
/* Lifecyle management */
g_signal_connect (G_OBJECT (state->dialog),
......
......@@ -169,18 +169,6 @@ dialog_destroy (GtkWidget *widget, DialogState *dd)
g_free (dd);
}
static void
set_focus (GtkWidget *widget, GtkWidget *focus_widget, DialogState *dd)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget))
wbcg_set_entry (dd->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
else
wbcg_set_entry (dd->wbcg, NULL);
}
static gboolean
range_focused (GtkWidget *widget, GdkEventFocus *event, DialogState *dd)
{
......@@ -263,9 +251,6 @@ dialog_search_replace (WorkbookControlGUI *wbcg,
g_signal_connect (G_OBJECT (dialog),
"destroy",
G_CALLBACK (dialog_destroy), dd);
g_signal_connect (GTK_OBJECT (dialog),
"set-focus",
G_CALLBACK (set_focus), dd);
g_signal_connect (GTK_OBJECT (dd->rangetext),
"focus-in-event",
G_CALLBACK (range_focused), dd);
......
......@@ -225,16 +225,6 @@ non_model_dialog (WorkbookControlGUI *wbcg,
gtk_widget_show (GTK_WIDGET (dialog));
}
static void
set_focus (GtkWidget *widget, GtkWidget *focus_widget, DialogState *dd)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget))
wbcg_set_entry (dd->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
else
wbcg_set_entry (dd->wbcg, NULL);
}
static gboolean
range_focused (GtkWidget *widget, GdkEventFocus *event, DialogState *dd)
{
......@@ -539,9 +529,6 @@ dialog_search (WorkbookControlGUI *wbcg)
g_signal_connect (G_OBJECT (dialog),
"destroy",
G_CALLBACK (dialog_destroy), dd);
g_signal_connect (G_OBJECT (dialog),
"set-focus",
G_CALLBACK (set_focus), dd);
g_signal_connect (G_OBJECT (dd->rangetext),
"focus-in-event",
G_CALLBACK (range_focused), dd);
......
......@@ -385,27 +385,6 @@ cb_dialog_set_rhs_sensitivity (GtkWidget *dummy, SolverState *state)
}
}
/**
* dialog_set_focus:
* @window:
* @focus_widget:
* @state:
*
**/
static void
dialog_set_focus (GtkWidget *window, GtkWidget *focus_widget,
SolverState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
gnm_expr_entry_set_absolute (GNUMERIC_EXPR_ENTRY (focus_widget));
} else
wbcg_set_entry (state->wbcg, NULL);
}
/**
* free_original_values:
* @ov:
......@@ -1005,10 +984,6 @@ dialog_init (SolverState *state)
/* dialog */
wbcg_edit_attach_guru (state->wbcg, state->dialog);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (dialog_set_focus), state);
g_signal_connect (G_OBJECT (state->dialog),
"destroy",
G_CALLBACK (dialog_destroy), state);
......
......@@ -286,16 +286,6 @@ non_model_dialog (WorkbookControlGUI *wbcg,
gtk_widget_show (GTK_WIDGET (dialog));
}
static void
set_focus (GtkWidget *widget, GtkWidget *focus_widget, DialogState *dd)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget))
wbcg_set_entry (dd->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
else
wbcg_set_entry (dd->wbcg, NULL);
}
static void
focus_on_entry (GtkWidget *entry)
{
......@@ -558,9 +548,6 @@ dialog_tabulate (WorkbookControlGUI *wbcg, Sheet *sheet)
g_signal_connect (G_OBJECT (dialog),
"destroy",
G_CALLBACK (dialog_destroy), dd);
g_signal_connect (G_OBJECT (dialog),
"set-focus",
G_CALLBACK (set_focus), dd);
gtk_widget_show_all (dialog->vbox);
wbcg_edit_attach_guru (wbcg, GTK_WIDGET (dialog));
......
......@@ -646,19 +646,17 @@ static void
cb_scrollbar_set_focus (GtkWidget *window, GtkWidget *focus_widget,
ScrollbarConfigState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
GnumericExprEntry *ee = GNUMERIC_EXPR_ENTRY (focus_widget);
wbcg_set_entry (state->wbcg, ee);
} else
wbcg_set_entry (state->wbcg, NULL);
/* Note: have of the set-focus action is handle by the default */
/* callback installed by wbcg_edit_attach_guru */
/* Force an update of the content in case it
* needs tweaking (eg make it absolute)
*/
if (IS_GNUMERIC_EXPR_ENTRY (state->old_focus)) {
if (state->old_focus != NULL &&
IS_GNUMERIC_EXPR_ENTRY (state->old_focus->parent)) {
ParsePos pp;
ExprTree *expr = gnm_expr_entry_parse (
GNUMERIC_EXPR_ENTRY (state->old_focus),
GNUMERIC_EXPR_ENTRY (state->old_focus->parent),
parse_pos_init (&pp, NULL, state->sheet, 0, 0),
NULL, FALSE);
if (expr != NULL)
......@@ -759,9 +757,6 @@ sheet_widget_scrollbar_user_config (SheetObject *so, SheetControlGUI *scg)
gnome_dialog_set_default (GNOME_DIALOG (state->dialog), 0);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (cb_scrollbar_set_focus), state);
g_signal_connect (G_OBJECT (state->dialog),
"destroy",
G_CALLBACK (cb_scrollbar_config_destroy), state);
......@@ -773,6 +768,12 @@ sheet_widget_scrollbar_user_config (SheetObject *so, SheetControlGUI *scg)
SHEET_OBJECT_CONFIG_KEY);
wbcg_edit_attach_guru (state->wbcg, state->dialog);
/* Note: have of the set-focus action is handle by the default */
/* callback installed by wbcg_edit_attach_guru */
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (cb_scrollbar_set_focus), state);
gtk_window_set_position (GTK_WINDOW (state->dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_focus (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->expression));
......@@ -1089,19 +1090,17 @@ static void
cb_checkbox_set_focus (GtkWidget *window, GtkWidget *focus_widget,
CheckboxConfigState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
GnumericExprEntry *ee = GNUMERIC_EXPR_ENTRY (focus_widget);
wbcg_set_entry (state->wbcg, ee);
} else
wbcg_set_entry (state->wbcg, NULL);
/* Note: have of the set-focus action is handle by the default */
/* callback installed by wbcg_edit_attach_guru */
/* Force an update of the content in case it
* needs tweaking (eg make it absolute)
*/
if (IS_GNUMERIC_EXPR_ENTRY (state->old_focus)) {
if (state->old_focus != NULL &&
IS_GNUMERIC_EXPR_ENTRY (state->old_focus->parent)) {
ParsePos pp;
ExprTree *expr = gnm_expr_entry_parse (
GNUMERIC_EXPR_ENTRY (state->old_focus),
GNUMERIC_EXPR_ENTRY (state->old_focus->parent),
parse_pos_init (&pp, NULL, state->sheet, 0, 0),
NULL, FALSE);
if (expr != NULL)
......@@ -1216,9 +1215,6 @@ sheet_widget_checkbox_user_config (SheetObject *so, SheetControlGUI *scg)
g_signal_connect (G_OBJECT (state->label),
"changed",
G_CALLBACK (cb_checkbox_label_changed), state);
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (cb_checkbox_set_focus), state);
g_signal_connect (G_OBJECT (state->dialog),
"clicked",
G_CALLBACK (cb_checkbox_config_clicked), state);
......@@ -1228,7 +1224,14 @@ sheet_widget_checkbox_user_config (SheetObject *so, SheetControlGUI *scg)
G_CALLBACK (cb_checkbox_config_destroy), state);
gnumeric_keyed_dialog (state->wbcg, GTK_WINDOW (state->dialog),
SHEET_OBJECT_CONFIG_KEY);
wbcg_edit_attach_guru (state->wbcg, state->dialog);
/* Note: have of the set-focus action is handle by the default */
/* callback installed by wbcg_edit_attach_guru */
g_signal_connect (G_OBJECT (state->dialog),
"set-focus",
G_CALLBACK (cb_checkbox_set_focus), state);
gtk_window_set_position (GTK_WINDOW (state->dialog), GTK_WIN_POS_MOUSE);
gtk_window_set_focus (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->expression));
......
2002-02-25 Andreas J. Guelzow <aguelzow@taliesin.ca>
* gnumeric-expr-entry.c (gee_focus_in_event, gee_focus_out_event) :
deleted
(gnumeric_expr_entry_new) remove ref to gee_focus_*_event
2002-02-23 Andreas J. Guelzow <aguelzow@taliesin.ca>
* gnumeric-expr-entry.c (gnumeric_expr_entry_button_press_event) :
......
......@@ -587,24 +587,6 @@ cb_entry_changed (GtkEntry *ignored, GnumericExprEntry *gee)
g_signal_emit (G_OBJECT (gee), signals [CHANGED], 0);
}
static gboolean
gee_focus_in_event (GtkWidget *widget, GdkEventFocus *event, GnumericExprEntry *gee)
{
g_return_val_if_fail (IS_GNUMERIC_EXPR_ENTRY (gee), FALSE);
/* wbcg_set_entry (gee->wbcg, gee); */
fprintf (stderr, "in %p\n",gee);
return FALSE;
}
static gboolean
gee_focus_out_event (GtkWidget *widget, GdkEventFocus *event, GnumericExprEntry *gee)
{
g_return_val_if_fail (IS_GNUMERIC_EXPR_ENTRY (gee), FALSE);
/* wbcg_set_entry (gee->wbcg, NULL); */
fprintf (stderr, "out %p\n",gee);
return FALSE;
}
/**
* gnumeric_expr_entry_new:
*
......@@ -626,12 +608,6 @@ gnumeric_expr_entry_new (WorkbookControlGUI *wbcg, gboolean with_icon)
g_signal_connect (G_OBJECT (gee->entry),
"changed",
G_CALLBACK (cb_entry_changed), gee);
g_signal_connect (G_OBJECT (gee->entry),
"focus_in_event",
G_CALLBACK (gee_focus_in_event), gee);
g_signal_connect (G_OBJECT (gee->entry),
"focus_out_event",
G_CALLBACK (gee_focus_out_event), gee);
g_signal_connect (G_OBJECT (gee->entry),
"notify::cursor-position",
G_CALLBACK (gee_notify_cursor_position), gee);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment