clutter 2.2.0-x86-mingw32 → 2.2.1-x86-mingw32

data/vendor/local/include/clutter-1.0/clutter/clutter-units.h

@@ -70,31 +70,45 @@ struct _ClutterUnits
   gint64 __padding_2;
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType           clutter_units_get_type         (void) G_GNUC_CONST;
+CLUTTER_AVAILABLE_IN_1_0
 ClutterUnitType clutter_units_get_unit_type    (const ClutterUnits *units);
+CLUTTER_AVAILABLE_IN_1_0
 gfloat          clutter_units_get_unit_value   (const ClutterUnits *units);
 
+CLUTTER_AVAILABLE_IN_1_0
 ClutterUnits *  clutter_units_copy             (const ClutterUnits *units);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_free             (ClutterUnits       *units);
 
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_pixels      (ClutterUnits       *units,
                                                 gint                px);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_em          (ClutterUnits       *units,
                                                 gfloat              em);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_em_for_font (ClutterUnits       *units,
                                                 const gchar        *font_name,
                                                 gfloat              em);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_mm          (ClutterUnits       *units,
                                                 gfloat              mm);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_cm          (ClutterUnits       *units,
                                                 gfloat              cm);
+CLUTTER_AVAILABLE_IN_1_0
 void            clutter_units_from_pt          (ClutterUnits       *units,
                                                 gfloat              pt);
 
+CLUTTER_AVAILABLE_IN_1_0
 gfloat          clutter_units_to_pixels        (ClutterUnits       *units);
 
+CLUTTER_AVAILABLE_IN_1_0
 gboolean        clutter_units_from_string      (ClutterUnits       *units,
                                                 const gchar        *str);
+CLUTTER_AVAILABLE_IN_1_0
 gchar *         clutter_units_to_string        (const ClutterUnits *units);
 
 /* shorthands for the constructors */
@@ -146,8 +160,10 @@ struct _ClutterParamSpecUnits
   gfloat maximum;
 };
 
+CLUTTER_AVAILABLE_IN_1_0
 GType clutter_param_units_get_type (void) G_GNUC_CONST;
 
+CLUTTER_AVAILABLE_IN_1_0
 GParamSpec *            clutter_param_spec_units (const gchar        *name,
                                                   const gchar        *nick,
                                                   const gchar        *blurb,
@@ -157,8 +173,10 @@ GParamSpec *            clutter_param_spec_units (const gchar        *name,
                                                   gfloat              default_value,
                                                   GParamFlags         flags);
 
+CLUTTER_AVAILABLE_IN_1_0
 void                    clutter_value_set_units  (GValue             *value,
                                                   const ClutterUnits *units);
+CLUTTER_AVAILABLE_IN_1_0
 const ClutterUnits *    clutter_value_get_units  (const GValue       *value);
 
 G_END_DECLS

data/vendor/local/include/clutter-1.0/clutter/clutter-version.h

@@ -89,21 +89,21 @@ G_BEGIN_DECLS
  *
  * The minor version of the Clutter library (2, if %CLUTTER_VERSION is 1.2.3)
  */
-#define CLUTTER_MINOR_VERSION   (16)
+#define CLUTTER_MINOR_VERSION   (20)
 
 /**
  * CLUTTER_MICRO_VERSION:
  *
  * The micro version of the Clutter library (3, if %CLUTTER_VERSION is 1.2.3)
  */
-#define CLUTTER_MICRO_VERSION   (4)
+#define CLUTTER_MICRO_VERSION   (0)
 
 /**
  * CLUTTER_VERSION:
  *
  * The full version of the Clutter library, like 1.2.3
  */
-#define CLUTTER_VERSION         1.16.4
+#define CLUTTER_VERSION         1.20.0
 
 /**
  * CLUTTER_VERSION_S:
@@ -111,7 +111,7 @@ G_BEGIN_DECLS
  * The full version of the Clutter library, in string form (suited for
  * string concatenation)
  */
-#define CLUTTER_VERSION_S       "1.16.4"
+#define CLUTTER_VERSION_S       "1.20.0"
 
 /**
  * CLUTTER_VERSION_HEX:
@@ -210,10 +210,30 @@ G_BEGIN_DECLS
  * A macro that evaluates to the 1.16 version of Clutter, in a format
  * that can be used by the C pre-processor.
  *
- * Since: 1.14
+ * Since: 1.16
  */
 #define CLUTTER_VERSION_1_16    (G_ENCODE_VERSION (1, 16))
 
+/**
+ * CLUTTER_VERSION_1_18:
+ *
+ * A macro that evaluates to the 1.18 version of Clutter, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.18
+ */
+#define CLUTTER_VERSION_1_18    (G_ENCODE_VERSION (1, 18))
+
+/**
+ * CLUTTER_VERSION_1_20:
+ *
+ * A macro that evaluates to the 1.18 version of Clutter, in a format
+ * that can be used by the C pre-processor.
+ *
+ * Since: 1.20
+ */
+#define CLUTTER_VERSION_1_20    (G_ENCODE_VERSION (1, 20))
+
 /* evaluates to the current stable version; for development cycles,
  * this means the next stable target
  */
@@ -244,19 +264,22 @@ G_BEGIN_DECLS
          (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION > (minor)) || \
          (CLUTTER_MAJOR_VERSION == (major) && CLUTTER_MINOR_VERSION == (minor) && CLUTTER_MICRO_VERSION >= (micro)))
 
