[goffice] Prepare graph for stable version.
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Prepare graph for stable version.
- Date: Fri, 13 Jul 2012 07:58:22 +0000 (UTC)
commit 171d7c8884b27457eeeeb7c6964c158f86e4c505
Author: Jean Brefort <jean brefort normalesup org>
Date: Fri Jul 13 09:50:32 2012 +0200
Prepare graph for stable version.
ChangeLog | 10 ++++++++++
goffice/graph/Makefile.am | 4 +++-
goffice/graph/goffice-graph.h | 1 -
goffice/graph/gog-axis-line.c | 1 +
goffice/graph/gog-axis.c | 1 +
goffice/graph/gog-graph.c | 4 ++--
goffice/graph/gog-object.h | 8 +++++++-
goffice/graph/gog-view.h | 3 +++
8 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2398444..d9cd21a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-07-13 Jean Brefort <jean brefort normalesup org>
+
+ * goffice/graph/Makefile.am: don't install gog-axis-line-impl.h.
+ * goffice/graph/goffice-graph.h: ditto.
+ * goffice/graph/gog-axis-line.c: ditto.
+ * goffice/graph/gog-axis.c: ditto.
+ * goffice/graph/gog-graph.c: fixed documentation typo.
+ * goffice/graph/gog-object.h: add fields for future use.
+ * goffice/graph/gog-view.h: ditto.
+
2012-07-10 Jean Brefort <jean brefort normalesup org>
* goffice/graph/gog-label.c (gog_text_view_size_request),
diff --git a/goffice/graph/Makefile.am b/goffice/graph/Makefile.am
index 2b25339..bce49b6 100644
--- a/goffice/graph/Makefile.am
+++ b/goffice/graph/Makefile.am
@@ -55,7 +55,6 @@ libgoffice_graph_la_HEADERS = \
gog-3d-box.h \
gog-axis.h \
gog-axis-line.h \
- gog-axis-line-impl.h \
gog-legend.h \
gog-label.h \
gog-grid.h \
@@ -75,6 +74,9 @@ libgoffice_graph_la_HEADERS = \
gog-data-set.h \
gog-renderer.h
+noinst_HEADERS = \
+ gog-axis-line-impl.h
+
if WITH_GTK
libgoffice_graph_la_SOURCES += gog-guru.c \
gog-data-allocator.c \
diff --git a/goffice/graph/goffice-graph.h b/goffice/graph/goffice-graph.h
index 44cf990..5f54629 100644
--- a/goffice/graph/goffice-graph.h
+++ b/goffice/graph/goffice-graph.h
@@ -245,7 +245,6 @@ G_END_DECLS
#include <goffice/graph/gog-3d-box.h>
#include <goffice/graph/gog-axis-line.h>
-#include <goffice/graph/gog-axis-line-impl.h>
#include <goffice/graph/gog-axis.h>
#include <goffice/graph/gog-chart.h>
#include <goffice/graph/gog-chart-impl.h>
diff --git a/goffice/graph/gog-axis-line.c b/goffice/graph/gog-axis-line.c
index 68b54f1..a901d1a 100644
--- a/goffice/graph/gog-axis-line.c
+++ b/goffice/graph/gog-axis-line.c
@@ -21,6 +21,7 @@
#include <goffice/goffice-config.h>
#include <goffice/goffice.h>
+#include "gog-axis-line-impl.h"
#include <gsf/gsf-impl-utils.h>
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index 1f5cc3d..25a2c90 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -21,6 +21,7 @@
#include <goffice/goffice-config.h>
#include <goffice/goffice.h>
+#include "gog-axis-line-impl.h"
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/graph/gog-graph.c b/goffice/graph/gog-graph.c
index d94e441..9c5802b 100644
--- a/goffice/graph/gog-graph.c
+++ b/goffice/graph/gog-graph.c
@@ -544,8 +544,8 @@ gog_graph_num_rows (GogGraph const *graph)
}
/**
- * gog_graph_du :
- * @grap : #GogGraph
+ * gog_graph_dup:
+ * @graph: #GogGraph
*
* Returns: (transfer full) a deep copy of @graph.
**/
diff --git a/goffice/graph/gog-object.h b/goffice/graph/gog-object.h
index 40fea3e..961b450 100644
--- a/goffice/graph/gog-object.h
+++ b/goffice/graph/gog-object.h
@@ -79,6 +79,8 @@ struct _GogObject {
unsigned being_updated : 1;
unsigned explicitly_typed_role : 1; /* did we create it automaticly */
unsigned invisible : 1;
+
+ void *_priv; /* for future use */
};
typedef struct {
@@ -100,6 +102,9 @@ typedef struct {
GogDataAllocator *dalloc,
GOCmdContext *cc);
void (*document_changed)(GogObject *obj, GODoc *doc);
+ GogManualSizeMode (*get_manual_size_mode) (GogObject *obj);
+ void (*reserved1) (GogObject *view);
+ void (*reserved2) (GogObject *view);
/* signals */
void (*changed) (GogObject *obj, gboolean size);
@@ -110,7 +115,8 @@ typedef struct {
void (*child_name_changed) (GogObject const *obj, GogObject const *child);
void (*children_reordered) (GogObject *obj);
void (*update_editor) (GogObject *obj);
- GogManualSizeMode (*get_manual_size_mode) (GogObject *obj);
+ void (*extra_signal1) (GogObject *view);
+ void (*extra_signal2) (GogObject *view);
} GogObjectClass;
#define GOG_TYPE_OBJECT (gog_object_get_type ())
diff --git a/goffice/graph/gog-view.h b/goffice/graph/gog-view.h
index 17c665b..4f2b470 100644
--- a/goffice/graph/gog-view.h
+++ b/goffice/graph/gog-view.h
@@ -73,6 +73,7 @@ struct _GogView {
unsigned being_updated : 1;
GSList *toolkit; /* List of GogTool */
+ void *_priv; /* for future use */
};
typedef struct {
@@ -93,6 +94,8 @@ typedef struct {
void (*build_toolkit) (GogView *view);
char *(*get_tip_at_point) (GogView *view, double x, double y);
void (*natural_size) (GogView *view, GogViewRequisition *req);
+ void (*reserved1) (GogView *view);
+ void (*reserved2) (GogView *view);
} GogViewClass;
#define GOG_TYPE_VIEW (gog_view_get_type ())
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]