2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>

* clutter/eglnative/clutter-stage-egl.c: Remove a duplicate
	get_preferred_width() implementation. (thanks to Iain Holmes)
This commit is contained in:
Emmanuele Bassi 2008-06-11 17:32:22 +00:00
parent 3d1d677902
commit 00a1e0c3ee
2 changed files with 5 additions and 15 deletions

View File

@ -1,3 +1,8 @@
2008-06-11 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/eglnative/clutter-stage-egl.c: Remove a duplicate
get_preferred_width() implementation. (thanks to Iain Holmes)
2008-06-11 Neil Roberts <neil@o-hand.com> 2008-06-11 Neil Roberts <neil@o-hand.com>
* clutter/clutter-actor.c (clutter_actor_allocate): Fixed the * clutter/clutter-actor.c (clutter_actor_allocate): Fixed the

View File

@ -218,21 +218,6 @@ clutter_stage_egl_get_preferred_width (ClutterActor *self,
*natural_width_p = CLUTTER_UNITS_FROM_DEVICE (stage_egl->surface_width); *natural_width_p = CLUTTER_UNITS_FROM_DEVICE (stage_egl->surface_width);
} }
static void
clutter_stage_egl_get_preferred_width (ClutterActor *self,
ClutterUnit for_height,
ClutterUnit *min_width_p,
ClutterUnit *natural_width_p)
{
ClutterStageEGL *stage_egl = CLUTTER_STAGE_EGL (self);
if (min_width_p)
*min_width_p = CLUTTER_UNITS_FROM_DEVICE (stage_egl->surface_width);
if (natural_width_p)
*natural_width_p = CLUTTER_UNITS_FROM_DEVICE (stage_egl->surface_width);
}
static void static void
clutter_stage_egl_get_preferred_height (ClutterActor *self, clutter_stage_egl_get_preferred_height (ClutterActor *self,
ClutterUnit for_width, ClutterUnit for_width,