-/* annotation for exported variables
- *
- * XXX: this has to be defined here because clutter-macro.h imports this
- * header file.
- */
-#ifdef _MSC_VER
+#ifndef _CLUTTER_EXTERN
+#define _CLUTTER_EXTERN extern
+#endif
+
+#ifdef CLUTTER_WINDOWING_WIN32
 # ifdef CLUTTER_COMPILATION
-#  define CLUTTER_VAR __declspec(dllexport)
+#  ifdef DLL_EXPORT
+#   define CLUTTER_VAR __declspec(dllexport)
+#  else
+#   define CLUTTER_VAR extern
+#  endif
 # else
-#  define CLUTTER_VAR extern __declspec(dllimport)
+#  define CLUTTER_VAR __declspec(dllimport)
 # endif
 #else
-# define CLUTTER_VAR extern
+# define CLUTTER_VAR _CLUTTER_EXTERN
 #endif
 
 /**
@@ -301,12 +324,6 @@ CLUTTER_VAR const guint clutter_minor_version;
  */
 CLUTTER_VAR const guint clutter_micro_version;
 
-gboolean clutter_check_version (guint major,
-                                guint minor,
-                                guint micro);
-
-gboolean clutter_check_windowing_backend (const char *backend_type);
-
 G_END_DECLS
 
 #endif /* __CLUTTER_VERSION_H__ */

data/vendor/local/include/clutter-1.0/clutter/clutter-zoom-action.h

