diff --git a/ruamoko/cl_menu/options_util.qc b/ruamoko/cl_menu/options_util.qc index 1958a35d5..f7ca3fe5a 100644 --- a/ruamoko/cl_menu/options_util.qc +++ b/ruamoko/cl_menu/options_util.qc @@ -24,6 +24,7 @@ Boston, MA 02111-1307, USA */ +#include "debug.h" #include "cvar.h" #include "draw.h" #include "system.h" @@ -437,7 +438,7 @@ } } @end -void traceon () = #0; + @implementation ProxyView -(id)initWithBounds:(Rect)aRect title:(View)aTitle view:(View)aView @@ -462,12 +463,11 @@ void traceon () = #0; [view draw]; } -- (void) setBasePos: (Point) pos +- (void) setBasePosFromView: (View) aview { - [super setBasePos:pos]; - local Point point = {xabs, yabs}; - [title setBasePos:point]; - [view setBasePos:point]; + [super setBasePosFromView:aview]; + [title setBasePosFromView:self]; + [view setBasePosFromView:self]; } @end diff --git a/ruamoko/gui/Group.r b/ruamoko/gui/Group.r index 4e5f41b4b..d3cf023ad 100644 --- a/ruamoko/gui/Group.r +++ b/ruamoko/gui/Group.r @@ -37,10 +37,16 @@ [self setBasePos: x y:y]; } -- (void) setBasePos: (Point) pos +- (void) setBasePos: (integer) x y: (integer) y { - [super setBasePos:pos]; - local Point point = {xabs, yabs}; + [super setBasePos: x y:y]; + local SEL sel = @selector (setBasePosFromView:); + [views makeObjectsPerformSelector:sel withObject:self]; +} + +- (void) setBasePosFromView: (View) view +{ + [super setBasePosFromView:view]; local SEL sel = @selector (setBasePosFromView:); [views makeObjectsPerformSelector:sel withObject:self]; } diff --git a/ruamoko/include/gui/Group.h b/ruamoko/include/gui/Group.h index 5dd37171d..9e41f8911 100644 --- a/ruamoko/include/gui/Group.h +++ b/ruamoko/include/gui/Group.h @@ -13,7 +13,6 @@ - (View) addView: (View)aView; - (id) addViews: (Array)viewlist; - (void) moveTo: (integer)x y:(integer)y; -- (void) setBasePos: (Point)pos; - (void) draw; @end