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

add G_BEGIN_DECL/G_END_DECL around the header content.

        reformat the guard decls
        Add a vim/emacs fmt line
        fix namespacing of preproc flags from configure.in that go into public headers

        2007-10-12  Jody Goldberg <jody@gnome.org>

        	* libspreadsheet-1.7.pc.in : Set the cflags to include the target, and
        	  subdir until we fix the header includes and rename /src.
        	  Add LIBDIR/include to cflags
        	  Add PluginDir.

svn path=/trunk/; revision=16149
parent b376c019
......@@ -416,6 +416,13 @@
* src/sheet-object-image.c (so_image_view_set_bounds): Use
go_pixbuf_tile.
2007-10-12 Jody Goldberg <jody@gnome.org>
* libspreadsheet-1.7.pc.in : Set the cflags to include the target, and
subdir until we fix the header includes and rename /src.
Add LIBDIR/include to cflags
Add PluginDir.
2007-09-29 Emmanuel Pacaud <emmanuel.pacaud@lapp.in2p3.fr>
* samples/chart-stripe-tests.gnumeric: add reference images.
......
......@@ -7,31 +7,6 @@ change_logs = ChangeLog \
OChangeLog-2000-02-23 OChangeLog-2000-10-10 \
OChangeLog-2001-06-26
# gnewdir = $(datadir)/mc/templates
# gnew_in_files = gnumeric.desktop.in
# gnew_DATA = gnumeric.desktop
# Mimedir = $(datadir)/mime-info
# Mime_DATA = gnumeric.keys gnumeric.mime
# Old stale functionality
#
#if WITH_GNOME
#serverdir = $(libdir)/bonobo/servers/
#server_in_files = GNOME_Gnumeric.server.in
#server_DATA = GNOME_Gnumeric.server
#GNOME_Gnumeric.server.in : GNOME_Gnumeric.server.in.in Makefile
# sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
#
# @INTLTOOL_SERVER_RULE@
#endif
# Unused as far as I know
#gnumeric.keys: gnumeric.keys.in Makefile
# sed -e 's^\@gnumeric_icondir\@^$(gnumeric_icondir)^g' < $(srcdir)/gnumeric.keys.in > gnumeric.keys.tmp \
# && mv gnumeric.keys.tmp gnumeric.keys
#
CLEANFILES = gnumeric.desktop gnumeric.keys
DISTCLEANFILES = intltool-extract intltool-merge intltool-update
......@@ -67,6 +42,15 @@ endif
sed -e 's/BUGZILLAVERSION/@VERSION@/' <$@.tmp2 >$@
rm -f $@.tmp $@.tmp2
configexecincludedir = $(gnumeric_libdir)/include
install-exec-local: gnumeric-features.h
$(mkinstalldirs) $(DESTDIR)$(configexecincludedir)
file=$(DESTDIR)$(configexecincludedir)/$< ; \
if test -r $$file && cmp -s $< $$file; then :; \
else $(INSTALL_DATA) $< $$file; fi
uninstall-local:
rm -f $(DESTDIR)$(configexecincludedir)/gnumeric-features.h
dist-hook:
mkdir $(distdir)/samples
cp $(srcdir)/samples/*gnumeric $(distdir)/samples
......
......@@ -7,20 +7,30 @@ m4_define([gnumeric_version_epoch], [1])
m4_define([gnumeric_version_major], [7])
m4_define([gnumeric_version_minor], [15])
m4_define([gnumeric_version_extra], [])
m4_define([gnumeric_full_version],
m4_define([gnumeric_version_full],
[gnumeric_version_epoch.gnumeric_version_major.gnumeric_version_minor[]gnumeric_version_extra])
dnl Emphasize some of the checks.
m4_define([BIG_CHECKING], [AC_MSG_CHECKING([
======== $1])])
AC_INIT([gnumeric], [gnumeric_full_version],
AC_INIT([gnumeric], [gnumeric_version_full],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnumeric])
AC_CONFIG_SRCDIR(src/sheet.h)
AM_INIT_AUTOMAKE([dist-bzip2])
dnl This one is created by autoheader, ...
AC_CONFIG_HEADERS(gnumeric-config.h)
dnl ... and this one is a small subset, maintained manually,
dnl which will be installed.
AC_CONFIG_HEADERS(gnumeric-features.h)
dnl
dnl Make sure these two won't clash. Put the following to gnumeric-config.h:
AH_BOTTOM([/* Don't include gnumeric-features.h, it's a subset of gnumeric-config.h. */
#define GNUMERIC_FEATURES_H])
AM_MAINTAINER_MODE
# Make --disable-static the default
......@@ -190,7 +200,7 @@ fi
gnumeric_with_gnome=$gnumeric_with_gtk
if test "x$gnumeric_with_gtk" = "xtrue" ; then
AC_DEFINE(WITH_GTK, 1, [Define if UI is built])
AC_DEFINE(GNM_WITH_GTK, 1, [Define if UI is built])
libspreadsheet_reqs="$libspreadsheet_reqs $libspreadsheet_gtk_reqs"
gnumeric_reqs="$gnumeric_reqs $gnumeric_gtk_reqs"
......@@ -216,7 +226,7 @@ if test "x$gnumeric_with_gtk" = "xtrue" ; then
fi
if test "x$gnumeric_with_gnome" = "xtrue"; then
AC_DEFINE(WITH_GNOME, 1, [Define if GNOME extensions are available])
AC_DEFINE(GNM_WITH_GNOME, 1, [Define if GNOME extensions are available])
libspreadsheet_reqs="$libspreadsheet_reqs $libspreadsheet_gnome_reqs"
gnumeric_reqs="$gnumeric_reqs $gnumeric_gnome_reqs"
fi
......@@ -285,11 +295,10 @@ if test "x$enable_hildon" = "xyes" ; then
fi
if test "x$HAVE_HILDON" = "xyes" ; then
AC_DEFINE(USE_HILDON, 1, [Build with Maemo/Hildon support])
AC_DEFINE(GNM_USE_HILDON, 1, [Build with Maemo/Hildon support])
fi
AM_CONDITIONAL(USE_HILDON, test "x$HAVE_HILDON" = "xyes")
AC_SUBST(HILDON_CFLAGS)
AC_SUBST(HILDON_LIBS)
......@@ -580,7 +589,7 @@ if test "x$enable_solver" = xno; then
enable_solver=false
else
enable_solver=true
AC_DEFINE(ENABLE_SOLVER, 1, [Define if SOLVER is compiled])
AC_DEFINE(GNM_ENABLE_SOLVER, 1, [Define if SOLVER is compiled])
fi
AM_CONDITIONAL(ENABLE_SOLVER, $enable_solver)
......@@ -765,7 +774,7 @@ AC_ARG_WITH(long_double,
float_msg="long double (EXPERIMENTAL)"
AC_MSG_WARN([Long double support is experimental -- expect problems])
AC_DEFINE(WITH_LONG_DOUBLE, 1,
AC_DEFINE(GNM_WITH_LONG_DOUBLE, 1,
[Define if the long double type is to be used]
)
fi]
......@@ -1013,8 +1022,8 @@ dnl
AC_SUBST(gnumeric_plugindir, '${gnumeric_libdir}/plugins')
dnl Export to gnumeric-config.h
AC_DEFINE(GNUMERIC_VERSION, "gnumeric_full_version",
[The version number of this release, possibly suffixed for bonobo])
AC_DEFINE(GNM_VERSION_FULL, "gnumeric_version_full",
[The version number of this release, with optional extra suffix])
AC_DEFINE(GNM_VERSION_EPOCH, gnumeric_version_epoch,
[The Epoch of this release])
AC_DEFINE(GNM_VERSION_MAJOR, gnumeric_version_major,
......
......@@ -8,8 +8,12 @@ gnumeric_libdir=@gnumeric_libdir@
Name: libspreadsheet
Description: The spreadsheet internals of Gnumeric (DEVELOPMENT VERSION)
Version: @VERSION@
URL: http://www.gnumeric.org
Requires: glib-2.0 gobject-2.0 libgsf-1 libxml-2.0 gtk+-2.0 libglade-2.0 @LIBGOFFICE@
Requires.private: libart-2.0
Libs: -L${libdir} -lgoffice-0
Cflags: -I${includedir}/libspreadsheet-1-7/ssheet
GOffice_plugins_dir=@gnumeric_plugindir@
# for now include both the directory and the child, until we rename the includes in svn
Cflags: -I${includedir}/libspreadsheet-1-7/spreadsheet -I${includedir}/libspreadsheet-1-7 -I${gnumeric_libdir}/include
PluginDir: @gnumeric_plugindir@
......@@ -1120,7 +1120,8 @@ ms_biff_bof_data_new (BiffQuery *q)
ans->version = MS_BIFF_V7;
break;
default:
fprintf (stderr,"Unknown BIFF sub-number in BOF %x\n", q->opcode);
fprintf (stderr, "Unknown BIFF sub-number 0x%X in BOF %x\n",
GSF_LE_GET_GUINT16 (q->non_decrypted_data), q->opcode);
ans->version = MS_BIFF_V_UNKNOWN;
}
break;
......
......@@ -1339,7 +1339,7 @@ gnumeric_info (GnmFuncEvalInfo *ei, GnmValue const * const *argv)
workbook_get_recalcmode (wb) ? _("Automatic") : _("Manual"));
} else if (!g_ascii_strcasecmp (info_type, "release")) {
/* Version of Gnumeric (Well, Microsoft Excel), as text. */
return value_new_string (GNUMERIC_VERSION);
return value_new_string (GNM_VERSION_FULL);
#ifdef HAVE_UNAME
} else if (!g_ascii_strcasecmp (info_type, "system")) {
/* Name of the operating environment. */
......
......@@ -7,6 +7,11 @@
* html_read.c (html_read_row): Really use the first url when
multiple urls in cell, not the last.
2007-10-15 Jody Goldberg <jody@gnome.org>
Patch from editgrid.
* latex.c (latex2e_find_vline) : Don't look for borders past max col.
2007-10-21 Morten Welinder <terra@gnome.org>
* Release 1.7.13
......
......@@ -669,13 +669,15 @@ latex2e_find_vline (int col, int row, Sheet *sheet, GnmStyleElement which_border
return border->line_type;
if (which_border == MSTYLE_BORDER_LEFT) {
if (col < 1)
if (col <= 0)
return GNM_STYLE_BORDER_NONE;
style = sheet_style_get (sheet, col - 1, row);
border = gnm_style_get_border (style, MSTYLE_BORDER_RIGHT);
return ((gnm_style_border_is_blank (border)) ? GNM_STYLE_BORDER_NONE :
border->line_type);
} else {
if ((col+1) >= colrow_max (TRUE))
return GNM_STYLE_BORDER_NONE;
style = sheet_style_get (sheet, col + 1, row);
border = gnm_style_get_border (style, MSTYLE_BORDER_LEFT);
return ((gnm_style_border_is_blank (border)) ? GNM_STYLE_BORDER_NONE :
......
......@@ -160,9 +160,9 @@ libspreadsheet_la_SOURCES = \
print-cell.c
# When we switch to subversion fix this to nest as
# libspreadsheet-ver/ssheet/header
# libspreadsheet-ver/spreadsheet/header
# doing it now would require massive cvs surgery.
libspreadsheet_includedir = $(includedir)/libspreadsheet-1-7/ssheet
libspreadsheet_includedir = $(includedir)/libspreadsheet-1-7/spreadsheet
libspreadsheet_include_HEADERS = \
application.h \
auto-format.h \
......
#ifndef GNUMERIC_APPLICATION_H
#define GNUMERIC_APPLICATION_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_APPLICATION_H_
# define _GNM_APPLICATION_H_
#include "gnumeric.h"
#include <glib-object.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
G_BEGIN_DECLS
#define GNM_APP_TYPE (gnm_app_get_type ())
typedef gboolean (*GnmWbIterFunc) (Workbook *, gpointer data);
......@@ -98,4 +101,6 @@ void gnm_app_foreach_extra_ui (GFunc func, gpointer data);
/* internal implementation util */
void _gnm_app_flag_windows_changed (void);
#endif /* GNUMERIC_APPLICATION_H */
G_END_DECLS
#endif /* _GNM_APPLICATION_H_ */
#ifndef GNUMERIC_AUTO_FORMAT_H
#define GNUMERIC_AUTO_FORMAT_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_AUTO_FORMAT_H_
# define _GNM_AUTO_FORMAT_H_
#include "gnumeric.h"
G_BEGIN_DECLS
GOFormat *auto_style_format_suggest (GnmExprTop const *texpr,
GnmEvalPos const *epos);
#endif
G_END_DECLS
#endif /* _GNM_AUTO_FORMAT_H_ */
#ifndef GNUMERIC_CELL_DRAW_H
#define GNUMERIC_CELL_DRAW_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_CELL_DRAW_H_
# define _GNM_CELL_DRAW_H_
#include "gnumeric.h"
#include <gdk/gdktypes.h>
G_BEGIN_DECLS
gboolean cell_calc_layout (GnmCell const *cell, GnmRenderedValue *rv, int y_direction,
int width, int height, int h_center,
GOColor *res_color, gint *res_x, gint *res_y);
......@@ -15,4 +18,6 @@ void cell_finish_layout (GnmCell *cell, GnmRenderedValue *rv,
void cell_draw (GnmCell const *cell, GdkGC *gc, GdkDrawable *drawable,
int x, int y, int height, int width, int h_center);
#endif /* GNUMERIC_CELL_DRAW_H */
G_END_DECLS
#endif /* _GNM_CELL_DRAW_H_ */
#ifndef GNM_CELL_H
#define GNM_CELL_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_CELL_H_
# define _GNM_CELL_H_
#include "gnumeric.h"
#include "dependent.h"
G_BEGIN_DECLS
typedef enum {
/* MUST BE > 0xFFF,FFFF to avoid conflict with GnmDependent */
/* GnmCell is linked into the sheet */
......@@ -65,7 +68,7 @@ void gnm_cell_set_expr_and_value(GnmCell *c,
GnmExprTop const *texpr, GnmValue *v,
gboolean link_expr);
void gnm_cell_set_expr (GnmCell *c, GnmExprTop const *texpr);
void gnm_cell_set_expr_unsafe (GnmCell *cell, GnmExprTop const *texpr);
void gnm_cell_set_expr_unsafe (GnmCell *cell, GnmExprTop const *texpr);
void gnm_cell_set_array_formula (Sheet *sheet,
int cola, int rowa, int colb, int rowb,
GnmExprTop const *texpr);
......@@ -87,4 +90,6 @@ GOColor gnm_cell_get_render_color (GnmCell const * cell);
char * gnm_cell_get_entered_text (GnmCell const * cell);
char * gnm_cell_get_rendered_text (GnmCell *cell);
#endif /* GNM_CELL_H */
G_END_DECLS
#endif /* _GNM_CELL_H_ */
#ifndef GNUMERIC_CELLSPAN_H
#define GNUMERIC_CELLSPAN_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_CELLSPAN_H_
# define _GNM_CELLSPAN_H_
#include "gnumeric.h"
G_BEGIN_DECLS
typedef struct {
GnmCell const *cell;
int left, right;
......@@ -18,4 +21,6 @@ CellSpanInfo const *row_span_get (ColRowInfo const *ri, int col);
void row_destroy_span (ColRowInfo *ri);
void row_calc_spans (ColRowInfo *ri, int row, Sheet const *sheet);
#endif /* GNUMERIC_CELLSPAN_H */
G_END_DECLS
#endif /* _GNM_CELLSPAN_H_ */
#ifndef GNUMERIC_CLIPBOARD_H
#define GNUMERIC_CLIPBOARD_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_CLIPBOARD_H_
# define _GNM_CLIPBOARD_H_
#include "gnumeric.h"
#include <goffice/utils/go-undo.h>
G_BEGIN_DECLS
enum {
PASTE_CONTENTS = 1 << 0, /* either CONTENTS or AS_VALUES */
PASTE_AS_VALUES = 1 << 1, /* can be applied, not both */
......@@ -97,4 +100,6 @@ void clipboard_init (void);
void clipboard_shutdown (void);
#endif /* GNUMERIC_CLIPBOARD_H */
G_END_DECLS
#endif /* _GNM_CLIPBOARD_H_ */
#ifndef GNUMERIC_CMD_EDIT_H
#define GNUMERIC_CMD_EDIT_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_CMD_EDIT_H_
# define _GNM_CMD_EDIT_H_
#include "gnumeric.h"
G_BEGIN_DECLS
/* TODO : move these to selection */
void sv_select_cur_row (SheetView *sv);
void sv_select_cur_col (SheetView *sv);
......@@ -20,4 +23,6 @@ void cmd_shift_rows (WorkbookControl *wbc, Sheet *sheet,
int col,
int start_row, int end_row, int count);
#endif /* GNUMERIC_CMD_EDIT_H */
G_END_DECLS
#endif /* _GNM_CMD_EDIT_H_ */
#ifndef GNUMERIC_COLLECT_H
#define GNUMERIC_COLLECT_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COLLECT_H_
# define _GNM_COLLECT_H_
#include "numbers.h"
#include "gnumeric.h"
G_BEGIN_DECLS
typedef enum {
COLLECT_IGNORE_STRINGS = 0x01,
COLLECT_ZERO_STRINGS = 0x02,
......@@ -59,4 +62,6 @@ GSList *gnm_slist_sort_merge (GSList * list_1, GSList * list_2);
GArray *gnm_strip_missing (GArray * data, GSList **missing);
#endif
G_END_DECLS
#endif /* _GNM_COLLECT_H_ */
#ifndef GNM_COLROW_H
#define GNM_COLROW_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COLROW_H_
# define _GNM_COLROW_H_
#include "gnumeric.h"
G_BEGIN_DECLS
struct _ColRowInfo {
/* Size including margins, and right grid line */
float size_pts;
......@@ -145,4 +148,6 @@ void colrow_autofit (Sheet *sheet,
ColRowIndexList **indices,
ColRowStateList **sizes);
#endif /* GNM_COLROW_H */
G_END_DECLS
#endif /* _GNM_COLROW_H_ */
#ifndef GNUMERIC_COMMAND_CONTEXT_STDERR_H
#define GNUMERIC_COMMAND_CONTEXT_STDERR_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COMMAND_CONTEXT_STDERR_H_
# define _GNM_COMMAND_CONTEXT_STDERR_H_
#include "gnumeric.h"
#include <glib-object.h>
G_BEGIN_DECLS
#define CMD_CONTEXT_STDERR_TYPE (cmd_context_stderr_get_type ())
#define COMMAND_CONTEXT_STDERR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CMD_CONTEXT_STDERR_TYPE, CmdContextStderr))
#define IS_COMMAND_CONTEXT_STDERR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), CMD_CONTEXT_STDERR_TYPE))
......@@ -15,4 +18,6 @@ GOCmdContext *cmd_context_stderr_new (void);
void cmd_context_stderr_set_status (CmdContextStderr *ccs, int status);
int cmd_context_stderr_get_status (CmdContextStderr *ccs);
#endif /* GNUMERIC_COMMAND_CONTEXT_STDERR_H */
G_END_DECLS
#endif /* _GNM_COMMAND_CONTEXT_STDERR_H_ */
#ifndef GNM_CMD_CONTEXT_H
#define GNM_CMD_CONTEXT_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COMMAND_CONTEXT_H_
# define _GNM_COMMAND_CONTEXT_H_
#include "gnumeric.h"
#include <goffice/app/go-cmd-context.h>
G_BEGIN_DECLS
/* some gnumeric specific utility routines */
void gnm_cmd_context_error_calc (GOCmdContext *cc, char const *msg);
void gnm_cmd_context_error_splits_array (GOCmdContext *cc, char const *cmd,
......@@ -12,4 +15,6 @@ void gnm_cmd_context_error_splits_array (GOCmdContext *cc, char const *cmd,
GQuark gnm_error_array (void);
GQuark gnm_error_calc (void);
#endif /* GNM_CMD_CONTEXT_H */
G_END_DECLS
#endif /* _GNM_COMMAND_CONTEXT_H_ */
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef GNUMERIC_COMMANDS_H
#define GNUMERIC_COMMANDS_H
#ifndef _GNM_COMMANDS_H_
# define _GNM_COMMANDS_H_
#include "gnumeric.h"
#include "tools/tools.h"
G_BEGIN_DECLS
void command_undo (WorkbookControl *wbc);
void command_redo (WorkbookControl *wbc);
void command_repeat (WorkbookControl *wbc);
......@@ -158,4 +160,6 @@ gboolean cmd_so_set_value (WorkbookControl *wbc,
const GnmCellRef *pref,
GnmValue *new_val);
#endif /* GNUMERIC_COMMANDS_H */
G_END_DECLS
#endif /* _GNM_COMMANDS_H_ */
#ifndef GNUMERIC_COMPLETE_SHEET_H
#define GNUMERIC_COMPLETE_SHEET_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COMPLETE_SHEET_H_
# define _GNM_COMPLETE_SHEET_H_
#include "gnumeric.h"
#include "complete.h"
G_BEGIN_DECLS
#define COMPLETE_SHEET_TYPE (complete_sheet_get_type ())
#define COMPLETE_SHEET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), COMPLETE_SHEET_TYPE, CompleteSheet))
#define COMPLETE_SHEET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), COMPLETE_SHEET_TYPE, CompleteSheetClass))
......@@ -33,4 +36,6 @@ Complete *complete_sheet_new (Sheet *sheet, int col, int row,
CompleteMatchNotifyFn notify,
void *notify_closure);
#endif /* GNUMERIC_COMPLETE_H */
G_END_DECLS
#endif /* _GNM_COMPLETE_SHEET_H_ */
#ifndef GNUMERIC_COMPLETE_H
#define GNUMERIC_COMPLETE_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COMPLETE_H_
# define _GNM_COMPLETE_H_
#include <glib-object.h>
G_BEGIN_DECLS
#define COMPLETE_TYPE (complete_get_type ())
#define COMPLETE(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), COMPLETE_TYPE, Complete))
#define COMPLETE_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), COMPLETE_TYPE, CompleteClass))
......@@ -35,4 +38,6 @@ void complete_construct (Complete *complete,
void complete_start (Complete *complete, char const *text);
GType complete_get_type (void);
#endif /* GNUMERIC_COMPLETE_H */
G_END_DECLS
#endif /* _GNM_COMPLETE_H_ */
#ifndef GNUMERIC_COMPLEX_H
#define GNUMERIC_COMPLEX_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_COMPLEX_H_
# define _GNM_COMPLEX_H_
#include "numbers.h"
#include <math.h>
G_BEGIN_DECLS
typedef struct {
gnm_float re, im;
} complex_t;
......@@ -200,4 +203,6 @@ GNUMERIC_COMPLEX_PROTO (void complex_tan (complex_t *dst, complex_t const *src))
#undef GNUMERIC_COMPLEX_PROTO
#undef GNUMERIC_COMPLEX_BODY
#endif
G_END_DECLS
#endif /* _GNM_COMPLEX_H_ */
#ifndef GNUMERIC_CONSOLIDATE_H
#define GNUMERIC_CONSOLIDATE_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_CONSOLIDATE_H_
# define _GNM_CONSOLIDATE_H_
#include "gnumeric.h"
#include <tools/dao.h>
#include <tools/tools.h>
G_BEGIN_DECLS
typedef enum {
/*
* These can be both set, both unset or
......@@ -50,4 +53,6 @@ gboolean consolidate_check_destination (GnmConsolidate *cs,
gboolean tool_consolidate_engine (data_analysis_output_t *dao, gpointer specs,
analysis_tool_engine_t selector, gpointer result);
#endif
G_END_DECLS
#endif /* _GNM_CONSOLIDATE_H_ */
#ifndef GNUMERIC_DEPENDENT_H
#define GNUMERIC_DEPENDENT_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_DEPENDENT_H_
# define _GNM_DEPENDENT_H_
#include "gnumeric.h"
#include <goffice/utils/goffice-utils.h>
#include <goffice/utils/go-undo.h>
G_BEGIN_DECLS
struct _GnmDependent {
guint flags;
Sheet *sheet;
......@@ -134,4 +137,6 @@ t ## _get_dep_type (void) \
void dependent_debug_name (GnmDependent const *dep, GString *target);
#endif /* GNUMERIC_DEPENDENT_H */
G_END_DECLS
#endif /* _GNM_DEPENDENT_H_ */
......@@ -374,7 +374,7 @@ dialog_about (WBCGtk *wbcg)
GOG_POSITION_COMPASS | GOG_POSITION_ALIGNMENT);
gog_dataset_set_dim (GOG_DATASET (tmp), 0,
go_data_scalar_str_new (
"Gnumeric " GNUMERIC_VERSION "\n"
"Gnumeric " GNM_VERSION_FULL "\n"
"Copyright \xc2\xa9 2001-2007 Jody Goldberg\n"
"Copyright \xc2\xa9 1998-2000 Miguel de Icaza", FALSE),
NULL);
......
#ifndef GNUMERIC_EXPR_IMPL_H
#define GNUMERIC_EXPR_IMPL_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_EXPR_IMPL_H_
# define _GNM_EXPR_IMPL_H_
#include "gnumeric.h"
#include "numbers.h"
#include "parse-util.h"
G_BEGIN_DECLS
struct _GnmExprConstant {
guint8 oper;
......@@ -89,4 +91,6 @@ struct _GnmExprSharer {
};
#endif /* GNUMERIC_EXPR_IMPL_H */
G_END_DECLS
#endif /* _GNM_EXPR_IMPL_H_ */
#ifndef GNUMERIC_EXPR_NAME_H
#define GNUMERIC_EXPR_NAME_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_EXPR_NAME_H_
# define _GNM_EXPR_NAME_H_
#include "gnumeric.h"
#include "expr.h"
......@@ -7,6 +8,8 @@
#include "parse-util.h"
#include <goffice/utils/go-undo.h>
G_BEGIN_DECLS
struct _GnmNamedExpr {
int ref_count;
GnmString *name;
......@@ -73,4 +76,6 @@ void gnm_named_expr_collection_relink (GnmNamedExprCollection *names);
GnmNamedExpr *gnm_named_expr_collection_lookup (GnmNamedExprCollection const *scope,
char const *name);
#endif /* GNUMERIC_EXPR_NAME_H */
G_END_DECLS
#endif /* _GNM_EXPR_NAME_H_ */
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef GNM_EXPR_H
#define GNM_EXPR_H
#ifndef _GNM_EXPR_H_
# define _GNM_EXPR_H_
G_BEGIN_DECLS
#include "gnumeric.h"
#include "position.h"
......@@ -169,4 +171,6 @@ GnmExprTop const *gnm_expr_sharer_share (GnmExprSharer *es, GnmExprTop const *te
void expr_init (void);
void expr_shutdown (void);
#endif /* GNM_EXPR_H */
G_END_DECLS
#endif /* _GNM_EXPR_H_ */
#ifndef GNUMERIC_FILE_AUTOFT_H
#define GNUMERIC_FILE_AUTOFT_H
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
#ifndef _GNM_FILE_AUTOFT_H_
# define _GNM_FILE_AUTOFT_H_
#include "gnumeric.h"
#include "format-template.h"
G_BEGIN_DECLS
GSList *category_group_get_templates_list (FormatTemplateCategoryGroup *category_group,
GOCmdContext *context);
GList *category_group_list_get (void);
void category_group_list_free (GList *category_groups);
#endif /* GNUMERIC_FILE_AUTOFT_H */
G_END_DECLS