@@ -49,7 +49,7 @@ typedef struct _ClutterZoomActionClass          ClutterZoomActionClass;
 /**
  * ClutterZoomAction:
  *
- * The <structname>ClutterZoomAction</structname> structure contains only
+ * The #ClutterZoomAction structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.12
@@ -66,7 +66,7 @@ struct _ClutterZoomAction
  * ClutterZoomActionClass:
  * @zoom: class handler of the #ClutterZoomAction::zoom signal
  *
- * The <structname>ClutterZoomActionClass</structname> structure contains
+ * The #ClutterZoomActionClass structure contains
  * only private data
  *
  * Since: 1.12

data/vendor/local/include/clutter-1.0/clutter/clutter.h

@@ -61,6 +61,7 @@
 #include "clutter-drop-action.h"
 #include "clutter-effect.h"
 #include "clutter-enums.h"
+#include "clutter-enum-types.h"
 #include "clutter-event.h"
 #include "clutter-feature.h"
 #include "clutter-fixed-layout.h"
@@ -98,8 +99,8 @@
 #include "clutter-snap-constraint.h"
 #include "clutter-stage.h"
 #include "clutter-stage-manager.h"
-#include "clutter-table-layout.h"
 #include "clutter-tap-action.h"
+#include "clutter-test-utils.h"
 #include "clutter-texture.h"
 #include "clutter-text.h"
 #include "clutter-timeline.h"
@@ -109,8 +110,6 @@
 #include "clutter-version.h"
 #include "clutter-zoom-action.h"
 
-#include "clutter-enum-types.h"
-
 #include "clutter-deprecated.h"
 
 #undef __CLUTTER_H_INSIDE__

data/vendor/local/include/clutter-1.0/clutter/deprecated/clutter-fixed.h

@@ -75,6 +75,7 @@ struct _ClutterParamSpecFixed
   CoglFixed default_value;
 };
 
+CLUTTER_DEPRECATED_IN_1_10
 GType        clutter_param_fixed_get_type (void) G_GNUC_CONST;
 
 CLUTTER_DEPRECATED_IN_1_10_FOR(g_value_set_int)

data/vendor/local/include/clutter-1.0/clutter/deprecated/clutter-state.h

@@ -42,7 +42,7 @@ typedef struct _ClutterStateClass   ClutterStateClass;
 /**
  * ClutterStateKey:
  *
- * <structname>ClutterStateKey</structname> is an opaque structure whose
+ * #ClutterStateKey is an opaque structure whose
  * members cannot be accessed directly
  *
  * Since: 1.4
@@ -52,7 +52,7 @@ typedef struct _ClutterStateKey     ClutterStateKey;
 /**
  * ClutterState:
  *
- * The <structname>ClutterState</structname> structure contains only
+ * The #ClutterState structure contains only
  * private data and should be accessed using the provided API
  *
  * Since: 1.4
@@ -68,7 +68,7 @@ struct _ClutterState
  * ClutterStateClass:
  * @completed: class handler for the #ClutterState::completed signal
  *
- * The <structname>ClutterStateClass</structname> structure contains
+ * The #ClutterStateClass structure contains
  * only private data
  *
  * Since: 1.4

data/vendor/local/include/clutter-1.0/clutter/{clutter-table-layout.h → deprecated/clutter-table-layout.h}

@@ -54,6 +54,8 @@ typedef struct _ClutterTableLayoutClass           ClutterTableLayoutClass;
  * and should be accessed using the provided API
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 struct _ClutterTableLayout
 {
@@ -70,6 +72,8 @@ struct _ClutterTableLayout
  * data and should be accessed using the provided API
  *
  * Since: 1.4
+ *
+ * Deprecated: 1.18: Use #ClutterGridLayout instead
  */
 struct _ClutterTableLayoutClass
 {
@@ -77,26 +81,35 @@ struct _ClutterTableLayoutClass
   ClutterLayoutManagerClass parent_class;
 };
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_type)
 GType clutter_table_layout_get_type (void) G_GNUC_CONST;
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_new)
 ClutterLayoutManager *clutter_table_layout_new                 (void);
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_attach)
 void                  clutter_table_layout_pack                (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                   column,
                                                                 gint                   row);
 
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_set_column_spacing)
 void                  clutter_table_layout_set_column_spacing  (ClutterTableLayout    *layout,
                                                                 guint                  spacing);
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_set_row_spacing)
 void                  clutter_table_layout_set_row_spacing     (ClutterTableLayout    *layout,
                                                                 guint                  spacing);
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_column_spacing)
 guint                 clutter_table_layout_get_column_spacing  (ClutterTableLayout    *layout);
+CLUTTER_DEPRECATED_IN_1_18_FOR (clutter_grid_layout_get_row_spacing)
 guint                 clutter_table_layout_get_row_spacing     (ClutterTableLayout    *layout);
 
+CLUTTER_DEPRECATED_IN_1_18
 void                  clutter_table_layout_set_span            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                   column_span,
                                                                 gint                   row_span);
