From 6663774c363594fb0e9495f287487b38ffbaa079 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 27 Mar 2007 09:39:00 +0000 Subject: [PATCH] Ignore the clutter/cogl directory when building documentation, as it is private API; remove the now private ClutterBackend API; add the ClutterPerspective API to the documentation. --- clutter/glx/clutter-backend-glx.c | 2 +- doc/reference/ChangeLog | 7 +++++++ doc/reference/Makefile.am | 5 +++-- doc/reference/clutter-sections.txt | 10 ++++------ doc/reference/tmpl/clutter-stage.sgml | 27 +++++++++++++++++++++++++++ 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/clutter/glx/clutter-backend-glx.c b/clutter/glx/clutter-backend-glx.c index d5cc04d28..f0a0e2c75 100644 --- a/clutter/glx/clutter-backend-glx.c +++ b/clutter/glx/clutter-backend-glx.c @@ -48,7 +48,7 @@ static gint clutter_screen = 0; /* X error trap */ static int TrappedErrorCode = 0; -static int (*old_error_handler) (Display *, XErrorEvent *); +static int (* old_error_handler) (Display *, XErrorEvent *); static gboolean clutter_backend_glx_pre_parse (ClutterBackend *backend, diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog index 973636be2..431422931 100644 --- a/doc/reference/ChangeLog +++ b/doc/reference/ChangeLog @@ -1,3 +1,10 @@ +2007-03-27 Emmanuele Bassi + + * Makefile.am: Ignore clutter/cogl: it's private API. + + * clutter-sections.txt: Remove the now private ClutterBackend + API; add the ClutterPerspective API. + 2007-03-25 Emmanuele Bassi * clutter-sections.txt: Add clutter_get_default_backend(). diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index c136b4c1b..59235b911 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -56,9 +56,10 @@ IGNORE_HFILES=\ clutter-enum-types.h \ stamp-clutter-enum-types.h \ stamp-clutter-marshal.h \ - pango \ + cogl \ + egl \ glx \ - egl + pango EXTRA_HFILES=\ ../../clutter/glx/clutter-glx.h diff --git a/doc/reference/clutter-sections.txt b/doc/reference/clutter-sections.txt index 05cda5210..76d62ccfd 100644 --- a/doc/reference/clutter-sections.txt +++ b/doc/reference/clutter-sections.txt @@ -317,6 +317,9 @@ clutter_texture_get_type CLUTTER_STAGE_WIDTH CLUTTER_STAGE_HEIGHT ClutterStage +ClutterPerspective +clutter_perspective_copy +clutter_perspective_free ClutterStage ClutterStageClass clutter_stage_get_default @@ -339,6 +342,7 @@ CLUTTER_STAGE_GET_CLASS ClutterStagePrivate clutter_stage_get_type +clutter_perspective_get_type
@@ -446,7 +450,6 @@ clutter_behaviour_scale_get_type ClutterBackend ClutterBackend clutter_get_default_backend -clutter_backend_get_stage clutter_backend_get_event clutter_backend_peek_event clutter_backend_put_event @@ -460,11 +463,6 @@ CLUTTER_TYPE_BACKEND ClutterBackendClass clutter_backend_get_type -clutter_backend_add_options -clutter_backend_init_stage -clutter_backend_init_events -clutter_backend_pre_parse -clutter_backend_post_parse
diff --git a/doc/reference/tmpl/clutter-stage.sgml b/doc/reference/tmpl/clutter-stage.sgml index 20b9b2b71..d4898fc30 100644 --- a/doc/reference/tmpl/clutter-stage.sgml +++ b/doc/reference/tmpl/clutter-stage.sgml @@ -31,6 +31,33 @@ Macro evaluating to the height of the #ClutterStage + + + + + +@fovy: +@aspect: +@zNear: +@zFar: + + + + + + +@perspective: +@Returns: + + + + + + + +@perspective: + + #ClutterStage has no publicly available members.