From 7c23817cbe18e4c18b88bbcd23e02106b094e618 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Sun, 10 Jul 2011 18:57:24 +0900 Subject: [PATCH] Some changes I missed from the previous commit. --- ruamoko/gui/Group.r | 5 ----- ruamoko/gui/InputLine.r | 16 ++++++++-------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/ruamoko/gui/Group.r b/ruamoko/gui/Group.r index 5411562aa..4bcccadf1 100644 --- a/ruamoko/gui/Group.r +++ b/ruamoko/gui/Group.r @@ -32,11 +32,6 @@ return self; } -- (void) moveTo: (int)x y:(int)y -{ - [self setBasePos: x y:y]; -} - - (void) setBasePos: (int) x y: (int) y { [super setBasePos: x y:y]; diff --git a/ruamoko/gui/InputLine.r b/ruamoko/gui/InputLine.r index 09017ebe5..781e56b78 100644 --- a/ruamoko/gui/InputLine.r +++ b/ruamoko/gui/InputLine.r @@ -2,18 +2,18 @@ #include "gui/InputLine.h" #include "gui/Rect.h" -inputline_t (int lines, int size, int prompt) InputLine_Create = #0; +inputline_t InputLine_Create (int lines, int size, int prompt) = #0; void InputLine_SetPos (inputline_t il, int x, int y) = #0; void InputLine_SetCursor (inputline_t il, int cursorr) = #0; @overload void InputLine_SetEnter (inputline_t il, void (f)(string, void*), void *data) = #0; @overload void InputLine_SetEnter (inputline_t il, IMP imp, id obj, SEL sel) = #0; -void (inputline_t il, int width) InputLine_SetWidth = #0; -void (inputline_t il) InputLine_Destroy = #0; -void (inputline_t il, int size) InputLine_Clear = #0; -void (inputline_t il, int ch) InputLine_Process = #0; -void (inputline_t il) InputLine_Draw = #0; -void (inputline_t il, string str) InputLine_SetText = #0; -string (inputline_t il) InputLine_GetText = #0; +void InputLine_SetWidth (inputline_t il, int width) = #0; +void InputLine_Destroy (inputline_t il) = #0; +void InputLine_Clear (inputline_t il, int size) = #0; +void InputLine_Process (inputline_t il, int ch) = #0; +void InputLine_Draw (inputline_t il) = #0; +void InputLine_SetText (inputline_t il, string str) = #0; +string InputLine_GetText (inputline_t il) = #0; @implementation InputLine