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

2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>

Browse Source 
Bug 1212 - Allow only a single include file for Clutter

	* clutter/*.h: Only allow including clutter.h in third
	party code.

	* clutter/cogl/cogl-color.h:
	* clutter/cogl/cogl-fixed.h:
	* clutter/cogl/cogl.h.in: Only allow including cogl.h in
	third party code.

	* clutter/cogl/common/Makefile.am:
	* clutter/cogl/gl/Makefile.am:
	* clutter/cogl/gles/Makefile.am:
	* clutter/eglnative/Makefile.am:
	* clutter/eglx/Makefile.am:
	* clutter/fruity/Makefile.am:
	* clutter/glx/Makefile.am:
	* clutter/glx/clutter-glx.h:
	* clutter/osx/Makefile.am:
	* clutter/pango/Makefile.am:
	* clutter/sdl/Makefile.am:
	* clutter/win32/Makefile.am:
	* clutter/x11/Makefile.am: Fix build environment.

	* clutter/x11/clutter-x11-texture-pixmap.h:
	* clutter/x11/clutter-x11.h: Fix inclusion rules.

	* tests/test-pixmap.c: Fix inclusion of GdkPixbuf header.

	* README: Update release notes.
This commit is contained in:
Emmanuele Bassi 2008-10-30 17:04:34 +00:00
parent 36e30239af
commit a32eca26b6
65 changed files with 361 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ChangeLog
View File

@ -1,3 +1,36 @@
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1212 - Allow only a single include file for Clutter
* clutter/*.h: Only allow including clutter.h in third
party code.
* clutter/cogl/cogl-color.h:
* clutter/cogl/cogl-fixed.h:
* clutter/cogl/cogl.h.in: Only allow including cogl.h in
third party code.
* clutter/cogl/common/Makefile.am:
* clutter/cogl/gl/Makefile.am:
* clutter/cogl/gles/Makefile.am:
* clutter/eglnative/Makefile.am:
* clutter/eglx/Makefile.am:
* clutter/fruity/Makefile.am:
* clutter/glx/Makefile.am:
* clutter/glx/clutter-glx.h:
* clutter/osx/Makefile.am:
* clutter/pango/Makefile.am:
* clutter/sdl/Makefile.am:
* clutter/win32/Makefile.am:
* clutter/x11/Makefile.am: Fix build environment.
* clutter/x11/clutter-x11-texture-pixmap.h:
* clutter/x11/clutter-x11.h: Fix inclusion rules.
* tests/test-pixmap.c: Fix inclusion of GdkPixbuf header.
* README: Update release notes.
2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com> 2008-10-30 Emmanuele Bassi <ebassi@linux.intel.com>
Bug 1211 - Drop ClutterFeatureFlags usage from COGL Bug 1211 - Drop ClutterFeatureFlags usage from COGL

6
README
View File

@ -170,6 +170,12 @@ wanting to port to newer releases (See NEWS for general new feature info).
Release Notes for Clutter 1.0 Release Notes for Clutter 1.0
------------------------------- -------------------------------
* Both Clutter and COGL only allow including <clutter/clutter.h>
and <cogl/cogl.h> directly, respectively. This allows avoiding
breaking API every time a type definition is moved across
headers, and improves the reliability of third party code against
internal refactorings.
* COGL has an internal Color type, used to store a color definition * COGL has an internal Color type, used to store a color definition
that can be efficiently used with the least amount of conversions that can be efficiently used with the least amount of conversions
by both the GL and GLES implementations. The COGL API has been by both the GL and GLES implementations. The COGL API has been

12
clutter/clutter-actor.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_ACTOR_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_ACTOR_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_ACTOR_H__
#define __CLUTTER_ACTOR_H__
/* clutter-actor.h */ /* clutter-actor.h */

8
clutter/clutter-alpha.h
View File

@ -21,11 +21,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_ALPHA_H__ #ifndef __CLUTTER_ALPHA_H__
#define __CLUTTER_ALPHA_H__ #define __CLUTTER_ALPHA_H__

8
clutter/clutter-backend.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BACKEND_H__ #ifndef __CLUTTER_BACKEND_H__
#define __CLUTTER_BACKEND_H__ #define __CLUTTER_BACKEND_H__

4
clutter/clutter-behaviour-bspline.h
View File

@ -21,6 +21,10 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_BSPLINE_H__ #ifndef __CLUTTER_BEHAVIOUR_BSPLINE_H__
#define __CLUTTER_BEHAVIOUR_BSPLINE_H__ #define __CLUTTER_BEHAVIOUR_BSPLINE_H__

