qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-25 22:01:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Syntax fixes for ruamoko/gui.

Browse source 
Once aggregate initializers are working, ruamoko/gui will "compile"
(no object files, and still the bogus integer constant into ... warning).
This commit is contained in:
Bill Currie 2011-02-14 22:13:55 +09:00
parent 5fa349927f
commit da3ac388fe
6 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ruamoko/gui/Group.r
View file

@ -17,13 +17,13 @@
[super dealloc];
}
- (View []) addView: (View [])aView
- (View *) addView: (View *)aView
{
[views addObject:aView];
return aView;
}
- (id) addViews: (Array [])viewlist
- (id) addViews: (Array *)viewlist
{
while ([viewlist count]) {
[self addView: [viewlist objectAtIndex: 0]];
@ -44,7 +44,7 @@
[views makeObjectsPerformSelector:sel withObject:self];
}
- (void) setBasePosFromView: (View []) view
- (void) setBasePosFromView: (View *) view
{
[super setBasePosFromView:view];
local SEL sel = @selector (setBasePosFromView:);

2
ruamoko/gui/InputLine.r
View file

@ -3,7 +3,7 @@
#include "gui/Rect.h"
inputline_t (integer lines, integer size, integer prompt) InputLine_Create = #0;
void (inputline_t il, void [] data) InputLine_SetUserData = #0;
void InputLine_SetUserData (inputline_t il, void *data) = #0;
void (inputline_t il, integer width) InputLine_SetWidth = #0;
void (inputline_t il) InputLine_Destroy = #0;
void (inputline_t il, integer size) InputLine_Clear = #0;

2
ruamoko/gui/View.r
View file

@ -50,7 +50,7 @@
yabs = ypos + y;
}
- (void) setBasePosFromView: (View []) view
- (void) setBasePosFromView: (View *) view
{
Point pos = [view basePos];
xabs = xpos + pos.x;

6
ruamoko/include/gui/Group.h
View file

@ -7,11 +7,11 @@
@interface Group : View
{
Array []views;
Array *views;
}
- (void) dealloc;
- (View[]) addView: (View[])aView;
- (id) addViews: (Array[])viewlist;
- (View*) addView: (View*)aView;
- (id) addViews: (Array*)viewlist;
- (void) moveTo: (integer)x y:(integer)y;
- (void) draw;
@end

6
ruamoko/include/gui/InputLine.h
View file

@ -4,10 +4,10 @@
#include "View.h"
struct _inputline_t {}; // opaque type :)
typedef struct _inputline_t [] inputline_t;
typedef struct _inputline_t *inputline_t;
@extern inputline_t (integer lines, integer size, integer prompt) InputLine_Create;
@extern void (inputline_t il, void [] data) InputLine_SetUserData;
@extern void InputLine_SetUserData (inputline_t il, void *data);
@extern void (inputline_t il, integer width) InputLine_SetWidth;
@extern void (inputline_t il) InputLine_Destroy;
@extern void (inputline_t il, integer save) InputLine_Clear;
@ -44,7 +44,7 @@ struct il_data_t {
@interface InputLineBox: View
{
InputLine []input_line;
InputLine *input_line;
}
- (id) initWithBounds: (Rect)aRect promptCharacter: (integer)char;

4
ruamoko/include/gui/View.h
View file

@ -10,7 +10,7 @@
integer xpos, ypos;
integer xlen, ylen;
integer xabs, yabs;
View []parent;
View *parent;
integer flags;
}
@ -20,7 +20,7 @@
- (id) canFocus: (integer)cf;
- (integer) canFocus;
- (void) setBasePos: (integer)x y: (integer)y;
- (void) setBasePosFromView: (View[])view;
- (void) setBasePosFromView: (View*)view;
- (void) draw;
- (integer) keyEvent:(integer)key unicode:(integer)unicode down:(integer)down;