brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make clutter-stage-window.h a private header

Browse Source 
It should have never been public in the first place; nothing can
implement the ClutterStageWindow interface and use it, so this is
not a break.
This commit is contained in:
Emmanuele Bassi 2012-03-01 11:06:04 +00:00 committed by Emmanuele Bassi
parent a1ec559d14
commit b248fbd010
5 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/Makefile.am
View File

@ -110,7 +110,6 @@ source_h = \
$(srcdir)/clutter-snap-constraint.h \
$(srcdir)/clutter-stage.h \
$(srcdir)/clutter-stage-manager.h \
$(srcdir)/clutter-stage-window.h \
$(srcdir)/clutter-state.h \
$(srcdir)/clutter-table-layout.h \
$(srcdir)/clutter-texture.h \
@ -218,6 +217,7 @@ source_h_priv = \
$(srcdir)/clutter-settings-private.h \
$(srcdir)/clutter-stage-manager-private.h \
$(srcdir)/clutter-stage-private.h \
$(srcdir)/clutter-stage-window.h \
$(NULL)
# private source code; these should not be introspected

2
clutter/clutter-stage-window.c
View File

@ -8,6 +8,8 @@
#include "clutter-stage-window.h"
#include "clutter-private.h"
#define clutter_stage_window_get_type _clutter_stage_window_get_type
typedef ClutterStageWindowIface ClutterStageWindowInterface;
G_DEFINE_INTERFACE (ClutterStageWindow, clutter_stage_window, G_TYPE_OBJECT);

23
clutter/clutter-stage-window.h
View File

@ -1,30 +1,17 @@
#ifndef __CLUTTER_STAGE_WINDOW_H__
#define __CLUTTER_STAGE_WINDOW_H__
#include <clutter/clutter-actor.h>
#include <cogl/cogl.h>
#include <cairo.h>
/* XXX: Some of the private parts in this header expect the
* CoglFramebuffer typedef from Cogl, but its possible for this header
* to be included without the experimental Cogl api having been
* selected by defining COGL_ENABLE_EXPERIMENTAL_API or
* COGL_ENABLE_EXPERIMENTAL_2_0_API.
*
* We declare a place holder type ourselves in this case...
*/
#ifndef COGL_ENABLE_EXPERIMENTAL_API
typedef struct _CoglFramebuffer CoglFramebuffer;
#endif
#include <clutter/clutter-types.h>
G_BEGIN_DECLS
#define CLUTTER_TYPE_STAGE_WINDOW (clutter_stage_window_get_type ())
#define CLUTTER_TYPE_STAGE_WINDOW (_clutter_stage_window_get_type ())
#define CLUTTER_STAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_STAGE_WINDOW, ClutterStageWindow))
#define CLUTTER_IS_STAGE_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_STAGE_WINDOW))
#define CLUTTER_STAGE_WINDOW_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_STAGE_WINDOW, ClutterStageWindowIface))
/**
/*
* ClutterStageWindow: (skip)
*
* <structname>ClutterStageWindow</structname> is an opaque structure
@ -35,7 +22,7 @@ G_BEGIN_DECLS
typedef struct _ClutterStageWindow ClutterStageWindow; /* dummy */
typedef struct _ClutterStageWindowIface ClutterStageWindowIface;
/**
/*
* ClutterStageWindowIface: (skip)
*
* The interface implemented by backends for stage windows
@ -91,7 +78,7 @@ struct _ClutterStageWindowIface
gboolean (* can_clip_redraws) (ClutterStageWindow *stage_window);
};
GType clutter_stage_window_get_type (void) G_GNUC_CONST;
GType _clutter_stage_window_get_type (void) G_GNUC_CONST;
ClutterActor * _clutter_stage_window_get_wrapper (ClutterStageWindow *window);

1
clutter/clutter.h
View File

@ -90,7 +90,6 @@
#include "clutter-snap-constraint.h"
#include "clutter-stage.h"
#include "clutter-stage-manager.h"
#include "clutter-stage-window.h"
#include "clutter-state.h"
#include "clutter-table-layout.h"
#include "clutter-texture.h"

1
clutter/clutter.symbols
View File

@ -1069,7 +1069,6 @@ clutter_stage_set_use_alpha
clutter_stage_set_use_fog
clutter_stage_state_get_type
clutter_stage_show_cursor
clutter_stage_window_get_type
clutter_state_get_animator
clutter_state_get_duration
clutter_state_get_keys