+CLUTTER_DEPRECATED_IN_1_18
 void                  clutter_table_layout_get_span            (ClutterTableLayout    *layout,
                                                                 ClutterActor          *actor,
                                                                 gint                  *column_span,
@@ -133,7 +146,9 @@ void                  clutter_table_layout_get_expand          (ClutterTableLayo
                                                                 gboolean              *x_expand,
                                                                 gboolean              *y_expand);
 
+CLUTTER_DEPRECATED_IN_1_18
 gint                  clutter_table_layout_get_row_count       (ClutterTableLayout    *layout);
+CLUTTER_DEPRECATED_IN_1_18
 gint                  clutter_table_layout_get_column_count    (ClutterTableLayout    *layout);
 
 CLUTTER_DEPRECATED_IN_1_12

data/vendor/local/include/clutter-1.0/clutter/deprecated/clutter-timeout-pool.h

@@ -42,7 +42,7 @@ G_BEGIN_DECLS
 /**
  * ClutterTimeoutPool: (skip)
  *
- * <structname>ClutterTimeoutPool</structname> is an opaque structure
+ * #ClutterTimeoutPool is an opaque structure
  * whose members cannot be directly accessed.
  *
  * Since: 0.6

data/vendor/local/include/clutter-1.0/clutter/win32/clutter-win32.h

@@ -43,14 +43,19 @@
 
 G_BEGIN_DECLS
 
+CLUTTER_AVAILABLE_IN_ALL
 HWND          clutter_win32_get_stage_window        (ClutterStage *stage);
+CLUTTER_AVAILABLE_IN_ALL
 ClutterStage *clutter_win32_get_stage_from_window   (HWND          hwnd);
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean      clutter_win32_set_stage_foreign       (ClutterStage *stage,
                                                      HWND          hwnd);
 
+CLUTTER_AVAILABLE_IN_ALL
 void          clutter_win32_disable_event_retrieval (void);
 
+CLUTTER_AVAILABLE_IN_ALL
 gboolean      clutter_win32_handle_event            (const MSG *msg);
 
 G_END_DECLS

data/vendor/local/include/cogl/cogl-pango/cogl-pango.h

@@ -1,24 +1,30 @@
 /*
  * Cogl
  *
- * An object oriented GL/GLES Abstraction/Utility Layer
+ * A Low Level GPU Graphics and Utilities API
  *
  * Copyright (C) 2008 OpenedHand
  * Copyright (C) 2012 Intel Corporation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
  * Authors:
  *   Neil Roberts <neil@linux.intel.com>
@@ -32,7 +38,20 @@
 #include <glib-object.h>
 #include <pango/pango.h>
 #include <pango/pangocairo.h>
+
+/* XXX: Currently this header may be included both as an internal
+ * header (within the cogl-pango implementation) and as a public
+ * header.
+ *
+ * Since <cogl/cogl.h> should not be included for internal use we
+ * determine the current context and switch between including cogl.h
+ * or specific internal cogl headers here...
+ */
+#ifndef COGL_COMPILATION
 #include <cogl/cogl.h>
+#else
+#include "cogl/cogl-context.h"
+#endif
 
 COGL_BEGIN_DECLS
 

data/vendor/local/include/cogl/cogl-path/cogl-path-types.h

@@ -1,23 +1,29 @@
 /*
  * Cogl
  *
- * An object oriented GL/GLES Abstraction/Utility Layer
+ * A Low Level GPU Graphics and Utilities API
  *
  * Copyright (C) 2008,2009,2013 Intel Corporation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see
- * <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  *
  *
  */
@@ -35,8 +41,6 @@ COGL_BEGIN_DECLS
 
 typedef struct _CoglPath CoglPath;
 
-#define COGL_PATH(obj) ((CoglPath *)(obj))
-
 /**
  * CoglPathFillRule:
  * @COGL_PATH_FILL_RULE_NON_ZERO: Each time the line crosses an edge of