summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--src/glade-widget.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8929768c..79dec1e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2004-05-05 Damon Chaplin <damon@gnome.org>
+ * src/glade-widget.c (glade_widget_find_inside_container): don't
+ accept placeholders. They are handled separately, using their own
+ signal handlers. This avoids a crash, though there is still an odd
+ bug when trying to select the top-left placeholder in a table.
+
+2004-05-05 Damon Chaplin <damon@gnome.org>
+
* src/glade-widget.c (glade_widget_find_deepest_child_at_position):
if we found a widget (data.found), but it isn't a container, just
return it. It was ignoring it and returning its parent before.
diff --git a/src/glade-widget.c b/src/glade-widget.c
index 4b53331b..d64559fb 100644
--- a/src/glade-widget.c
+++ b/src/glade-widget.c
@@ -507,7 +507,7 @@ glade_widget_find_inside_container (GtkWidget *widget, GladeFindInContainerData
gtk_widget_translate_coordinates (data->toplevel, widget, data->x, data->y, &x, &y);
if (x >= 0 && x < widget->allocation.width && y >= 0 && y < widget->allocation.height &&
- (glade_widget_get_from_gtk_widget (widget) || GLADE_IS_PLACEHOLDER (widget)))
+ (glade_widget_get_from_gtk_widget (widget)))
data->found = widget;
}