[cluttermm] Revert "Stage: amends to allow build."
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cluttermm] Revert "Stage: amends to allow build."
- Date: Sat, 20 Aug 2016 22:28:38 +0000 (UTC)
commit d4e67e45bfa86be98c1a340781083a20071c4d20
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Aug 21 00:19:39 2016 +0200
Revert "Stage: amends to allow build."
This reverts commit 21e06458c1f124d456e57e7b946303328c05f2eb.
clutter/src/stage.ccg | 7 +++++++
clutter/src/stage.hg | 3 ++-
2 files changed, 9 insertions(+), 1 deletions(-)
---
diff --git a/clutter/src/stage.ccg b/clutter/src/stage.ccg
index 5cffaf2..e30c23e 100644
--- a/clutter/src/stage.ccg
+++ b/clutter/src/stage.ccg
@@ -28,6 +28,13 @@ Perspective::Perspective(float fovy, float aspect, float z_near, float z_far)
gobject_.z_far = z_far;
}
+Color Stage::get_color() const
+{
+ Color color;
+ clutter_stage_get_color(const_cast<ClutterStage*>(gobj()), color.gobj());
+ return color;
+}
+
void Stage::set_key_focus()
{
clutter_stage_set_key_focus(gobj(), NULL);
diff --git a/clutter/src/stage.hg b/clutter/src/stage.hg
index 7d32ae2..09231ae 100644
--- a/clutter/src/stage.hg
+++ b/clutter/src/stage.hg
@@ -70,7 +70,7 @@ protected:
/**
* Creates a new stage. Every Clutter::Actor must be placed on a stage, and the
* stage first created automatically occupies the window generated when
- * Clutter::main() is run.
+ * Clutter::maiAdded new properties and functions to wrap clutter 1.7.6n() is run.
*
* Clutter can support more than one stage at once; however the ability to
* support multiple stages depends on the current backend. Use
@@ -114,6 +114,7 @@ public:
// TODO: Should we rather wrap this as std::string, or
// as std::vector<unsigned char>, or Glib::ArrayHandle<guchar>?
_WRAP_METHOD(guchar* read_pixels(int x, int y, int width, int height) const, clutter_stage_read_pixels)
+ values.")
_WRAP_METHOD(void stage_event(Event* event), clutter_stage_event)
_WRAP_METHOD(void ensure_current(), clutter_stage_ensure_current)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]