[clutter/msvc-support-2.0: 68/68] Resolve conflict with clutter-1.99

[Chun-wei Fan <fanchunwei src gnome org>]

commit 054ddcae82d286a515d206285e9afa9865dd92d4
Merge: 3e3f15b 19e66f6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Jul 19 14:41:37 2011 +0800

    Resolve conflict with clutter-1.99

 Makefile.am                                        |    5 +-
 build/Makefile.am                                  |    2 +-
 build/win32/Makefile.am                            |    3 +
 build/win32/vs10/Makefile.am                       |   37 +
 build/win32/vs10/README.txt                        |   93 ++
 .../win32/vs10/cally-atkcomponent-example.vcxproj  |  172 +++
 .../cally-atkcomponent-example.vcxproj.filters     |   26 +
 .../vs10/cally-atkeditabletext-example.vcxproj     |  172 +++
 .../cally-atkeditabletext-example.vcxproj.filters  |   26 +
 build/win32/vs10/cally-atkevents-example.vcxproj   |  172 +++
 .../vs10/cally-atkevents-example.vcxproj.filters   |   26 +
 build/win32/vs10/cally-atktext-example.vcxproj     |  172 +++
 .../vs10/cally-atktext-example.vcxproj.filters     |   25 +
 build/win32/vs10/cally-clone-example.vcxproj       |  172 +++
 .../win32/vs10/cally-clone-example.vcxproj.filters |   26 +
 build/win32/vs10/clutter.props                     |  380 ++++++
 build/win32/vs10/clutter.sln                       |  156 +++
 build/win32/vs10/clutter.vcxproj.filtersin         |   25 +
 build/win32/vs10/clutter.vcxprojin                 |  196 ++++
 build/win32/vs10/install.vcxproj                   |  149 +++
 build/win32/vs10/test-cogl-perf.vcxproj            |  166 +++
 build/win32/vs10/test-cogl-perf.vcxproj.filters    |   14 +
 .../win32/vs10/test-conformance.vcxproj.filtersin  |   12 +
 build/win32/vs10/test-conformance.vcxprojin        |  168 +++
 .../win32/vs10/test-interactive.vcxproj.filtersin  |   12 +
 build/win32/vs10/test-interactive.vcxprojin        |  168 +++
 build/win32/vs10/test-picking.vcxproj              |  167 +++
 build/win32/vs10/test-picking.vcxproj.filters      |   14 +
 build/win32/vs10/test-random-text.vcxproj          |  166 +++
 build/win32/vs10/test-random-text.vcxproj.filters  |   14 +
 build/win32/vs10/test-text-perf.vcxproj            |  166 +++
 build/win32/vs10/test-text-perf.vcxproj.filters    |   14 +
 build/win32/vs10/test-text.vcxproj                 |  166 +++
 build/win32/vs10/test-text.vcxproj.filters         |   14 +
 build/win32/vs9/Makefile.am                        |   21 +
 build/win32/vs9/README.txt                         |   93 ++
 build/win32/vs9/cally-atkcomponent-example.vcproj  |  169 +++
 .../win32/vs9/cally-atkeditabletext-example.vcproj |  167 +++
 build/win32/vs9/cally-atkevents-example.vcproj     |  167 +++
 build/win32/vs9/cally-atktext-example.vcproj       |  164 +++
 build/win32/vs9/cally-clone-example.vcproj         |  169 +++
 build/win32/vs9/clutter.sln                        |  207 ++++
 build/win32/vs9/clutter.vcprojin                   |  199 ++++
 build/win32/vs9/clutter.vsprops                    |  246 ++++
 build/win32/vs9/install.vcproj                     |   80 ++
 build/win32/vs9/test-cogl-perf.vcproj              |  159 +++
 build/win32/vs9/test-conformance.vcprojin          |  165 +++
 build/win32/vs9/test-interactive.vcprojin          |  165 +++
 build/win32/vs9/test-picking.vcproj                |  160 +++
 build/win32/vs9/test-random-text.vcproj            |  159 +++
 build/win32/vs9/test-text-perf.vcproj              |  159 +++
 build/win32/vs9/test-text.vcproj                   |  159 +++
 clutter/Makefile.am                                |   42 +
 clutter/clutter-config.h.win32                     |   16 +
 clutter/clutter-stage.h                            |    1 -
 clutter/clutter-version.h.win32.in                 |  196 ++++
 clutter/clutter.symbols                            | 1223 ++++++++++++++++++++
 config.h.win32.in                                  |  155 +++
 configure.ac                                       |    6 +-
 tests/conform/Makefile.am                          |   42 +
 tests/conform/test-cogl-materials.c                |   20 +-
 tests/conform/test-cogl-pixel-buffer.c             |    2 +-
 tests/interactive/Makefile.am                      |   58 +-
 tests/micro-bench/test-picking.c                   |    8 +-
 64 files changed, 7857 insertions(+), 16 deletions(-)
---
diff --cc clutter/clutter-stage.h
index 15531c9,5971fcd..6dcdb6b
--- a/clutter/clutter-stage.h
+++ b/clutter/clutter-stage.h
@@@ -237,9 -236,6 +237,8 @@@ void                  clutter_stage_set
                                                         gboolean      accept_focus);
  gboolean              clutter_stage_get_accept_focus  (ClutterStage *stage);
  
 +void                  clutter_stage_get_redraw_clip_bounds    (ClutterStage    *stage,
 +                                                               cairo_rectangle_int_t *clip);
- 
  void                  clutter_stage_set_motion_events_enabled (ClutterStage *stage,
                                                                 gboolean      enabled);
  gboolean              clutter_stage_get_motion_events_enabled (ClutterStage *stage);