Commit b9f78259 authored by Andreas J. Guelzow's avatar Andreas J. Guelzow Committed by Andreas J. Guelzow

the focus widget is the entry in the gnumeric-expr-entry widget the focus

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

	* dialog-analysis-tools.c (tool_set_focus) : the focus widget
	  is the entry in the gnumeric-expr-entry widget
	* dialog-cell-sort.c (dialog_set_focus) : the focus widget
	  is the entry in the gnumeric-expr-entry widget
	(dialog_init) : set update_policy, use update rather than changed
	  signal

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

	* gnumeric-expr-entry.c (gee_focus_in_event, gee_focus_out_event) :
	  wbcg_set_entry doesn't work here, disabled
	* gnumeric-expr-entry.h (gnumeric_expr_entry_set_update_policy) :
	  since this is non-static, declare it
parent 74e7f29c
2002-02-23 Andreas J. Guelzow <aguelzow@taliesin.ca>
* dialog-analysis-tools.c (tool_set_focus) : the focus widget
is the entry in the gnumeric-expr-entry widget
* dialog-cell-sort.c (dialog_set_focus) : the focus widget
is the entry in the gnumeric-expr-entry widget
(dialog_init) : set update_policy, use update rather than changed
signal
2002-02-23 Kjartan Maraas <kmaraas@gnome.org>
* *.glade: Don't translate the widget label.
......
......@@ -372,11 +372,12 @@ void
tool_set_focus (GtkWidget *window, GtkWidget *focus_widget,
GenericToolState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
if (focus_widget != NULL && IS_GNUMERIC_EXPR_ENTRY (focus_widget->parent)) {
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
} else
GNUMERIC_EXPR_ENTRY (focus_widget->parent));
} else {
wbcg_set_entry (state->wbcg, NULL);
}
}
/**
......
......@@ -83,12 +83,12 @@ static void
dialog_set_focus (GtkWidget *window, GtkWidget *focus_widget,
SortFlowState *state)
{
if (IS_GNUMERIC_EXPR_ENTRY (focus_widget)) {
if (focus_widget != NULL && IS_GNUMERIC_EXPR_ENTRY (focus_widget->parent)) {
wbcg_set_entry (state->wbcg,
GNUMERIC_EXPR_ENTRY (focus_widget));
gnm_expr_entry_set_absolute (GNUMERIC_EXPR_ENTRY (focus_widget));
} else
GNUMERIC_EXPR_ENTRY (focus_widget->parent));
} else {
wbcg_set_entry (state->wbcg, NULL);
}
}
......@@ -349,18 +349,12 @@ dialog_load_selection (SortFlowState *state)
first = selection_first_range (state->sheet, NULL, NULL);
if (first != NULL) {
/* gtk_toggle_button_set_active ( */
/* GTK_TOGGLE_BUTTON (state->cell_sort_row_rb), */
/* FALSE); */
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (state->cell_sort_col_rb),
first->end.row - first->start.row > first->end.col - first->start.col);
gnm_expr_entry_load_from_range (state->range_entry,
state->sheet, first);
} else
/* gtk_toggle_button_set_active ( */
/* GTK_TOGGLE_BUTTON (state->cell_sort_row_rb), */
/* FALSE); */
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (state->cell_sort_col_rb),
TRUE);
......@@ -573,9 +567,10 @@ dialog_init (SortFlowState *state)
0, 0);
gnumeric_editable_enters (GTK_WINDOW (state->dialog),
GTK_WIDGET (state->range_entry));
gnumeric_expr_entry_set_update_policy (state->range_entry, GTK_UPDATE_DISCONTINUOUS);
gtk_widget_show (GTK_WIDGET (state->range_entry));
g_signal_connect (G_OBJECT (state->range_entry),
"changed",
"update",
G_CALLBACK (cb_update_sensitivity), state);
/* Set-up tree view */
......@@ -698,6 +693,7 @@ dialog_init (SortFlowState *state)
G_CALLBACK (dialog_destroy), state);
cb_sort_selection_changed (NULL, state);
dialog_load_selection (state);
cb_update_sensitivity (NULL, state);
return FALSE;
}
......
2002-02-23 Andreas J. Guelzow <aguelzow@taliesin.ca>
* gnumeric-expr-entry.c (gee_focus_in_event, gee_focus_out_event) :
wbcg_set_entry doesn't work here, disabled
* gnumeric-expr-entry.h (gnumeric_expr_entry_set_update_policy) :
since this is non-static, declare it
2002-02-21 Jody Goldberg <jody@gnome.org>
* gnumeric-expr-entry.c (gnm_expr_entry_load_from_expr) : add new
......
......@@ -607,7 +607,7 @@ 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);
/* wbcg_set_entry (gee->wbcg, gee); */
fprintf (stderr, "in %p\n",gee);
return FALSE;
}
......@@ -615,7 +615,7 @@ 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);
/* wbcg_set_entry (gee->wbcg, NULL); */
fprintf (stderr, "out %p\n",gee);
return FALSE;
......
......@@ -59,6 +59,9 @@ void gnm_expr_entry_load_from_expr (GnumericExprEntry *e,
gboolean gnm_expr_entry_load_from_range (GnumericExprEntry *e,
Sheet *sheet, Range const *r);
void gnumeric_expr_entry_set_update_policy (GnumericExprEntry *e,
GtkUpdateType policy);
/* private : for internal use */
void gnm_expr_entry_end_of_drag (GnumericExprEntry *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