Commit 018f2466 authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

normalize the result range.

2002-09-19  Jody Goldberg <jody@gnome.org>

	* gnumeric-expr-entry.c (gnm_expr_entry_get_rangesel) : normalize the
	  result range.

2002-09-20  Jody Goldberg <jody@gnome.org>

	* src/print.c : revert to gnome-2-0 versions of gnome-print

	* src/application.c (gnumeric_application_setup_icons) : Add jimmac's
	  new hyperlink icons.
	* src/pixmaps/Makefile.am : ditto.

	* src/Makefile.am : remove the extra BONOBO libs that is now handled
	  correctly in configure.

	* configure.in : Prep for graphs
	    --with-graphs defaults to guppi, but can also be gtkextra-2
	    tidy up the compile/link line by being smarter, and merging in
	    the bonobo specific libs earlier
	    Enforce a gnome-2-0 limit on the printing libraries
parent 86d29a58
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/print.c : revert to gnome-2-0 versions of gnome-print
* src/application.c (gnumeric_application_setup_icons) : Add jimmac's
new hyperlink icons.
* src/pixmaps/Makefile.am : ditto.
* src/Makefile.am : remove the extra BONOBO libs that is now handled
correctly in configure.
* configure.in : Prep for graphs
--with-graphs defaults to guppi, but can also be gtkextra-2
tidy up the compile/link line by being smarter, and merging in
the bonobo specific libs earlier
Enforce a gnome-2-0 limit on the printing libraries
2002-09-19 Morten Welinder <terra@diku.dk>
* src/dependent.c (micro_hash_remove): Plug leak.
......
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/print.c : revert to gnome-2-0 versions of gnome-print
* src/application.c (gnumeric_application_setup_icons) : Add jimmac's
new hyperlink icons.
* src/pixmaps/Makefile.am : ditto.
* src/Makefile.am : remove the extra BONOBO libs that is now handled
correctly in configure.
* configure.in : Prep for graphs
--with-graphs defaults to guppi, but can also be gtkextra-2
tidy up the compile/link line by being smarter, and merging in
the bonobo specific libs earlier
Enforce a gnome-2-0 limit on the printing libraries
2002-09-19 Morten Welinder <terra@diku.dk>
* src/dependent.c (micro_hash_remove): Plug leak.
......
2002-09-20 Jody Goldberg <jody@gnome.org>
* src/print.c : revert to gnome-2-0 versions of gnome-print
* src/application.c (gnumeric_application_setup_icons) : Add jimmac's
new hyperlink icons.
* src/pixmaps/Makefile.am : ditto.
* src/Makefile.am : remove the extra BONOBO libs that is now handled
correctly in configure.
* configure.in : Prep for graphs
--with-graphs defaults to guppi, but can also be gtkextra-2
tidy up the compile/link line by being smarter, and merging in
the bonobo specific libs earlier
Enforce a gnome-2-0 limit on the printing libraries
2002-09-19 Morten Welinder <terra@diku.dk>
* src/dependent.c (micro_hash_remove): Plug leak.
......
......@@ -49,27 +49,78 @@ libgnomecanvas-2.0 >= 1.113.0
gal-2.0 >= 0.0.6
libgnome-2.0 >= 1.105.0
libgnomeui-2.0 >= 1.106.0
libgnomeprint-2.0 >= 1.120.0
libgnomeprintui-2.0 >= 1.120.0
libgnomeprint-2.0 < 1.120.0
libgnomeprint-2.0 >= 1.116.1
libgnomeprintui-2.0 < 1.120.0
libgnomeprintui-2.0 >= 1.116.1
"
try_guppi=false
guppi_msg="disabled by default"
AC_ARG_WITH(guppi,
[--{with,without}-guppi ],
if test "x$withval" = xyes; then
try_guppi=true
guppi_msg=yes
try_graphs=false
graph_msg="disabled by default"
AC_ARG_WITH(graphs,
[--{with,without}-graphs ],
if test "x$withval" = xyes -o "x$withval" = xguppi -o "x$withval" = xGuppi -o "x$withval" = xGUPPI; then
try_graphs=guppi
graph_msg=Guppi
fi
if test "x$withval" = xgtkextra -o "x$withval" = xGtkExtra -o "x$withval" = xGTKEXTRA; then
try_graphs=gtkextra
graph_msg=GtkExtra-2
fi
)
if test "$try_guppi" = "true"; then
if test "$try_graphs" = "guppi"; then
gnumeric_reqs="$gnumeric_reqs libguppi-2 >= 0.50.0"
elif test "$try_graphs" = "gtkextra"; then
gnumeric_reqs="$gnumeric_reqs gtkextra-2.0 >= 1.1.0"
fi
PKG_CHECK_MODULES(GNUMERIC, $gnumeric_reqs)
dnl **************
dnl Bonobo support
dnl **************
bonobo_msg="disabled by default"
AC_ARG_WITH(bonobo,
[--{with,without}-bonobo Use the bonobo UI routines],
if test "x$withval" = xyes; then
bonobo_msg=yes
fi
)
if test "x$bonobo_msg" = "xyes"; then
PKG_CHECK_MODULES(LIBBONOBO, [
libbonobo-2.0 >= 2.0.0
libbonoboui-2.0 >= 2.0.0
bonobo-activation-2.0 >= 1.0.2
libgsf-gnome-1 >= 1.4.0
],
[bonobo_msg="yes"],
[bonobo_msg="NO"])
fi
if test "x$bonobo_msg" = "xyes"; then
bonobo_suffix=-bonobo
gnumeric_bonobo_enabled=true
AC_DEFINE(WITH_BONOBO)
gnumeric_reqs="$gnumeric_reqs
libbonobo-2.0 >= 1.115.0
libbonoboui-2.0
bonobo-activation-2.0
libgsf-gnome-1 >= 1.3.0"
else
gnumeric_bonobo_enabled=false
fi
AM_CONDITIONAL(WITH_BONOBO, $gnumeric_bonobo_enabled)
dnl ****************************
dnl now that we have selected out libraries the whole collection in one
dnl shot so that we can have a nice neat compile/link line
dnl ****************************
PKG_CHECK_MODULES(GNUMERIC, $gnumeric_reqs)
AC_SUBST(GNUMERIC_LIBS)
AC_SUBST(GNUMERIC_CFLAGS)
dnl ****************************
dnl prep the pixmap generator
dnl ****************************
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource)
......@@ -534,38 +585,6 @@ dnl Corba support
dnl *************
AM_CONDITIONAL(WITH_CORBA, false)
dnl **************
dnl Bonobo support
dnl **************
try_bonobo=false
bonobo_msg="disabled"
AC_ARG_WITH(bonobo,
[--{with,without}-bonobo Use the bonobo UI routines],
if test "x$withval" = xyes; then
try_bonobo=true
fi
)
if test "x$try_bonobo" = "xtrue"; then
PKG_CHECK_MODULES(LIBBONOBO, [
libbonobo-2.0 >= 1.115.0
libbonoboui-2.0
bonobo-activation-2.0
libgsf-gnome-1 >= 1.3.0
],
[bonobo_msg="yes"],
[bonobo_msg="NO. xxx problem"])
fi
AC_SUBST(LIBBONOBO_LIBS)
AC_SUBST(LIBBONOBO_CFLAGS)
if test "x$bonobo_msg" = "xyes"; then
bonobo_suffix=-bonobo
AC_DEFINE(WITH_BONOBO)
gnumeric_bonobo_enabled=true
else
gnumeric_bonobo_enabled=false
fi
AM_CONDITIONAL(WITH_BONOBO, $gnumeric_bonobo_enabled)
dnl **************************************************
dnl * Config defaults (Must be after bonobo)
......@@ -778,5 +797,5 @@ Configuration:
Bonobo Support: ${bonobo_msg}
GDA support: ${gda_msg}
Evolution Support: ${evolution}
Guppi Support: ${guppi_msg}
Graph Support: ${graph_msg}
"
......@@ -291,7 +291,6 @@ gnumeric_SOURCES = \
gnumeric_LDADD = \
$(gnumeric_app_libs) \
$(GNUMERIC_LIBS) \
$(LIBBONOBO_LIBS) \
$(INTLLIBS)
else
gnumeric_SOURCES = \
......
......@@ -595,6 +595,12 @@ gnumeric_application_setup_icons (void)
{ gnm_padlock, NULL, "Gnumeric_Padlock" },
{ gnm_padlock_no, NULL, "Gnumeric_PadlockNo" },
{ gnm_link_add_24, gnm_link_add_16, "Gnumeric_Link_Add" },
{ NULL, gnm_link_delete_16, "Gnumeric_Link_Delete" },
{ NULL, gnm_link_edit_16, "Gnumeric_Link_Edit" },
{ gnm_link_external_24, NULL, "Gnumeric_Link_External" },
{ gnm_link_internal_24, NULL, "Gnumeric_Link_Internal" },
};
unsigned i = 0;
GtkIconFactory *factory = gtk_icon_factory_new ();
......
......@@ -372,7 +372,7 @@ micro_hash_insert (MicroHash *hash_table, gpointer key)
static void
micro_hash_remove (MicroHash *hash_table, gpointer key)
{
GSList **head;
GSList **head, *old;
int const hash_size = hash_table->num_buckets;
if (hash_size > 1) {
......@@ -383,9 +383,9 @@ micro_hash_remove (MicroHash *hash_table, gpointer key)
for (; *head != NULL ; head = &((*head)->next))
if ((*head)->data == key) {
GSList *next = (*head)->next;
g_slist_free_1 (*head);
*head = next;
old = *head;
*head = old->next;
g_slist_free_1 (old);
hash_table->num_elements--;
MICRO_HASH_RESIZE (hash_table);
return;
......
......@@ -39,7 +39,6 @@
#include <libgnomeprint/gnome-print-master.h>
#include <libgnomeprint/gnome-print-unit.h>
#include <libgnomeprintui/gnome-print-paper-selector.h>
#include <libgnomeprintui/gnome-print-unit-selector.h>
#include <libgnomecanvas/gnome-canvas-util.h>
#include <libgnomecanvas/gnome-canvas-line.h>
......
......@@ -71,6 +71,12 @@ IMAGES = @STRIP_BEGIN@ \
padlock.xpm \
padlock_no.xpm \
\
link_add_16.png link_add_24.png \
link_delete_16.png \
link_edit_16.png \
link_external_24.png \
link_internal_24.png \
\
@STRIP_END@
VARIABLES = @STRIP_BEGIN@ \
......@@ -144,10 +150,10 @@ VARIABLES = @STRIP_BEGIN@ \
\
gnm_object_button_24 $(srcdir)/button.xpm \
gnm_object_checkbox_24 $(srcdir)/object_checkbox_24.png \
gnm_object_combo_24 $(srcdir)/object_combo_24.png \
gnm_object_combo_24 $(srcdir)/object_combo_24.png \
gnm_object_frame_24 $(srcdir)/object_frame_24.png \
gnm_object_label_24 $(srcdir)/object_label_24.png \
gnm_object_list_24 $(srcdir)/object_list_24.png \
gnm_object_list_24 $(srcdir)/object_list_24.png \
gnm_object_radiobutton_24 $(srcdir)/radiobutton.xpm \
gnm_object_scrollbar_24 $(srcdir)/object_scrollbar_24.png \
\
......@@ -166,6 +172,13 @@ VARIABLES = @STRIP_BEGIN@ \
\
gnm_padlock $(srcdir)/padlock.xpm \
gnm_padlock_no $(srcdir)/padlock_no.xpm \
\
gnm_link_add_16 $(srcdir)/link_add_16.png \
gnm_link_add_24 $(srcdir)/link_add_24.png \
gnm_link_delete_16 $(srcdir)/link_delete_16.png \
gnm_link_edit_16 $(srcdir)/link_edit_16.png \
gnm_link_external_24 $(srcdir)/link_external_24.png \
gnm_link_internal_24 $(srcdir)/link_internal_24.png \
@STRIP_END@
pixbuf_file = $(top_builddir)/src/pixmaps/gnumeric-stock-pixbufs.h
......
......@@ -1130,7 +1130,7 @@ sheet_print (WorkbookControlGUI *wbcg, Sheet *sheet,
gnome_print_dialog_construct_range_page (
GNOME_PRINT_DIALOG (gnome_print_dialog),
GNOME_PRINT_RANGE_CURRENT | GNOME_PRINT_RANGE_ALL |
GNOME_PRINT_RANGE_SELECTOR | GNOME_PRINT_RANGE_RANGE,
GNOME_PRINT_RANGE_SELECTION | GNOME_PRINT_RANGE_RANGE,
first, end, _("Act_ive sheet"), _("S_heets"));
toplevel = wbcg_toplevel (wbcg);
......@@ -1161,7 +1161,7 @@ sheet_print (WorkbookControlGUI *wbcg, Sheet *sheet,
case GNOME_PRINT_RANGE_ALL:
default_range = PRINT_ALL_SHEETS;
break;
case GNOME_PRINT_RANGE_SELECTOR:
case GNOME_PRINT_RANGE_SELECTION:
default_range = PRINT_SHEET_SELECTION;
break;
case GNOME_PRINT_RANGE_RANGE:
......
2002-09-19 Jody Goldberg <jody@gnome.org>
* gnumeric-expr-entry.c (gnm_expr_entry_get_rangesel) : normalize the
result range.
2002-09-13 Jody Goldberg <jody@gnome.org>
* gnumeric-expr-entry.c (gnm_expr_entry_rangesel_start) : accept
......
......@@ -286,7 +286,7 @@ gee_prepare_range (GnumericExprEntry const *gee, RangeRef *dst)
if (gee->flags & GNUM_EE_FULL_ROW) {
dst->a.col = 0;
dst->b.col = SHEET_MAX_COLS - 1;
dst->b.col = SHEET_MAX_COLS - 1;
}
if (gee->flags & GNUM_EE_FULL_COL) {
dst->a.row = 0;
......@@ -842,8 +842,8 @@ gnm_expr_entry_thaw (GnumericExprEntry *gee)
**/
void
gnm_expr_entry_set_flags (GnumericExprEntry *gee,
GnumericExprEntryFlags flags,
GnumericExprEntryFlags mask)
GnumericExprEntryFlags flags,
GnumericExprEntryFlags mask)
{
Rangesel *rs;
......@@ -1023,6 +1023,7 @@ gnm_expr_entry_load_from_range (GnumericExprEntry *gee,
* Get the range selection. Range is copied, Sheet is not. If sheet
* argument is NULL, the corresponding value is not returned.
* Returns TRUE if the returned range is indeed valid.
* The resulting range is normalized.
**/
gboolean
gnm_expr_entry_get_rangesel (GnumericExprEntry *gee,
......@@ -1035,10 +1036,24 @@ gnm_expr_entry_get_rangesel (GnumericExprEntry *gee,
gee_prepare_range (gee, &ref);
if (r != NULL) {
r->start.col = rs->ref.a.col;
r->end.col = rs->ref.b.col;
r->start.row = rs->ref.a.row;
r->end.row = rs->ref.b.row;
/* normalize but don't bother with rel vs absolute conversions
* we always work realtive to A1 internally so there is no
* difference
*/
if (rs->ref.a.col < rs->ref.b.col) {
r->start.col = rs->ref.a.col;
r->end.col = rs->ref.b.col;
} else {
r->start.col = rs->ref.b.col;
r->end.col = rs->ref.a.col;
}
if (rs->ref.a.row < rs->ref.b.row) {
r->start.row = rs->ref.a.row;
r->end.row = rs->ref.b.row;
} else {
r->start.row = rs->ref.b.row;
r->end.row = rs->ref.a.row;
}
}
/* TODO : does not handle 3d, neither does this interface */
......
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