diff options
| -rw-r--r-- | src/emacsgtkfixed.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c index 7f8d8939d42..7b93319e978 100644 --- a/src/emacsgtkfixed.c +++ b/src/emacsgtkfixed.c | |||
| @@ -52,7 +52,7 @@ G_DEFINE_TYPE (EmacsFixed, emacs_fixed, GTK_TYPE_FIXED) | |||
| 52 | /* //TODO */ | 52 | /* //TODO */ |
| 53 | /* // if child is an xwidget, find its clipping area and modify allocation */ | 53 | /* // if child is an xwidget, find its clipping area and modify allocation */ |
| 54 | 54 | ||
| 55 | /* struct xwidget_view* xv = (struct xwidget_viev*) g_object_get_data (G_OBJECT (child), XG_XWIDGET_VIEW); */ | 55 | /* struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (child), XG_XWIDGET_VIEW); */ |
| 56 | /* printf("aloc callback %d %s\n", xv, gtk_widget_get_name(child)); */ | 56 | /* printf("aloc callback %d %s\n", xv, gtk_widget_get_name(child)); */ |
| 57 | /* if(xv){ */ | 57 | /* if(xv){ */ |
| 58 | /* printf(" allocation modification for xw\n"); */ | 58 | /* printf(" allocation modification for xw\n"); */ |
| @@ -79,7 +79,12 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, | |||
| 79 | EmacsFixedClass *klass; | 79 | EmacsFixedClass *klass; |
| 80 | GtkWidgetClass *parent_class; | 80 | GtkWidgetClass *parent_class; |
| 81 | struct GtkFixedPrivateL* priv; | 81 | struct GtkFixedPrivateL* priv; |
| 82 | 82 | GtkFixedChild *child; | |
| 83 | GtkAllocation child_allocation; | ||
| 84 | GtkRequisition child_requisition; | ||
| 85 | GList *children; | ||
| 86 | struct xwidget_view* xv; | ||
| 87 | |||
| 83 | // printf(" emacs_fixed_gtk_widget_size_allocate\n"); | 88 | // printf(" emacs_fixed_gtk_widget_size_allocate\n"); |
| 84 | klass = EMACS_FIXED_GET_CLASS (widget); | 89 | klass = EMACS_FIXED_GET_CLASS (widget); |
| 85 | parent_class = g_type_class_peek_parent (klass); | 90 | parent_class = g_type_class_peek_parent (klass); |
| @@ -98,10 +103,6 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, | |||
| 98 | 103 | ||
| 99 | //GtkFixed *fixed = GTK_FIXED (widget); | 104 | //GtkFixed *fixed = GTK_FIXED (widget); |
| 100 | //GtkFixedPrivate *priv = fixed->priv; | 105 | //GtkFixedPrivate *priv = fixed->priv; |
| 101 | GtkFixedChild *child; | ||
| 102 | GtkAllocation child_allocation; | ||
| 103 | GtkRequisition child_requisition; | ||
| 104 | GList *children; | ||
| 105 | 106 | ||
| 106 | 107 | ||
| 107 | gtk_widget_set_allocation (widget, allocation); | 108 | gtk_widget_set_allocation (widget, allocation); |
| @@ -140,7 +141,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, | |||
| 140 | 141 | ||
| 141 | 142 | ||
| 142 | 143 | ||
| 143 | struct xwidget_view* xv = (struct xwidget_viev*) g_object_get_data (G_OBJECT (child->widget), XG_XWIDGET_VIEW); | 144 | xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (child->widget), XG_XWIDGET_VIEW); |
| 144 | //printf("aloc callback %d %s\n", xv, gtk_widget_get_name(child)); | 145 | //printf("aloc callback %d %s\n", xv, gtk_widget_get_name(child)); |
| 145 | if(xv){ | 146 | if(xv){ |
| 146 | //gtk_widget_get_allocation(child, &child_allocation); | 147 | //gtk_widget_get_allocation(child, &child_allocation); |