[gir-repository] Fix for addition of gtk_widget_get_allocation() to GTK+
- From: Owen Taylor <otaylor src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gir-repository] Fix for addition of gtk_widget_get_allocation() to GTK+
- Date: Fri, 14 Aug 2009 22:21:15 +0000 (UTC)
commit 6ddf9bcda6bdb117c7caa906e6cbdcd8c52b7bc1
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Fri Aug 14 18:19:04 2009 -0400
Fix for addition of gtk_widget_get_allocation() to GTK+
gtk_widget_get_allocation() was recently added to GTK+, so having
a custom function barging into the GTK+ namespace just doesn't work
any more.
Remove the custom gtk_widget_get_allocation(), add annotations
for the new gtk_widget_get_annotation().
Based on patch from Vincent Untz
http://bugzilla.gnome.org/show_bug.cgi?id=590913
gir/Gtk-custom.c | 12 ++++++------
gir/Gtk-custom.h | 1 -
2 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/gir/Gtk-custom.c b/gir/Gtk-custom.c
index 16e3ce3..0b28d2e 100644
--- a/gir/Gtk-custom.c
+++ b/gir/Gtk-custom.c
@@ -56,12 +56,6 @@ gtk_requisition_get_height(const GtkRequisition *req)
return req->height;
}
-const GtkAllocation*
-gtk_widget_get_allocation(const GtkWidget *wdg)
-{
- return &wdg->allocation;
-}
-
GtkAllocation*
gtk_allocation_new(void)
{
@@ -1538,6 +1532,12 @@ gtk_dialog_get_vbox(GtkDialog *dialog)
*/
/**
+ * gtk_widget_get_allocation:
+ * @widget: the widget
+ * @allocation: (out): location to store the allocation
+ */
+
+/**
* gtk_widget_get_accessible:
*
* Return value: (transfer none):
diff --git a/gir/Gtk-custom.h b/gir/Gtk-custom.h
index a19cd03..b656ae9 100644
--- a/gir/Gtk-custom.h
+++ b/gir/Gtk-custom.h
@@ -15,7 +15,6 @@ GtkWidgetFlags gtk_widget_get_flags (GtkWidget *wid
GtkRequisition* gtk_requisition_new (void);
int gtk_requisition_get_width (const GtkRequisition *req);
int gtk_requisition_get_height (const GtkRequisition *req);
-const GtkAllocation* gtk_widget_get_allocation (const GtkWidget *wdg);
GtkAllocation* gtk_allocation_new (void);
int gtk_allocation_get_x (const GtkAllocation *all);
int gtk_allocation_get_y (const GtkAllocation *all);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]