[cluttermm] Revert "main.h : Removed deprecated methods."
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [cluttermm] Revert "main.h : Removed deprecated methods."
- Date: Sat, 20 Aug 2016 22:28:27 +0000 (UTC)
commit 237ac1d58f0824fd986437af632759ffa2a50674
Author: Murray Cumming <murrayc murrayc com>
Date: Sun Aug 21 00:19:37 2016 +0200
Revert "main.h : Removed deprecated methods."
This reverts commit 4566aab398627867b6f6e58e014788e2b13e2206.
clutter/cluttermm/main.cc | 10 ++++++++++
clutter/cluttermm/main.h | 14 ++++++++++++--
2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/clutter/cluttermm/main.cc b/clutter/cluttermm/main.cc
index 4f99e05..9e1c8f8 100644
--- a/clutter/cluttermm/main.cc
+++ b/clutter/cluttermm/main.cc
@@ -85,6 +85,16 @@ void clear_glyph_cache()
{
clutter_clear_glyph_cache();
}
+
+void set_font_flags(FontFlags flags)
+{
+ clutter_set_font_flags((ClutterFontFlags)flags);
+}
+
+FontFlags get_font_flags()
+{
+ return (FontFlags)clutter_get_font_flags();
+}
#endif //CLUTTERMM_DISABLE_DEPRECATED
diff --git a/clutter/cluttermm/main.h b/clutter/cluttermm/main.h
index 7dc3797..5a92dea 100644
--- a/clutter/cluttermm/main.h
+++ b/clutter/cluttermm/main.h
@@ -88,7 +88,6 @@ void set_default_frame_rate(guint frames_per_sec);
guint get_default_frame_rate();
#ifndef CLUTTERMM_DISABLE_DEPRECATED
-
/** Sets whether per-actor motion events should be enabled or not
* (the default is to enable them).
*
@@ -119,9 +118,19 @@ bool get_motion_events_enabled();
*
* @deprecated Use get_font_map() and cogl_pango_font_map_clear_glyph_cache() instead.
*/
+void clear_glyph_cache();
+//TODO: Documentation:
-void clear_glyph_cache();
+/**
+ * @deprecated Use Backend::set_font_options() and the cairo_font_option_t API.
+ */
+void set_font_flags(FontFlags flags);
+
+/**
+ * @deprecated Use Backend::get_font_options() and the cairo_font_option_t API.
+ */
+FontFlags get_font_flags();
#endif //CLUTTERMM_DISABLE_DEPRECATED
Glib::RefPtr<Pango::FontMap> get_font_map();
@@ -198,3 +207,4 @@ void do_event(Event* event);
} //namespace Clutter
#endif //_LIBCLUTTERMM_MAIN_H
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]