8
clutter/clutter-behaviour-depth.h
View File

@ -20,11 +20,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_DEPTH__ #ifndef __CLUTTER_BEHAVIOUR_DEPTH__
#define __CLUTTER_BEHAVIOUR_DEPTH__ #define __CLUTTER_BEHAVIOUR_DEPTH__

8
clutter/clutter-behaviour-ellipse.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_ELLIPSE_H__ #ifndef __CLUTTER_BEHAVIOUR_ELLIPSE_H__
#define __CLUTTER_BEHAVIOUR_ELLIPSE_H__ #define __CLUTTER_BEHAVIOUR_ELLIPSE_H__

8
clutter/clutter-behaviour-opacity.h
View File

@ -20,11 +20,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_OPACITY_H__ #ifndef __CLUTTER_BEHAVIOUR_OPACITY_H__
#define __CLUTTER_BEHAVIOUR_OPACITY_H__ #define __CLUTTER_BEHAVIOUR_OPACITY_H__

8
clutter/clutter-behaviour-path.h
View File

@ -20,11 +20,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_PATH_H__ #ifndef __CLUTTER_BEHAVIOUR_PATH_H__
#define __CLUTTER_BEHAVIOUR_PATH_H__ #define __CLUTTER_BEHAVIOUR_PATH_H__

8
clutter/clutter-behaviour-rotate.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_ROTATE_H__ #ifndef __CLUTTER_BEHAVIOUR_ROTATE_H__
#define __CLUTTER_BEHAVIOUR_ROTATE_H__ #define __CLUTTER_BEHAVIOUR_ROTATE_H__

8
clutter/clutter-behaviour-scale.h
View File

@ -20,11 +20,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_SCALE_H__ #ifndef __CLUTTER_BEHAVIOUR_SCALE_H__
#define __CLUTTER_BEHAVIOUR_SCALE_H__ #define __CLUTTER_BEHAVIOUR_SCALE_H__

8
clutter/clutter-behaviour.h
View File

@ -23,8 +23,12 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _HAVE_CLUTTER_BEHAVIOUR_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_BEHAVIOUR_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_BEHAVIOUR_H__
#define __CLUTTER_BEHAVIOUR_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-alpha.h> #include <clutter/clutter-alpha.h>

8
clutter/clutter-child-meta.h
View File

@ -22,11 +22,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_CHILD_META_H__ #ifndef __CLUTTER_CHILD_META_H__
#define __CLUTTER_CHILD_META_H__ #define __CLUTTER_CHILD_META_H__

