[gtk+] GtkPopover: use GdkRectangle instead of cairo_rectangle_int_t
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkPopover: use GdkRectangle instead of cairo_rectangle_int_t
- Date: Sat, 8 Feb 2014 20:53:30 +0000 (UTC)
commit 552c29b488ecd7bcc3303dd5514ce6dbfff04437
Author: Juan R. GarcĂa Blanco <juanrgar gmail com>
Date: Tue Feb 4 22:33:25 2014 +0100
GtkPopover: use GdkRectangle instead of cairo_rectangle_int_t
cairo_rectangle_int_t replaced by GdkRectangle whenever it is used.
Also, rect parameter in public method gtk_popover_set_pointing_to
made const.
Bug #723394
gtk/gtkpopover.c | 24 ++++++++++++------------
gtk/gtkpopover.h | 6 +++---
2 files changed, 15 insertions(+), 15 deletions(-)
---
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 0ac9e22..6c18d45 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -90,7 +90,7 @@ struct _GtkPopoverPrivate
GtkAdjustment *vadj;
GtkAdjustment *hadj;
GtkMenuTracker *tracker;
- cairo_rectangle_int_t pointing_to;
+ GdkRectangle pointing_to;
guint hierarchy_changed_id;
guint size_allocate_id;
guint unmap_id;
@@ -320,11 +320,11 @@ gtk_popover_unmap (GtkWidget *widget)
}
static void
-gtk_popover_get_pointed_to_coords (GtkPopover *popover,
- cairo_rectangle_int_t *rect_out)
+gtk_popover_get_pointed_to_coords (GtkPopover *popover,
+ GdkRectangle *rect_out)
{
GtkPopoverPrivate *priv = popover->priv;
- cairo_rectangle_int_t rect;
+ GdkRectangle rect;
if (!rect_out)
return;
@@ -374,7 +374,7 @@ gtk_popover_get_gap_coords (GtkPopover *popover,
{
GtkWidget *widget = GTK_WIDGET (popover);
GtkPopoverPrivate *priv = popover->priv;
- cairo_rectangle_int_t rect;
+ GdkRectangle rect;
gint base, tip, tip_pos;
gint initial_x, initial_y;
gint tip_x, tip_y;
@@ -611,7 +611,7 @@ gtk_popover_update_shape (GtkPopover *popover)
static void
_gtk_popover_update_child_visible (GtkPopover *popover)
{
- cairo_rectangle_int_t rect;
+ GdkRectangle rect;
GtkAllocation allocation;
GtkPopoverPrivate *priv;
GtkWidget *parent;
@@ -643,7 +643,7 @@ static void
gtk_popover_update_position (GtkPopover *popover)
{
GtkAllocation window_alloc;
- cairo_rectangle_int_t rect;
+ GdkRectangle rect;
GtkPopoverPrivate *priv;
GtkPositionType pos;
GtkRequisition req;
@@ -1566,8 +1566,8 @@ gtk_popover_update_relative_to (GtkPopover *popover,
}
static void
-gtk_popover_update_pointing_to (GtkPopover *popover,
- cairo_rectangle_int_t *pointing_to)
+gtk_popover_update_pointing_to (GtkPopover *popover,
+ const GdkRectangle *pointing_to)
{
GtkPopoverPrivate *priv;
@@ -1669,7 +1669,7 @@ gtk_popover_get_relative_to (GtkPopover *popover)
**/
void
gtk_popover_set_pointing_to (GtkPopover *popover,
- cairo_rectangle_int_t *rect)
+ const GdkRectangle *rect)
{
g_return_if_fail (GTK_IS_POPOVER (popover));
g_return_if_fail (rect != NULL);
@@ -1691,8 +1691,8 @@ gtk_popover_set_pointing_to (GtkPopover *popover,
* Returns: %TRUE if a rectangle to point to was set.
**/
gboolean
-gtk_popover_get_pointing_to (GtkPopover *popover,
- cairo_rectangle_int_t *rect)
+gtk_popover_get_pointing_to (GtkPopover *popover,
+ GdkRectangle *rect)
{
GtkPopoverPrivate *priv;
diff --git a/gtk/gtkpopover.h b/gtk/gtkpopover.h
index 5343af1..8310377 100644
--- a/gtk/gtkpopover.h
+++ b/gtk/gtkpopover.h
@@ -71,11 +71,11 @@ GDK_AVAILABLE_IN_3_12
GtkWidget * gtk_popover_get_relative_to (GtkPopover *popover);
GDK_AVAILABLE_IN_3_12
-void gtk_popover_set_pointing_to (GtkPopover *popover,
- cairo_rectangle_int_t *rect);
+void gtk_popover_set_pointing_to (GtkPopover *popover,
+ const GdkRectangle *rect);
GDK_AVAILABLE_IN_3_12
gboolean gtk_popover_get_pointing_to (GtkPopover *popover,
- cairo_rectangle_int_t *rect);
+ GdkRectangle *rect);
GDK_AVAILABLE_IN_3_12
void gtk_popover_set_position (GtkPopover *popover,
GtkPositionType position);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]