[gtk+: 54/54] Merge branch 'popovers'
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+: 54/54] Merge branch 'popovers'
- Date: Wed, 22 Jan 2014 17:49:21 +0000 (UTC)
commit ce32476f3235a653eb3e6205df733a0d60d902f8
Merge: 89a51bd 074e17e
Author: Carlos Garnacho <carlosg gnome org>
Date: Wed Jan 22 18:42:29 2014 +0100
Merge branch 'popovers'
demos/gtk-demo/Makefile.am | 1 +
demos/gtk-demo/demo.gresource.xml | 4 +
demos/gtk-demo/popover.c | 185 ++++
demos/gtk-demo/popover.ui | 103 +++
docs/reference/gtk/gtk-docs.sgml | 1 +
docs/reference/gtk/gtk3-sections.txt | 15 +
docs/reference/gtk/gtk3.types.in | 1 +
gtk/Makefile.am | 6 +-
gtk/gtk.h | 1 +
gtk/gtkbubblewindow.c | 1242 -------------------------
gtk/gtkbubblewindowprivate.h | 81 --
gtk/gtkentry.c | 129 +++-
gtk/gtkmagnifier.c | 269 ++++++
gtk/gtkmagnifierprivate.h | 64 ++
gtk/gtkmain.c | 6 +
gtk/gtkpixelcache.c | 15 +-
gtk/gtkpopover.c | 1679 ++++++++++++++++++++++++++++++++++
gtk/gtkpopover.h | 84 ++
gtk/gtktexthandle.c | 587 ++++++------
gtk/gtktextview.c | 79 ++-
gtk/gtkwindow.c | 449 +++++++++
gtk/gtkwindowprivate.h | 16 +
22 files changed, 3358 insertions(+), 1659 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]