42
clutter/clutter-clone-texture.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_CLONE_TEXTURE_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_CLONE_TEXTURE_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_CLONE_TEXTURE_H__
#define __CLUTTER_CLONE_TEXTURE_H__
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
#include <clutter/clutter-texture.h> #include <clutter/clutter-texture.h>
@ -32,26 +34,11 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_CLONE_TEXTURE (clutter_clone_texture_get_type ()) #define CLUTTER_TYPE_CLONE_TEXTURE (clutter_clone_texture_get_type ())
#define CLUTTER_CLONE_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_CLONE_TEXTURE, ClutterCloneTexture))
#define CLUTTER_CLONE_TEXTURE(obj) \ #define CLUTTER_CLONE_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_CLONE_TEXTURE, ClutterCloneTextureClass))
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ #define CLUTTER_IS_CLONE_TEXTURE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_CLONE_TEXTURE))
CLUTTER_TYPE_CLONE_TEXTURE, ClutterCloneTexture)) #define CLUTTER_IS_CLONE_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_CLONE_TEXTURE))
#define CLUTTER_CLONE_TEXTURE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_CLONE_TEXTURE, ClutterCloneTextureClass))
#define CLUTTER_CLONE_TEXTURE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \
CLUTTER_TYPE_CLONE_TEXTURE, ClutterCloneTextureClass))
#define CLUTTER_IS_CLONE_TEXTURE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
CLUTTER_TYPE_CLONE_TEXTURE))
#define CLUTTER_IS_CLONE_TEXTURE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
CLUTTER_TYPE_CLONE_TEXTURE))
#define CLUTTER_CLONE_TEXTURE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_CLONE_TEXTURE, ClutterCloneTextureClass))
typedef struct _ClutterCloneTexture ClutterCloneTexture; typedef struct _ClutterCloneTexture ClutterCloneTexture;
typedef struct _ClutterCloneTexturePrivate ClutterCloneTexturePrivate; typedef struct _ClutterCloneTexturePrivate ClutterCloneTexturePrivate;
@ -59,14 +46,15 @@ typedef struct _ClutterCloneTextureClass ClutterCloneTextureClass;
struct _ClutterCloneTexture struct _ClutterCloneTexture
{ {
/*< private >*/
ClutterActor parent; ClutterActor parent;
/*< priv >*/
ClutterCloneTexturePrivate *priv; ClutterCloneTexturePrivate *priv;
}; };
struct _ClutterCloneTextureClass struct _ClutterCloneTextureClass
{ {
/*< private >*/
ClutterActorClass parent_class; ClutterActorClass parent_class;
/* padding for future expansion */ /* padding for future expansion */
@ -85,4 +73,4 @@ void clutter_clone_texture_set_parent_texture (ClutterCloneTexture *c
G_END_DECLS G_END_DECLS
#endif #endif /* __CLUTTER_CLONE_TEXTURE_H__ */

12
clutter/clutter-color.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_COLOR_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_COLOR_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_COLOR_H__
#define __CLUTTER_COLOR_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-fixed.h> #include <clutter/clutter-fixed.h>

8
clutter/clutter-container.h
View File

@ -18,14 +18,16 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
* *
* ClutterContainer: Generic actor container interface. * ClutterContainer: Generic actor container interface.
* Author: Emmanuele Bassi <ebassi@openedhand.com> * Author: Emmanuele Bassi <ebassi@openedhand.com>
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_CONTAINER_H__ #ifndef __CLUTTER_CONTAINER_H__
#define __CLUTTER_CONTAINER_H__ #define __CLUTTER_CONTAINER_H__

14
clutter/clutter-effect.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _CLUTTER_EFFECT #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _CLUTTER_EFFECT #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_EFFECT_H__
#define __CLUTTER_EFFECT_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
@ -157,4 +159,4 @@ ClutterTimeline *clutter_effect_rotate (ClutterEffectTemplate *template_,
G_END_DECLS G_END_DECLS
#endif /* _CLUTTER_EFFECT */ #endif /* __CLUTTER_EFFECT_H__ */

14
clutter/clutter-entry.h
View File

@ -19,13 +19,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_ENTRY_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_ENTRY_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_ENTRY_H__
#define __CLUTTER_ENTRY_H__
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
#include <clutter/clutter-color.h> #include <clutter/clutter-color.h>
@ -160,4 +162,4 @@ void clutter_entry_handle_key_event (ClutterEntry *ent
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_ENTRY_H */ #endif /* __CLUTTER_ENTRY_H__ */

10
clutter/clutter-event.h
View File

@ -21,8 +21,12 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _HAVE_CLUTTER_EVENT_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_EVENT_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_EVENT_H__
#define __CLUTTER_EVENT_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-types.h> #include <clutter/clutter-types.h>
@ -443,4 +447,4 @@ ClutterStage* clutter_event_get_stage (ClutterEvent *event);
G_END_DECLS G_END_DECLS
#endif #endif /* __CLUTTER_EVENT_H__ */

16
clutter/clutter-feature.h
View File

@ -18,10 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
/** /**
* SECTION:clutter-main * SECTION:clutter-main
* @short_description: Various 'global' clutter functions. * @short_description: Various 'global' clutter functions.
@ -30,8 +33,8 @@
* functions for mainloops, events and threads * functions for mainloops, events and threads
*/ */
#ifndef _HAVE_CLUTTER_FEATURE_H #ifndef __CLUTTER_FEATURE_H__
#define _HAVE_CLUTTER_FEATURE_H #define __CLUTTER_FEATURE_H__
#include <glib.h> #include <glib.h>
@ -74,5 +77,4 @@ ClutterFeatureFlags clutter_feature_get_all (void);
G_END_DECLS G_END_DECLS
#endif #endif /* __CLUTTER_FEATURE_H__ */

16
clutter/clutter-fixed.h
View File

@ -19,16 +19,18 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_FIXED_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_FIXED_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_FIXED_H__
#define __CLUTTER_FIXED_H__
#include <glib-object.h> #include <glib-object.h>
#include <cogl/cogl-fixed.h> #include <cogl/cogl.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -379,4 +381,4 @@ GParamSpec * clutter_param_spec_fixed (const gchar *name,
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_FIXED_H */ #endif /* __CLUTTER_FIXED_H__ */

14
clutter/clutter-frame-source.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _CLUTTER_FRAME_SOURCE_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _CLUTTER_FRAME_SOURCE_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_FRAME_SOURCE_H__
#define __CLUTTER_FRAME_SOURCE_H__
#include <glib.h> #include <glib.h>
@ -42,4 +44,4 @@ guint clutter_frame_source_add_full (gint priority,
G_END_DECLS G_END_DECLS
#endif /* _CLUTTER_FRAME_SOURCE_H */ #endif /* __CLUTTER_FRAME_SOURCE_H__ */

9
clutter/clutter-group.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_GROUP_H__ #ifndef __CLUTTER_GROUP_H__
#define __CLUTTER_GROUP_H__ #define __CLUTTER_GROUP_H__
@ -92,6 +94,7 @@ ClutterActor *clutter_group_get_nth_child (ClutterGroup *self,
gint clutter_group_get_n_children (ClutterGroup *self); gint clutter_group_get_n_children (ClutterGroup *self);
void clutter_group_remove_all (ClutterGroup *group); void clutter_group_remove_all (ClutterGroup *group);
/* for Mr. Mallum */
#define clutter_group_add(group,actor) G_STMT_START { \ #define clutter_group_add(group,actor) G_STMT_START { \
if (CLUTTER_IS_GROUP ((group)) && CLUTTER_IS_ACTOR ((actor))) \ if (CLUTTER_IS_GROUP ((group)) && CLUTTER_IS_ACTOR ((actor))) \
{ \ { \

4
clutter/clutter-id-pool.h
View File

@ -18,9 +18,7 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
* *
* ClutterIDPool: pool of reusable integer ids associated with pointers. * ClutterIDPool: pool of reusable integer ids associated with pointers.
* *

14
clutter/clutter-label.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_LABEL_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_LABEL_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_LABEL_H__
#define __CLUTTER_LABEL_H__
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
#include <clutter/clutter-color.h> #include <clutter/clutter-color.h>
@ -123,4 +125,4 @@ gboolean clutter_label_get_justify (ClutterLabel *labe
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_LABEL_H */ #endif /* __CLUTTER_LABEL_H__ */

8
clutter/clutter-list-model.h
View File

@ -20,13 +20,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
* *
* NB: Inspiration for column storage taken from GtkListStore * NB: Inspiration for column storage taken from GtkListStore
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_LIST_MODEL_H__ #ifndef __CLUTTER_LIST_MODEL_H__
#define __CLUTTER_LIST_MODEL_H__ #define __CLUTTER_LIST_MODEL_H__

14
clutter/clutter-main.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_MAIN_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_MAIN_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_MAIN_H__
#define __CLUTTER_MAIN_H__
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
#include <clutter/clutter-stage.h> #include <clutter/clutter-stage.h>
@ -165,4 +167,4 @@ void clutter_ungrab_pointer_for_device (gint id);
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_MAIN_H */ #endif /* _CLUTTER_MAIN_H__ */

38
clutter/clutter-media.h
View File

@ -18,38 +18,34 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_MEDIA_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_MEDIA_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_MEDIA_H__
#define __CLUTTER_MEDIA_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_MEDIA clutter_media_get_type() #define CLUTTER_TYPE_MEDIA (clutter_media_get_type ())
#define CLUTTER_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_MEDIA, ClutterMedia))
#define CLUTTER_IS_MEDIA(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_MEDIA))
#define CLUTTER_MEDIA_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), CLUTTER_TYPE_MEDIA, ClutterMediaInterface))
#define CLUTTER_MEDIA(obj) \ typedef struct _ClutterMedia ClutterMedia; /* dummy typedef */
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
CLUTTER_TYPE_MEDIA, ClutterMedia))
#define CLUTTER_IS_MEDIA(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
CLUTTER_TYPE_MEDIA))
#define CLUTTER_MEDIA_GET_INTERFACE(obj) \
(G_TYPE_INSTANCE_GET_INTERFACE ((obj), \
CLUTTER_TYPE_MEDIA, ClutterMediaInterface))
typedef struct _ClutterMedia ClutterMedia;
typedef struct _ClutterMediaInterface ClutterMediaInterface; typedef struct _ClutterMediaInterface ClutterMediaInterface;
struct _ClutterMediaInterface struct _ClutterMediaInterface
{ {
/*< private >*/
GTypeInterface base_iface; GTypeInterface base_iface;
/*< public >*/
void (*set_uri) (ClutterMedia *media, void (*set_uri) (ClutterMedia *media,
const char *uri); const char *uri);
const char *(*get_uri) (ClutterMedia *media); const char *(*get_uri) (ClutterMedia *media);
@ -73,7 +69,7 @@ struct _ClutterMediaInterface
}; };
GType clutter_media_get_type (void); GType clutter_media_get_type (void) G_GNUC_CONST;
void void
clutter_media_set_uri (ClutterMedia *media, clutter_media_set_uri (ClutterMedia *media,
@ -117,4 +113,4 @@ clutter_media_set_filename (ClutterMedia *media,
G_END_DECLS G_END_DECLS
#endif #endif /* __CLUTTER_MEDIA_H__ */

9
clutter/clutter-model.h
View File

@ -20,15 +20,16 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_MODEL_H__ #ifndef __CLUTTER_MODEL_H__
#define __CLUTTER_MODEL_H__ #define __CLUTTER_MODEL_H__
#include <glib.h>
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS

44
clutter/clutter-rectangle.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_RECTANGLE_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_RECTANGLE_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_RECTANGLE_H__
#define __CLUTTER_RECTANGLE_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
@ -32,27 +34,12 @@
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_RECTANGLE clutter_rectangle_get_type() #define CLUTTER_TYPE_RECTANGLE (clutter_rectangle_get_type())
#define CLUTTER_RECTANGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_RECTANGLE, ClutterRectangle))
#define CLUTTER_RECTANGLE(obj) \ #define CLUTTER_RECTANGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_RECTANGLE, ClutterRectangleClass))
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \ #define CLUTTER_IS_RECTANGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_RECTANGLE))
CLUTTER_TYPE_RECTANGLE, ClutterRectangle)) #define CLUTTER_IS_RECTANGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_RECTANGLE))
#define CLUTTER_RECTANGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_RECTANGLE, ClutterRectangleClass))
#define CLUTTER_RECTANGLE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \
CLUTTER_TYPE_RECTANGLE, ClutterRectangleClass))
#define CLUTTER_IS_RECTANGLE(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
CLUTTER_TYPE_RECTANGLE))
#define CLUTTER_IS_RECTANGLE_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
CLUTTER_TYPE_RECTANGLE))
#define CLUTTER_RECTANGLE_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CLUTTER_TYPE_RECTANGLE, ClutterRectangleClass))
typedef struct _ClutterRectangle ClutterRectangle; typedef struct _ClutterRectangle ClutterRectangle;
typedef struct _ClutterRectangleClass ClutterRectangleClass; typedef struct _ClutterRectangleClass ClutterRectangleClass;
@ -60,14 +47,15 @@ typedef struct _ClutterRectanglePrivate ClutterRectanglePrivate;
struct _ClutterRectangle struct _ClutterRectangle
{ {
/*< private >*/
ClutterActor parent; ClutterActor parent;
/*< private >*/
ClutterRectanglePrivate *priv; ClutterRectanglePrivate *priv;
}; };
struct _ClutterRectangleClass struct _ClutterRectangleClass
{ {
/*< private >*/
ClutterActorClass parent_class; ClutterActorClass parent_class;
/* padding for future expansion */ /* padding for future expansion */
@ -96,4 +84,4 @@ void clutter_rectangle_set_border_color (ClutterRectangle *rectangle,
G_END_DECLS G_END_DECLS
#endif #endif /* __CLUTTER_RECTANGLE_H__ */

8
clutter/clutter-score.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_SCORE_H__ #ifndef __CLUTTER_SCORE_H__
#define __CLUTTER_SCORE_H__ #define __CLUTTER_SCORE_H__

4
clutter/clutter-script.c
View File

@ -165,6 +165,10 @@
#include <glib-object.h> #include <glib-object.h>
#include <gmodule.h> #include <gmodule.h>
#ifdef USE_GDKPIXBUF
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif
#include "clutter-actor.h" #include "clutter-actor.h"
#include "clutter-alpha.h" #include "clutter-alpha.h"
#include "clutter-behaviour.h" #include "clutter-behaviour.h"

8
clutter/clutter-script.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_SCRIPT_H__ #ifndef __CLUTTER_SCRIPT_H__
#define __CLUTTER_SCRIPT_H__ #define __CLUTTER_SCRIPT_H__

8
clutter/clutter-scriptable.h
View File

@ -19,11 +19,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_SCRIPTABLE_H__ #ifndef __CLUTTER_SCRIPTABLE_H__
#define __CLUTTER_SCRIPTABLE_H__ #define __CLUTTER_SCRIPTABLE_H__

7
clutter/clutter-shader.h
View File

@ -19,11 +19,12 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_SHADER_H__ #ifndef __CLUTTER_SHADER_H__
#define __CLUTTER_SHADER_H__ #define __CLUTTER_SHADER_H__

10
clutter/clutter-stage-manager.h
View File

@ -18,15 +18,16 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_STAGE_MANAGER_H__ #ifndef __CLUTTER_STAGE_MANAGER_H__
#define __CLUTTER_STAGE_MANAGER_H__ #define __CLUTTER_STAGE_MANAGER_H__
#include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-stage.h> #include <clutter/clutter-stage.h>
@ -44,6 +45,7 @@ typedef struct _ClutterStageManagerClass ClutterStageManagerClass;
struct _ClutterStageManagerClass struct _ClutterStageManagerClass
{ {
/*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
void (* stage_added) (ClutterStageManager *stage_manager, void (* stage_added) (ClutterStageManager *stage_manager,

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

@ -2,9 +2,6 @@
#define __CLUTTER_STAGE_WINDOW_H__ #define __CLUTTER_STAGE_WINDOW_H__
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
#ifdef USE_GDKPIXBUF
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS

16
clutter/clutter-stage.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_STAGE_H__ #ifndef __CLUTTER_STAGE_H__
#define __CLUTTER_STAGE_H__ #define __CLUTTER_STAGE_H__
@ -31,10 +33,6 @@
#include <clutter/clutter-color.h> #include <clutter/clutter-color.h>
#include <clutter/clutter-event.h> #include <clutter/clutter-event.h>
#ifdef USE_GDKPIXBUF
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif
G_BEGIN_DECLS G_BEGIN_DECLS
#define CLUTTER_TYPE_PERSPECTIVE (clutter_perspective_get_type ()) #define CLUTTER_TYPE_PERSPECTIVE (clutter_perspective_get_type ())
@ -64,7 +62,7 @@ G_BEGIN_DECLS
/** /**
* CLUTTER_STAGE_WIDTH: * CLUTTER_STAGE_WIDTH:
* *
* Macro that evaluates to the current stage width * Macro that evaluates to the width of the default stage
* *
* Since: 0.2 * Since: 0.2
*/ */
@ -74,7 +72,7 @@ G_BEGIN_DECLS
/** /**
* CLUTTER_STAGE_HEIGHT: * CLUTTER_STAGE_HEIGHT:
* *
* Macro that evaluates to the current stage height * Macro that evaluates to the height of the default stage
* *
* Since: 0.2 * Since: 0.2
*/ */

10
clutter/clutter-texture.h
View File

@ -21,8 +21,12 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>. * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef _HAVE_CLUTTER_TEXTURE_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_TEXTURE_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_TEXTURE_H__
#define __CLUTTER_TEXTURE_H__
#include <clutter/clutter-actor.h> #include <clutter/clutter-actor.h>
#include <cogl/cogl.h> #include <cogl/cogl.h>
@ -180,4 +184,4 @@ void clutter_texture_set_cogl_texture (ClutterTexture
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_TEXTURE_H */ #endif /* __CLUTTER_TEXTURE_H__ */

14
clutter/clutter-timeline.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_TIMELINE_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_TIMELINE_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_TIMELINE_H__
#define __CLUTTER_TIMELINE_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-fixed.h> #include <clutter/clutter-fixed.h>
@ -161,4 +163,4 @@ void clutter_timeline_advance_to_marker (ClutterTimeline *timeli
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_TIMELINE_H */ #endif /* _CLUTTER_TIMELINE_H__ */

8
clutter/clutter-timeout-pool.h
View File

@ -18,9 +18,7 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
* *
* ClutterTimeoutPool: pool of timeout functions using the same slice of * ClutterTimeoutPool: pool of timeout functions using the same slice of
* the GLib main loop * the GLib main loop
@ -30,6 +28,10 @@
* Based on similar code by Tristan van Berkom * Based on similar code by Tristan van Berkom
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_TIMEOUT_POOL_H__ #ifndef __CLUTTER_TIMEOUT_POOL_H__
#define __CLUTTER_TIMEOUT_POOL_H__ #define __CLUTTER_TIMEOUT_POOL_H__

8
clutter/clutter-types.h
View File

@ -18,11 +18,13 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_TYPES_H__ #ifndef __CLUTTER_TYPES_H__
#define __CLUTTER_TYPES_H__ #define __CLUTTER_TYPES_H__

14
clutter/clutter-units.h
View File

@ -19,13 +19,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_UNITS_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_UNITS_H #error "Only <clutter/clutter.h> can be included directly.h"
#endif
#ifndef __CLUTTER_UNITS_H__
#define __CLUTTER_UNITS_H__
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter-fixed.h> #include <clutter/clutter-fixed.h>
@ -213,4 +215,4 @@ GParamSpec *clutter_param_spec_unit (const gchar *name,
G_END_DECLS G_END_DECLS
#endif /* _HAVE_CLUTTER_UNITS_H */ #endif /* __CLUTTER_UNITS_H__ */

12
clutter/clutter-util.h
View File

@ -18,13 +18,15 @@
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library. If not, see <http://www.gnu.org/licenses/>.
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_UTIL_H #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#define _HAVE_CLUTTER_UTIL_H #error "Only <clutter/clutter.h> can be included directly."
#endif
#ifndef __CLUTTER_UTIL_H__
#define __CLUTTER_UTIL_H__
#include <glib.h> #include <glib.h>

10
clutter/clutter.h
View File

@ -23,8 +23,10 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef _HAVE_CLUTTER_H #ifndef __CLUTTER_H__
#define _HAVE_CLUTTER_H #define __CLUTTER_H__
#define __CLUTTER_H_INSIDE__
#include "clutter-actor.h" #include "clutter-actor.h"
#include "clutter-alpha.h" #include "clutter-alpha.h"
@ -70,4 +72,6 @@
#include "clutter-enum-types.h" #include "clutter-enum-types.h"
#endif #undef __CLUTTER_H_INSIDE__
#endif /* __CLUTTER_H__ */

4
clutter/cogl/cogl-color.h
View File

@ -1,3 +1,7 @@
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly."
#endif
#ifndef __COGL_COLOR_H__ #ifndef __COGL_COLOR_H__
#define __COGL_COLOR_H__ #define __COGL_COLOR_H__

4
clutter/cogl/cogl-fixed.h
View File

@ -1,3 +1,7 @@
#if !defined(__COGL_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
#error "Only <cogl/cogl.h> can be included directly."
#endif
#ifndef __COGL_FIXED_H__ #ifndef __COGL_FIXED_H__
#define __COGL_FIXED_H__ #define __COGL_FIXED_H__

4
clutter/cogl/cogl.h.in
View File

@ -42,6 +42,8 @@
#ifndef __COGL_H__ #ifndef __COGL_H__
#define __COGL_H__ #define __COGL_H__
#define __COGL_H_INSIDE__
#include <glib.h> #include <glib.h>
#include <cogl/cogl-defines-@CLUTTER_COGL@.h> #include <cogl/cogl-defines-@CLUTTER_COGL@.h>
@ -1587,4 +1589,6 @@ void cogl_draw_buffer (CoglBufferTarget target,
G_END_DECLS G_END_DECLS
#undef __COGL_H_INSIDE__
#endif /* __COGL_H__ */ #endif /* __COGL_H__ */

1
clutter/cogl/common/Makefile.am
View File

@ -5,6 +5,7 @@ INCLUDES = \
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \
-I$(top_builddir)/clutter/cogl \ -I$(top_builddir)/clutter/cogl \
-DCLUTTER_COMPILATION \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
$(GCC_FLAGS) $(GCC_FLAGS)

1
clutter/cogl/gl/Makefile.am
View File

@ -13,6 +13,7 @@ INCLUDES = \
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \
-I$(top_builddir)/clutter/cogl \ -I$(top_builddir)/clutter/cogl \
-DCLUTTER_COMPILATION \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
$(GCC_FLAGS) $(GCC_FLAGS)

1
clutter/cogl/gles/Makefile.am
View File

@ -13,6 +13,7 @@ INCLUDES = \
-I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \ -I$(top_srcdir)/clutter/cogl/$(CLUTTER_COGL) \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \
-I$(top_builddir)/clutter/cogl \ -I$(top_builddir)/clutter/cogl \
-DCLUTTER_COMPILATION \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
$(GCC_FLAGS) $(GCC_FLAGS)

1
clutter/eglnative/Makefile.am
View File

@ -3,6 +3,7 @@ libclutterinclude_HEADERS = clutter-egl.h
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterEGL\" \ -DG_LOG_DOMAIN=\"ClutterEGL\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \

1
clutter/eglx/Makefile.am
View File

@ -3,6 +3,7 @@ libclutterinclude_HEADERS = clutter-eglx.h
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterEGL\" \ -DG_LOG_DOMAIN=\"ClutterEGL\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_srcdir)/clutter/x11 \ -I$(top_srcdir)/clutter/x11 \

1
clutter/fruity/Makefile.am
View File

@ -2,6 +2,7 @@ libclutterincludedir = $(includedir)/clutter-@CLUTTER_MAJORMINOR@/clutter
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterFruity\" \ -DG_LOG_DOMAIN=\"ClutterFruity\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \

1
clutter/glx/Makefile.am
View File

@ -7,6 +7,7 @@ INCLUDES = \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_srcdir)/clutter/x11 \ -I$(top_srcdir)/clutter/x11 \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \
-DCLUTTER_COMPILATION \
$(CLUTTER_CFLAGS) \ $(CLUTTER_CFLAGS) \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
$(GCC_FLAGS) $(GCC_FLAGS)

2
clutter/glx/clutter-glx.h
View File

@ -40,7 +40,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <clutter/clutter-stage.h> #include <clutter/clutter.h>
#include <clutter/glx/clutter-glx-texture-pixmap.h> #include <clutter/glx/clutter-glx-texture-pixmap.h>
G_BEGIN_DECLS G_BEGIN_DECLS

1
clutter/osx/Makefile.am
View File

@ -3,6 +3,7 @@ libclutterinclude_HEADERS = clutter-osx.h
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterOSX\" \ -DG_LOG_DOMAIN=\"ClutterOSX\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \

1
clutter/pango/Makefile.am
View File

@ -16,6 +16,7 @@ libpangoclutter_la_SOURCES = $(source_c) \
INCLUDES = \ INCLUDES = \
@GCC_FLAGS@ @CLUTTER_CFLAGS@ \ @GCC_FLAGS@ @CLUTTER_CFLAGS@ \
$(CLUTTER_DEBUG_CFLAGS) \ $(CLUTTER_DEBUG_CFLAGS) \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter -I$(top_builddir)/clutter

1
clutter/sdl/Makefile.am
View File

@ -3,6 +3,7 @@ libclutterinclude_HEADERS = clutter-sdl.h
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterSDL\" \ -DG_LOG_DOMAIN=\"ClutterSDL\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter/ \ -I$(top_srcdir)/clutter/ \
-I$(top_builddir)/clutter/ \ -I$(top_builddir)/clutter/ \

1
clutter/win32/Makefile.am
View File

@ -9,6 +9,7 @@ pkgconfigdir = $(libdir)/pkgconfig
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterWin32\" \ -DG_LOG_DOMAIN=\"ClutterWin32\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \

1
clutter/x11/Makefile.am
View File

@ -1,5 +1,6 @@
INCLUDES = \ INCLUDES = \
-DG_LOG_DOMAIN=\"ClutterX11\" \ -DG_LOG_DOMAIN=\"ClutterX11\" \
-DCLUTTER_COMPILATION \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/clutter \ -I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter \ -I$(top_builddir)/clutter \

4
clutter/x11/clutter-x11-texture-pixmap.h
View File

@ -28,9 +28,7 @@
#include <glib.h> #include <glib.h>
#include <glib-object.h> #include <glib-object.h>
#include <clutter/clutter.h>
#include <clutter/clutter-texture.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
G_BEGIN_DECLS G_BEGIN_DECLS

2
clutter/x11/clutter-x11.h
View File

@ -41,7 +41,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include <clutter/clutter-stage.h> #include <clutter/clutter.h>
#include <clutter/x11/clutter-x11-enum-types.h> #include <clutter/x11/clutter-x11-enum-types.h>
#include <clutter/x11/clutter-x11-texture-pixmap.h> #include <clutter/x11/clutter-x11-texture-pixmap.h>

2
tests/test-pixmap.c
View File

@ -18,6 +18,8 @@
#define IMAGE "redhand.png" #define IMAGE "redhand.png"
# ifdef USE_GDKPIXBUF # ifdef USE_GDKPIXBUF
# include <gdk-pixbuf/gdk-pixbuf.h>
static gboolean disable_x11 = FALSE; static gboolean disable_x11 = FALSE;
static gboolean disable_glx = FALSE; static gboolean disable_glx = FALSE;