diff options
| author | Joakim Verona <joakim@verona.se> | 2011-09-07 09:53:40 +0200 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2011-09-07 09:53:40 +0200 |
| commit | 467bb69a7e1edc108df5589d24ae478269de4dec (patch) | |
| tree | afcbeedc28aafad32b2685873c93d58b2760edc6 | |
| parent | be81ea9a3709c042369aa6ffc6fee83448677251 (diff) | |
| download | emacs-467bb69a7e1edc108df5589d24ae478269de4dec.tar.gz | |
warnings
| -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) /* //TODO */ /* // if child is an xwidget, find its clipping area and modify allocation */ -/* struct xwidget_view* xv = (struct xwidget_viev*) g_object_get_data (G_OBJECT (child), XG_XWIDGET_VIEW); */ +/* struct xwidget_view* xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (child), XG_XWIDGET_VIEW); */ /* printf("aloc callback %d %s\n", xv, gtk_widget_get_name(child)); */ /* if(xv){ */ /* printf(" allocation modification for xw\n"); */ @@ -79,7 +79,12 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, EmacsFixedClass *klass; GtkWidgetClass *parent_class; struct GtkFixedPrivateL* priv; - + GtkFixedChild *child; + GtkAllocation child_allocation; + GtkRequisition child_requisition; + GList *children; + struct xwidget_view* xv; + // printf(" emacs_fixed_gtk_widget_size_allocate\n"); klass = EMACS_FIXED_GET_CLASS (widget); parent_class = g_type_class_peek_parent (klass); @@ -98,10 +103,6 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, //GtkFixed *fixed = GTK_FIXED (widget); //GtkFixedPrivate *priv = fixed->priv; - GtkFixedChild *child; - GtkAllocation child_allocation; - GtkRequisition child_requisition; - GList *children; gtk_widget_set_allocation (widget, allocation); @@ -140,7 +141,7 @@ static void emacs_fixed_gtk_widget_size_allocate (GtkWidget *widget, - struct xwidget_view* xv = (struct xwidget_viev*) g_object_get_data (G_OBJECT (child->widget), XG_XWIDGET_VIEW); + xv = (struct xwidget_view*) g_object_get_data (G_OBJECT (child->widget), XG_XWIDGET_VIEW); //printf("aloc callback %d %s\n", xv, gtk_widget_get_name(child)); if(xv){ //gtk_widget_get_allocation(child, &child_allocation); |