Commit f83d696b authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

fix warning on s390 ditto. ditto. ditto. ditto. ditto.

2001-12-30  Jody Goldberg <jody@gnome.org>

	* src/cell.h : fix warning on s390
	* src/collect.h : ditto.
	* src/parse-util.h : ditto.
	* src/gnumeric.h : ditto.
	* src/style.h : ditto.
	* src/consolidate.h : ditto.
parent 24622d45
2001-12-30 Jody Goldberg <jody@gnome.org>
* src/cell.h : fix warning on s390
* src/collect.h : ditto.
* src/parse-util.h : ditto.
* src/gnumeric.h : ditto.
* src/style.h : ditto.
* src/consolidate.h : ditto.
2001-12-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (sheet_menu_label_run) : make the context menu
......
2001-12-30 Jody Goldberg <jody@gnome.org>
* src/cell.h : fix warning on s390
* src/collect.h : ditto.
* src/parse-util.h : ditto.
* src/gnumeric.h : ditto.
* src/style.h : ditto.
* src/consolidate.h : ditto.
2001-12-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (sheet_menu_label_run) : make the context menu
......
2001-12-30 Jody Goldberg <jody@gnome.org>
* src/cell.h : fix warning on s390
* src/collect.h : ditto.
* src/parse-util.h : ditto.
* src/gnumeric.h : ditto.
* src/style.h : ditto.
* src/consolidate.h : ditto.
2001-12-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (sheet_menu_label_run) : make the context menu
......
2001-12-30 Jody Goldberg <jody@gnome.org>
* src/cell.h : fix warning on s390
* src/collect.h : ditto.
* src/parse-util.h : ditto.
* src/gnumeric.h : ditto.
* src/style.h : ditto.
* src/consolidate.h : ditto.
2001-12-29 Jody Goldberg <jody@gnome.org>
* src/workbook-control-gui.c (sheet_menu_label_run) : make the context menu
......
......@@ -417,12 +417,12 @@ gnumeric_clean (FunctionEvalInfo *ei, Value **argv)
Value *res;
unsigned char *s, *p, *q;
s = value_get_as_string (argv[0]);
s = (unsigned char *)value_get_as_string (argv[0]);
for (p = q = s; *p; p++)
if (isprint (*p))
*q++ = *p;
*q = 0;
res = value_new_string (s);
res = value_new_string ((char *)s);
g_free (s);
return res;
......@@ -566,7 +566,7 @@ gnumeric_proper (FunctionEvalInfo *ei, Value **argv)
unsigned char *s, *p;
gboolean inword = FALSE;
s = value_get_as_string (argv[0]);
s = (unsigned char *)value_get_as_string (argv[0]);
for (p = s; *p; p++) {
if (isalpha (*p)) {
if (inword) {
......@@ -579,7 +579,7 @@ gnumeric_proper (FunctionEvalInfo *ei, Value **argv)
inword = FALSE;
}
v = value_new_string (s);
v = value_new_string ((char *)s);
g_free (s);
return v;
}
......@@ -781,13 +781,13 @@ gnumeric_value (FunctionEvalInfo *ei, Value **argv)
default: {
Value *v;
unsigned char *p, *arg = value_get_as_string (argv[0]);
unsigned char *p, *arg = (unsigned char *)value_get_as_string (argv[0]);
/* Skip leading spaces */
for (p = arg ; *p && isspace (*p) ; ++p)
;
v = format_match_number (p, NULL, NULL);
v = format_match_number ((char *)p, NULL, NULL);
g_free (arg);
if (v != NULL)
......
......@@ -19,7 +19,7 @@ typedef enum {
CELL_BEING_ITERATED = 0x080000,
/* Cell content spans */
CELL_CONTENT_SPANS = 0x100000,
CELL_CONTENT_SPANS = 0x100000
} CellFlags;
/* Definition of a Gnumeric Cell */
......
......@@ -15,7 +15,7 @@ typedef enum {
COLLECT_ZERO_ERRORS = 0x200,
COLLECT_IGNORE_BLANKS = 0x1000,
COLLECT_DATES = 0x2000,
COLLECT_DATES = 0x2000
} CollectFlags;
......
......@@ -23,7 +23,7 @@ typedef enum {
* of our formulas into the destination
* otherwise we put formulas
*/
CONSOLIDATE_PUT_VALUES = 1 << 3,
CONSOLIDATE_PUT_VALUES = 1 << 3
} ConsolidateMode;
typedef struct _Consolidate {
......
2001-12-30 Zbigniew Chyla <cyba@gnome.pl>
* dialog-search.c
(value_at): Return UTF-8 string (using U_() macro for static strings).
(search_clicked): Set focus to ETable to speed up keyboard navigation.
2001-12-15 Andreas J. Guelzow <aguelzow@taliesin.ca>
* autocorrect.glade : change position of help button
......
......@@ -23,6 +23,8 @@
#include <widgets/gnumeric-expr-entry.h>
#include <gal/widgets/e-cursors.h>
#include <gal/widgets/e-unicode.h>
#include <gal/util/e-unicode-i18n.h>
#include <gal/e-table/e-table-simple.h>
#include <gal/e-table/e-table.h>
#include <gal/e-table/e-table-scrolled.h>
......@@ -111,10 +113,11 @@ value_at (ETableModel *etc, int col, int row, void *data)
switch (col) {
case COL_SHEET:
return (void *)(item->ep.sheet->name_unquoted);
result = e_utf8_from_locale_string (item->ep.sheet->name_unquoted);
break;
case COL_CELL:
result = g_strdup (cell_pos_name (&item->ep.eval));
result = e_utf8_from_locale_string (cell_pos_name (&item->ep.eval));
break;
case COL_TYPE:
......@@ -125,24 +128,29 @@ value_at (ETableModel *etc, int col, int row, void *data)
gboolean is_value = !is_expr && !cell_is_blank (cell) && v;
if (is_expr)
return (void *)_("Expression");
return (void *)U_("Expression");
else if (is_value && v->type == VALUE_STRING)
return (void *)_("String");
return (void *)U_("String");
else if (is_value && v->type == VALUE_INTEGER)
return (void *)_("Integer");
return (void *)U_("Integer");
else if (is_value && v->type == VALUE_FLOAT)
return (void *)_("Number");
return (void *)U_("Number");
else
return (void *)_("Other value");
return (void *)U_("Other value");
} else
return (void *)_("Comment");
return (void *)U_("Comment");
case COL_CONTENTS:
if (cell) {
result = cell_get_entered_text (cell);
break;
} else
return (void *)cell_comment_text_get (item->comment);
char *s;
s = cell_get_entered_text (cell);
result = e_utf8_from_locale_string (s);
g_free (s);
} else {
result = e_utf8_from_locale_string (cell_comment_text_get (item->comment));
}
break;
default:
return NULL;
......@@ -393,6 +401,7 @@ search_clicked (GtkWidget *widget, DialogState *dd)
}
gtk_notebook_set_page (dd->notebook, dd->notebook_matches_page);
gtk_widget_grab_focus (GTK_WIDGET (dd->e_table_scrolled));
/* Save the contents of the search in the gnome-entry. */
gentry = glade_xml_get_widget (gui, "search_entry");
......
2001-12-30 Jody Goldberg <jody@gnome.org>
* fn-string.c (gnumeric_clean) : warning suppression.
(gnumeric_proper) : ditto.
(gnumeric_value) : ditto.
2001-12-24 Jody Goldberg <jody@gnome.org>
* Release 0.99.1
......
......@@ -417,12 +417,12 @@ gnumeric_clean (FunctionEvalInfo *ei, Value **argv)
Value *res;
unsigned char *s, *p, *q;
s = value_get_as_string (argv[0]);
s = (unsigned char *)value_get_as_string (argv[0]);
for (p = q = s; *p; p++)
if (isprint (*p))
*q++ = *p;
*q = 0;
res = value_new_string (s);
res = value_new_string ((char *)s);
g_free (s);
return res;
......@@ -566,7 +566,7 @@ gnumeric_proper (FunctionEvalInfo *ei, Value **argv)
unsigned char *s, *p;
gboolean inword = FALSE;
s = value_get_as_string (argv[0]);
s = (unsigned char *)value_get_as_string (argv[0]);
for (p = s; *p; p++) {
if (isalpha (*p)) {
if (inword) {
......@@ -579,7 +579,7 @@ gnumeric_proper (FunctionEvalInfo *ei, Value **argv)
inword = FALSE;
}
v = value_new_string (s);
v = value_new_string ((char *)s);
g_free (s);
return v;
}
......@@ -781,13 +781,13 @@ gnumeric_value (FunctionEvalInfo *ei, Value **argv)
default: {
Value *v;
unsigned char *p, *arg = value_get_as_string (argv[0]);
unsigned char *p, *arg = (unsigned char *)value_get_as_string (argv[0]);
/* Skip leading spaces */
for (p = arg ; *p && isspace (*p) ; ++p)
;
v = format_match_number (p, NULL, NULL);
v = format_match_number ((char *)p, NULL, NULL);
g_free (arg);
if (v != NULL)
......
......@@ -120,7 +120,7 @@ typedef enum _SpanCalcFlags {
SPANCALC_RESIZE = 0x1, /* Calculate sizes of all cells */
SPANCALC_RE_RENDER = 0x2, /* Render and Size all cells */
SPANCALC_RENDER = 0x4, /* Render and Size any unrendered cells */
SPANCALC_NO_DRAW = 0x8, /* Do not queue a redraw */
SPANCALC_NO_DRAW = 0x8 /* Do not queue a redraw */
} SpanCalcFlags;
typedef struct _SearchReplace SearchReplace;
......
......@@ -47,7 +47,7 @@ typedef enum {
PERR_UNEXPECTED_TOKEN,
PERR_OUT_OF_RANGE,
PERR_SHEET_IS_REQUIRED,
PERR_MULTIPLE_EXPRESSIONS,
PERR_MULTIPLE_EXPRESSIONS
} ParseErrorID;
/* In parser.y */
......@@ -66,7 +66,7 @@ typedef enum {
GNM_PARSER_FORCE_ABSOLUTE_COL_REFERENCES = 1 << 2,
GNM_PARSER_FORCE_ABSOLUTE_ROW_REFERENCES = 1 << 3,
GNM_PARSER_FORCE_EXPLICIT_SHEET_REFERENCES = 1 << 4,
GNM_PARSER_PERMIT_MULTIPLE_EXPRESSIONS = 1 << 5,
GNM_PARSER_PERMIT_MULTIPLE_EXPRESSIONS = 1 << 5
} GnmExprParserFlags;
#endif /* GNUMERIC_PARSE_UTIL_H */
......@@ -29,7 +29,7 @@ typedef enum _StyleVAlignFlags {
typedef enum _StyleUnderlineType {
UNDERLINE_NONE = 0,
UNDERLINE_SINGLE = 1,
UNDERLINE_DOUBLE = 2,
UNDERLINE_DOUBLE = 2
} StyleUnderlineType;
typedef enum _StyleOrientation {
......
......@@ -279,7 +279,7 @@ gnm_combo_text_new (GCompareFunc cmp_func)
return GTK_WIDGET (ct);
}
E_MAKE_TYPE(gnm_combo_text, "GnmComboText", GnmComboText, gnm_combo_text_class_init, NULL, gtk_combo_box_get_type ());
E_MAKE_TYPE(gnm_combo_text, "GnmComboText", GnmComboText, gnm_combo_text_class_init, NULL, gtk_combo_box_get_type ())
/**
* gnm_combo_text_set_text :
......
......@@ -454,7 +454,7 @@ gnumeric_expr_entry_class_init (GtkObjectClass *object_class)
E_MAKE_TYPE (gnumeric_expr_entry, "GnumericExprEntry", GnumericExprEntry,
gnumeric_expr_entry_class_init, NULL,
GTK_TYPE_ENTRY);
GTK_TYPE_ENTRY)
/**
* gnumeric_expr_entry_new:
......
......@@ -75,7 +75,7 @@ gnumeric_hscrollbar_button_press (GtkWidget *widget, GdkEventButton *event)
if (event->window == range->slider) {
gnumeric_hscrollbar_adjustment_value_changed (range->adjustment, hs);
if (event->state & GDK_SHIFT_MASK)
hs->live.now = !hs->live.def;
else
......@@ -96,7 +96,7 @@ gnumeric_hscrollbar_button_release (GtkWidget *widget, GdkEventButton *event)
gtk_signal_emit (GTK_OBJECT (hs), hscrollbar_signals[OFFSET_CHANGED],
(int) GTK_RANGE (hs)->adjustment->value, FALSE);
return parent_class->button_release_event (widget, event);
}
......@@ -124,7 +124,7 @@ gnumeric_hscrollbar_class_init (GnumericHScrollbarClass *klass)
* We override the range class's timer
*/
GTK_RANGE_CLASS (klass)->timer = gnumeric_hscrollbar_timer;
/*
* Create the signals we emit ourselves
*/
......@@ -145,7 +145,7 @@ GtkWidget *
gnumeric_hscrollbar_new (GtkAdjustment *adjustment)
{
GtkWidget *hs;
hs = gtk_widget_new (GNUMERIC_HSCROLLBAR_TYPE,
"adjustment", adjustment,
NULL);
......@@ -157,10 +157,10 @@ gnumeric_hscrollbar_new (GtkAdjustment *adjustment)
gtk_signal_connect (GTK_OBJECT (GTK_RANGE (hs)->adjustment), "value_changed",
(GtkSignalFunc) gnumeric_hscrollbar_adjustment_value_changed,
(gpointer) hs);
return hs;
}
E_MAKE_TYPE (gnumeric_hscrollbar, "GnumericHScrollbar", GnumericHScrollbar,
gnumeric_hscrollbar_class_init, gnumeric_hscrollbar_init,
GTK_TYPE_HSCROLLBAR);
GTK_TYPE_HSCROLLBAR)
......@@ -87,7 +87,7 @@ gnumeric_vscrollbar_button_press (GtkWidget *widget, GdkEventButton *event)
gnumeric_vscrollbar_timer (GTK_RANGE (widget));
} else
vs->live.now = TRUE;
return parent_class->button_press_event (widget, event);
}
......@@ -126,7 +126,7 @@ gnumeric_vscrollbar_class_init (GnumericVScrollbarClass *klass)
* We override the range class's timer
*/
GTK_RANGE_CLASS (klass)->timer = gnumeric_vscrollbar_timer;
/*
* Create the signals we emit ourselves
*/
......@@ -146,7 +146,7 @@ GtkWidget *
gnumeric_vscrollbar_new (GtkAdjustment *adjustment)
{
GtkWidget *vs;
vs = gtk_widget_new (GNUMERIC_VSCROLLBAR_TYPE,
"adjustment", adjustment,
NULL);
......@@ -158,11 +158,10 @@ gnumeric_vscrollbar_new (GtkAdjustment *adjustment)
gtk_signal_connect (GTK_OBJECT (GTK_RANGE (vs)->adjustment), "value_changed",
(GtkSignalFunc) gnumeric_vscrollbar_adjustment_value_changed,
(gpointer) vs);
return vs;
}
E_MAKE_TYPE (gnumeric_vscrollbar, "GnumericVScrollbar", GnumericVScrollbar,
gnumeric_vscrollbar_class_init, gnumeric_vscrollbar_init,
GTK_TYPE_VSCROLLBAR);
GTK_TYPE_VSCROLLBAR)
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