[mutter/gbsneto/screencast-improvements: 2/8] clutter: Make ClutterStageView a public class
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/gbsneto/screencast-improvements: 2/8] clutter: Make ClutterStageView a public class
- Date: Tue, 18 Jun 2019 15:08:19 +0000 (UTC)
commit 90232b2d45ed519f28f4d9fd33fb1efc734c44b3
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Mon Jun 17 18:33:17 2019 -0300
clutter: Make ClutterStageView a public class
As a compositor toolkit, it makes sense to allow consumers
of Clutter interact with the stage views themselves. As such,
ClutterStageView should be a public class.
As such, it is now included in clutter.h and should not be
included directly.
https://gitlab.gnome.org/GNOME/mutter/merge_requests/623
clutter/clutter/clutter-stage-view.h | 4 ++++
clutter/clutter/clutter.h | 1 +
clutter/clutter/meson.build | 4 ++--
3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter/clutter-stage-view.h b/clutter/clutter/clutter-stage-view.h
index 0c3448511..26bf10e79 100644
--- a/clutter/clutter/clutter-stage-view.h
+++ b/clutter/clutter/clutter-stage-view.h
@@ -18,6 +18,10 @@
#ifndef __CLUTTER_STAGE_VIEW_H__
#define __CLUTTER_STAGE_VIEW_H__
+#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
+#error "Only <clutter/clutter.h> can be included directly."
+#endif
+
#include <cairo.h>
#include <glib-object.h>
#include <cogl/cogl.h>
diff --git a/clutter/clutter/clutter.h b/clutter/clutter/clutter.h
index 231d8cd1b..ec846910f 100644
--- a/clutter/clutter/clutter.h
+++ b/clutter/clutter/clutter.h
@@ -101,6 +101,7 @@
#include "clutter-snap-constraint.h"
#include "clutter-stage.h"
#include "clutter-stage-manager.h"
+#include "clutter-stage-view.h"
#include "clutter-tap-action.h"
#include "clutter-test-utils.h"
#include "clutter-texture.h"
diff --git a/clutter/clutter/meson.build b/clutter/clutter/meson.build
index 92b54024b..e23913c19 100644
--- a/clutter/clutter/meson.build
+++ b/clutter/clutter/meson.build
@@ -75,6 +75,7 @@ clutter_headers = [
'clutter-snap-constraint.h',
'clutter-stage.h',
'clutter-stage-manager.h',
+ 'clutter-stage-view.h',
'clutter-tap-action.h',
'clutter-test-utils.h',
'clutter-texture.h',
@@ -164,6 +165,7 @@ clutter_sources = [
'clutter-snap-constraint.c',
'clutter-stage.c',
'clutter-stage-manager.c',
+ 'clutter-stage-view.c',
'clutter-stage-window.c',
'clutter-tap-action.c',
'clutter-test-utils.c',
@@ -207,7 +209,6 @@ clutter_private_headers = [
'clutter-settings-private.h',
'clutter-stage-manager-private.h',
'clutter-stage-private.h',
- 'clutter-stage-view.h',
'clutter-stage-view-private.h',
'clutter-stage-window.h',
]
@@ -216,7 +217,6 @@ clutter_nonintrospected_sources = [
'clutter-easing.c',
'clutter-event-translator.c',
'clutter-id-pool.c',
- 'clutter-stage-view.c',
]
clutter_deprecated_headers = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]