dwindows: mac/dw.m comparison

comparison mac/dw.m @ 752:cf447811d322

Converted tabs to spaces.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 17 Mar 2011 04:48:06 +0000
parents	eba6ab48c952
children	590eebc9b61f

comparison

equal deleted inserted replaced

-:eba6ab48c952
+:cf447811d322
 dw_mutex_unlock(DWThreadMutex); \
 _locked_by_me = FALSE; } }
 unsigned long _colors[] =
 {
-	0x00000000,   /* 0  black */
+0x00000000,   /* 0  black */
-	0x000000bb,   /* 1  red */
+0x000000bb,   /* 1  red */
-	0x0000bb00,   /* 2  green */
+0x0000bb00,   /* 2  green */
-	0x0000aaaa,   /* 3  yellow */
+0x0000aaaa,   /* 3  yellow */
-	0x00cc0000,   /* 4  blue */
+0x00cc0000,   /* 4  blue */
-	0x00bb00bb,   /* 5  magenta */
+0x00bb00bb,   /* 5  magenta */
-	0x00bbbb00,   /* 6  cyan */
+0x00bbbb00,   /* 6  cyan */
-	0x00bbbbbb,   /* 7  white */
+0x00bbbbbb,   /* 7  white */
-	0x00777777,   /* 8  grey */
+0x00777777,   /* 8  grey */
-	0x000000ff,   /* 9  bright red */
+0x000000ff,   /* 9  bright red */
-	0x0000ff00,   /* 10 bright green */
+0x0000ff00,   /* 10 bright green */
-	0x0000eeee,   /* 11 bright yellow */
+0x0000eeee,   /* 11 bright yellow */
-	0x00ff0000,   /* 12 bright blue */
+0x00ff0000,   /* 12 bright blue */
-	0x00ff00ff,   /* 13 bright magenta */
+0x00ff00ff,   /* 13 bright magenta */
-	0x00eeee00,   /* 14 bright cyan */
+0x00eeee00,   /* 14 bright cyan */
-	0x00ffffff,   /* 15 bright white */
+0x00ffffff,   /* 15 bright white */
-	0xff000000    /* 16 default color */
+0xff000000    /* 16 default color */
 };
 unsigned long _get_color(unsigned long thiscolor)
 {
-	if(thiscolor & DW_RGB_COLOR)
+if(thiscolor & DW_RGB_COLOR)
-	{
+{
-		return thiscolor & ~DW_RGB_COLOR;
+return thiscolor & ~DW_RGB_COLOR;
-	}
+}
-	else if(thiscolor < 17)
+else if(thiscolor < 17)
-	{
+{
-		return _colors[thiscolor];
+return _colors[thiscolor];
-	}
+}
-	return 0;
+return 0;
 }
 typedef struct _sighandler
 {
-	struct _sighandler   *next;
+struct _sighandler   *next;
-	ULONG message;
+ULONG message;
-	HWND window;
+HWND window;
-	int id;
+int id;
-	void *signalfunction;
+void *signalfunction;
-	void *data;
+void *data;
 } SignalHandler;
 SignalHandler *Root = NULL;
 /* Some internal prototypes */
 int _remove_userdata(UserData **root, char *varname, int all);
 int _dw_main_iteration(NSDate *date);
 SignalHandler *_get_handler(HWND window, int messageid)
 {
-	SignalHandler *tmp = Root;
+SignalHandler *tmp = Root;
-	/* Find any callbacks for this function */
+/* Find any callbacks for this function */
-	while(tmp)
+while(tmp)
-	{
+{
-		if(tmp->message == messageid && window == tmp->window)
+if(tmp->message == messageid && window == tmp->window)
-		{
+{
-			return tmp;
+return tmp;
-		}
+}
-		tmp = tmp->next;
+tmp = tmp->next;
-	}
+}
-	return NULL;
+return NULL;
 }
 typedef struct
 {
-	ULONG message;
+ULONG message;
-	char name[30];
+char name[30];
 } SignalList;
 /* List of signals */
 #define SIGNALMAX 16
 SignalList SignalTranslate[SIGNALMAX] = {
-	{ 1,	DW_SIGNAL_CONFIGURE },
+{ 1,    DW_SIGNAL_CONFIGURE },
-	{ 2,	DW_SIGNAL_KEY_PRESS },
+{ 2,    DW_SIGNAL_KEY_PRESS },
-	{ 3,	DW_SIGNAL_BUTTON_PRESS },
+{ 3,    DW_SIGNAL_BUTTON_PRESS },
-	{ 4,	DW_SIGNAL_BUTTON_RELEASE },
+{ 4,    DW_SIGNAL_BUTTON_RELEASE },
-	{ 5,	DW_SIGNAL_MOTION_NOTIFY },
+{ 5,    DW_SIGNAL_MOTION_NOTIFY },
-	{ 6,	DW_SIGNAL_DELETE },
+{ 6,    DW_SIGNAL_DELETE },
-	{ 7,	DW_SIGNAL_EXPOSE },
+{ 7,    DW_SIGNAL_EXPOSE },
-	{ 8,	DW_SIGNAL_CLICKED },
+{ 8,    DW_SIGNAL_CLICKED },
-	{ 9,	DW_SIGNAL_ITEM_ENTER },
+{ 9,    DW_SIGNAL_ITEM_ENTER },
-	{ 10,	DW_SIGNAL_ITEM_CONTEXT },
+{ 10,   DW_SIGNAL_ITEM_CONTEXT },
-	{ 11,	DW_SIGNAL_LIST_SELECT },
+{ 11,   DW_SIGNAL_LIST_SELECT },
-	{ 12,	DW_SIGNAL_ITEM_SELECT },
+{ 12,   DW_SIGNAL_ITEM_SELECT },
-	{ 13,	DW_SIGNAL_SET_FOCUS },
+{ 13,   DW_SIGNAL_SET_FOCUS },
-	{ 14,	DW_SIGNAL_VALUE_CHANGED },
+{ 14,   DW_SIGNAL_VALUE_CHANGED },
-	{ 15,	DW_SIGNAL_SWITCH_PAGE },
+{ 15,   DW_SIGNAL_SWITCH_PAGE },
-	{ 16,	DW_SIGNAL_TREE_EXPAND }
+{ 16,   DW_SIGNAL_TREE_EXPAND }
 };
 int _event_handler(id object, NSEvent *event, int message)
 {
-	SignalHandler *handler = _get_handler(object, message);
+SignalHandler *handler = _get_handler(object, message);
-	/* NSLog(@"Event handler - type %d\n", message); */
+/* NSLog(@"Event handler - type %d\n", message); */
-	if(handler)
+if(handler)
-	{
+{
-		switch(message)
+switch(message)
-		{
+{
 /* Timer event */
-			case 0:
+case 0:
-			{
+{
-				int (* API timerfunc)(void *) = (int (* API)(void *))handler->signalfunction;
+int (* API timerfunc)(void *) = (int (* API)(void *))handler->signalfunction;
-				if(!timerfunc(handler->data))
+if(!timerfunc(handler->data))
-					dw_timer_disconnect(handler->id);
+dw_timer_disconnect(handler->id);
-				return 0;
+return 0;
-			}
+}
 /* Configure/Resize event */
-			case 1:
+case 1:
-			{
+{
-				int (*sizefunc)(HWND, int, int, void *) = handler->signalfunction;
+int (*sizefunc)(HWND, int, int, void *) = handler->signalfunction;
-				NSSize size;
+NSSize size;
-				if([object isMemberOfClass:[NSWindow class]])
+if([object isMemberOfClass:[NSWindow class]])
-				{
+{
-					NSWindow *window = object;
+NSWindow *window = object;
-					size = [[window contentView] frame].size;
+size = [[window contentView] frame].size;
-				}
+}
-				else
+else
-				{
+{
-					NSView *view = object;
+NSView *view = object;
-					size = [view frame].size;
+size = [view frame].size;
-				}
+}
 if(size.width > 0 && size.height > 0)
 {
 return sizefunc(object, size.width, size.height, handler->data);
 }
 return 0;
-			}
+}
 case 2:
 {
 int (*keypressfunc)(HWND, char, int, int, void *) = handler->signalfunction;
 NSString *nchar = [event charactersIgnoringModifiers];
 int special = (int)[event modifierFlags];
 }
 return keypressfunc(handler->window, ch, (int)vk, special, handler->data);
 }
 /* Button press and release event */
-			case 3:
+case 3:
-			case 4:
+case 4:
-			{
+{
-				int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
+int (* API buttonfunc)(HWND, int, int, int, void *) = (int (* API)(HWND, int, int, int, void *))handler->signalfunction;
-				int button = (int)event;
+int button = (int)event;
-				LONG x,y;
+LONG x,y;
-				dw_pointer_query_pos(&x, &y);
+dw_pointer_query_pos(&x, &y);
-				return buttonfunc(object, (int)x, (int)y, button, handler->data);
+return buttonfunc(object, (int)x, (int)y, button, handler->data);
-			}
+}
 /* Window close event */
-			case 6:
+case 6:
-			{
+{
-				int (* API closefunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
+int (* API closefunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
-				return closefunc(object, handler->data);
+return closefunc(object, handler->data);
-			}
+}
 /* Window expose/draw event */
-			case 7:
+case 7:
-			{
+{
-				DWExpose exp;
+DWExpose exp;
-				int (* API exposefunc)(HWND, DWExpose *, void *) = (int (* API)(HWND, DWExpose *, void *))handler->signalfunction;
+int (* API exposefunc)(HWND, DWExpose *, void *) = (int (* API)(HWND, DWExpose *, void *))handler->signalfunction;
-				NSRect rect = [object frame];
+NSRect rect = [object frame];
-				exp.x = rect.origin.x;
+exp.x = rect.origin.x;
-				exp.y = rect.origin.y;
+exp.y = rect.origin.y;
-				exp.width = rect.size.width;
+exp.width = rect.size.width;
-				exp.height = rect.size.height;
+exp.height = rect.size.height;
-				int result = exposefunc(object, &exp, handler->data);
+int result = exposefunc(object, &exp, handler->data);
-				[[object window] flushWindow];
+[[object window] flushWindow];
-				return result;
+return result;
-			}
+}
 /* Clicked event for buttons and menu items */
-			case 8:
+case 8:
-			{
+{
-				int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
+int (* API clickfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
-				return clickfunc(object, handler->data);
+return clickfunc(object, handler->data);
-			}
+}
 /* Container class selection event */
 case 9:
 {
 int (*containerselectfunc)(HWND, char *, void *) = handler->signalfunction;
 return containerselectfunc(handler->window, (char *)event, handler->data);
 }
 /* Container context menu event */
-			case 10:
+case 10:
-			{
+{
-				int (* API containercontextfunc)(HWND, char *, int, int, void *, void *) = (int (* API)(HWND, char *, int, int, void *, void *))handler->signalfunction;
+int (* API containercontextfunc)(HWND, char *, int, int, void *, void *) = (int (* API)(HWND, char *, int, int, void *, void *))handler->signalfunction;
-				char *text = (char *)event;
+char *text = (char *)event;
-				void *user = NULL;
+void *user = NULL;
-				LONG x,y;
+LONG x,y;
-				dw_pointer_query_pos(&x, &y);
+dw_pointer_query_pos(&x, &y);
-				return containercontextfunc(handler->window, text, (int)x, (int)y, handler->data, user);
+return containercontextfunc(handler->window, text, (int)x, (int)y, handler->data, user);
-			}
+}
 /* Generic selection changed event for several classes */
 case 11:
 case 14:
 {
 int (* API valuechangedfunc)(HWND, int, void *) = (int (* API)(HWND, int, void *))handler->signalfunction;
 int selected = (int)event;
 return valuechangedfunc(handler->window, selected, handler->data);;
 }
 /* Tree class selection event */
-			case 12:
+case 12:
-			{
+{
 int (* API treeselectfunc)(HWND, HTREEITEM, char *, void *, void *) = (int (* API)(HWND, HTREEITEM, char *, void *, void *))handler->signalfunction;
 char *text = (char *)event;
 void *user = NULL;
 id item = nil;
 {
 free(text);
 }
 return result;
 }
 return treeselectfunc(handler->window, item, text, handler->data, user);
-			}
+}
 /* Set Focus event */
 case 13:
 {
 int (* API setfocusfunc)(HWND, void *) = (int (* API)(HWND, void *))handler->signalfunction;
 {
 int (* API treeexpandfunc)(HWND, HTREEITEM, void *) = (int (* API)(HWND, HTREEITEM, void *))handler->signalfunction;
 return treeexpandfunc(handler->window, (HTREEITEM)event, handler->data);
 }
-		}
+}
-	}
+}
-	return -1;
+return -1;
 }
 /* Subclass for the Timer type */
 @interface DWTimerHandler : NSObject { }
 -(void)runTimer:(id)sender;
 [bltdest unlockFocus];
 free(bltinfo);
 }
 -(void)doFlush:(id)param
 {
-	if(_DWLastDrawable)
+if(_DWLastDrawable)
-	{
+{
-		id object = _DWLastDrawable;
+id object = _DWLastDrawable;
-		NSWindow *window = [object window];
+NSWindow *window = [object window];
-		[window flushWindow];
+[window flushWindow];
-	}
+}
 }
 -(void)doWindowFunc:(id)param
 {
 NSValue *v = (NSValue *)param;
 void **params = (void **)[v pointerValue];
-	void (* windowfunc)(void *);
+void (* windowfunc)(void *);
 if(params)
 {
 windowfunc = params[0];
 if(windowfunc)
 {
 windowfunc(params[1]);
 }
 }
 }
 @end
 DWObject *DWObj;
 @interface DWBox : NSView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSWindowDelegate>
 #endif
 {
-	Box *box;
+Box *box;
-	void *userdata;
+void *userdata;
-	NSColor *bgcolor;
+NSColor *bgcolor;
 }
 -(id)init;
 -(void)dealloc;
 -(Box *)box;
 -(void *)userdata;
 -(Box *)box { return box; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)drawRect:(NSRect)rect
 {
-	if(bgcolor)
+if(bgcolor)
-	{
+{
-		[bgcolor set];
+[bgcolor set];
-		NSRectFill( [self bounds] );
+NSRectFill( [self bounds] );
-	}
+}
 }
 -(BOOL)isFlipped { return YES; }
 -(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)1, 3); }
 -(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)1, 4); }
 -(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, (void *)2, 3); return nil; }
 -(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)3, 3); }
 -(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)3, 4); }
 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); _event_handler([self window], theEvent, 2); }
 -(void)setColor:(unsigned long)input
 {
-	if(input == _colors[DW_CLR_DEFAULT])
+if(input == _colors[DW_CLR_DEFAULT])
-	{
+{
-		bgcolor = nil;
+bgcolor = nil;
-	}
+}
-	else
+else
-	{
+{
-		bgcolor = [NSColor colorWithDeviceRed: DW_RED_VALUE(input)/255.0 green: DW_GREEN_VALUE(input)/255.0 blue: DW_BLUE_VALUE(input)/255.0 alpha: 1];
+bgcolor = [NSColor colorWithDeviceRed: DW_RED_VALUE(input)/255.0 green: DW_GREEN_VALUE(input)/255.0 blue: DW_BLUE_VALUE(input)/255.0 alpha: 1];
-	}
+}
 }
 @end
 /* Subclass for a top-level window */
 @interface DWView : DWBox
 {
-	NSMenu *windowmenu;
+NSMenu *windowmenu;
 }
 -(BOOL)windowShouldClose:(id)sender;
 -(void)setMenu:(NSMenu *)input;
 -(void)windowDidBecomeMain:(id)sender;
 -(void)menuHandler:(id)sender;
 @implementation DWView
 -(BOOL)windowShouldClose:(id)sender
 {
 if(_event_handler(self, nil, 6) == FALSE)
-		return NO;
+return NO;
-	return YES;
+return YES;
 }
 - (void)viewDidMoveToWindow
 {
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowResized:) name:NSWindowDidResizeNotification object:[self window]];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:[self window]];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(windowDidBecomeMain:) name:NSWindowDidBecomeMainNotification object:[self window]];
 }
 - (void)dealloc
 {
 if(windowmenu)
 {
 [[NSNotificationCenter defaultCenter] removeObserver:self];
 [super dealloc];
 }
 - (void)windowResized:(NSNotification *)notification;
 {
-	NSSize size = [self frame].size;
+NSSize size = [self frame].size;
-	_do_resize(box, size.width, size.height);
+_do_resize(box, size.width, size.height);
-	_event_handler([self window], nil, 1);
+_event_handler([self window], nil, 1);
 }
 -(void)windowDidBecomeMain:(id)sender
 {
-	if(windowmenu)
+if(windowmenu)
-	{
+{
-		[DWApp setMainMenu:windowmenu];
+[DWApp setMainMenu:windowmenu];
-	}
+}
-	else
+else
-	{
+{
-		[DWApp setMainMenu:DWMainMenu];
+[DWApp setMainMenu:DWMainMenu];
-	}
+}
 _event_handler(self, nil, 13);
 }
 -(void)setMenu:(NSMenu *)input { windowmenu = input; [windowmenu retain]; }
 -(void)menuHandler:(id)sender { _event_handler(sender, nil, 8); }
 -(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); _event_handler([self window], theEvent, 2); }
 @end
 /* Subclass for a button type */
 @interface DWButton : NSButton
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)buttonClicked:(id)sender;
 @end
 @end
 /* Subclass for a progress type */
 @interface DWPercent : NSProgressIndicator
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @end
 /* Subclass for a entryfield type */
 @interface DWEntryField : NSTextField
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @end
 /* Subclass for a entryfield password type */
 @interface DWEntryFieldPassword : NSSecureTextField
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @interface DWNotebook : NSTabView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSTabViewDelegate>
 #endif
 {
-	void *userdata;
+void *userdata;
-	int pageid;
+int pageid;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(int)pageid;
 -(void)setPageid:(int)input;
 @end
 /* Subclass for a Notebook page type */
 @interface DWNotebookPage : NSTabViewItem
 {
-	void *userdata;
+void *userdata;
-	int pageid;
+int pageid;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(int)pageid;
 -(void)setPageid:(int)input;
 -(void)setUserdata:(void *)input { userdata = input; }
 -(int)pageid { return pageid; }
 -(void)setPageid:(int)input { pageid = input; }
 -(void)tabView:(NSTabView *)notebook didSelectTabViewItem:(NSTabViewItem *)notepage
 {
-	id object = [notepage view];
+id object = [notepage view];
 DWNotebookPage *page = (DWNotebookPage *)notepage;
-	if([object isMemberOfClass:[DWBox class]])
+if([object isMemberOfClass:[DWBox class]])
-	{
+{
-		DWBox *view = object;
+DWBox *view = object;
-		Box *box = [view box];
+Box *box = [view box];
-		NSSize size = [view frame].size;
+NSSize size = [view frame].size;
-		_do_resize(box, size.width, size.height);
+_do_resize(box, size.width, size.height);
-	}
+}
 _event_handler(self, (void *)[page pageid], 15);
 }
 -(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
 @end
 @implementation DWNotebookPage
 -(void *)userdata { return userdata; }
 @end
 /* Subclass for a color chooser type */
 @interface DWColorChoose : NSColorPanel
 {
-	DWDialog *dialog;
+DWDialog *dialog;
 NSColor *pickedcolor;
 }
 -(void)changeColor:(id)sender;
 -(void)setDialog:(DWDialog *)input;
 -(DWDialog *)dialog;
 @interface DWSplitBar : NSSplitView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSSplitViewDelegate>
 #endif
 {
-	void *userdata;
+void *userdata;
 float percent;
 }
 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification;
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @implementation DWSplitBar
 -(void)splitViewDidResizeSubviews:(NSNotification *)aNotification
 {
-	NSArray *views = [self subviews];
+NSArray *views = [self subviews];
-	id object;
+id object;
-	for(object in views)
+for(object in views)
-	{
+{
-		if([object isMemberOfClass:[DWBox class]])
+if([object isMemberOfClass:[DWBox class]])
-		{
+{
-			DWBox *view = object;
+DWBox *view = object;
-			Box *box = [view box];
+Box *box = [view box];
-			NSSize size = [view frame].size;
+NSSize size = [view frame].size;
-			_do_resize(box, size.width, size.height);
+_do_resize(box, size.width, size.height);
-		}
+}
-	}
+}
 }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(float)percent { return percent; }
 -(void)setPercent:(float)input { percent = input; }
 @end
 /* Subclass for a slider type */
 @interface DWSlider : NSSlider
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)sliderChanged:(id)sender;
 @end
 @end
 /* Subclass for a slider type */
 @interface DWScrollbar : NSScroller
 {
-	void *userdata;
+void *userdata;
-	float range;
+float range;
-	float visible;
+float visible;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(float)range;
 -(float)visible;
 @end
 /* Subclass for a render area type */
 @interface DWRender : NSView
 {
-	void *userdata;
+void *userdata;
 NSFont *font;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)setFont:(NSFont *)input;
 @end
 /* Subclass for a MLE type */
 @interface DWMLE : NSTextView
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @interface DWContainer : NSTableView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSTableViewDataSource>
 #endif
 {
-	void *userdata;
+void *userdata;
-	NSMutableArray *tvcols;
+NSMutableArray *tvcols;
-	NSMutableArray *data;
+NSMutableArray *data;
-	NSMutableArray *types;
+NSMutableArray *types;
-	NSPointerArray *titles;
+NSPointerArray *titles;
-	int lastAddPoint, lastQueryPoint;
+int lastAddPoint, lastQueryPoint;
 id scrollview;
 }
 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable;
 -(id)tableView:(NSTableView *)aTable objectValueForTableColumn:(NSTableColumn *)aCol row:(NSInteger)aRow;
 -(BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
 @end
 @implementation DWContainer
 -(NSInteger)numberOfRowsInTableView:(NSTableView *)aTable
 {
-	if(tvcols && data)
+if(tvcols && data)
-	{
+{
-		int cols = (int)[tvcols count];
+int cols = (int)[tvcols count];
-		if(cols)
+if(cols)
-		{
+{
-			return [data count] / cols;
+return [data count] / cols;
-		}
+}
-	}
+}
-	return 0;
+return 0;
 }
 -(id)tableView:(NSTableView *)aTable objectValueForTableColumn:(NSTableColumn *)aCol row:(NSInteger)aRow
 {
-	if(tvcols)
+if(tvcols)
-	{
+{
-		int z, col = -1;
+int z, col = -1;
-		int count = (int)[tvcols count];
+int count = (int)[tvcols count];
-		for(z=0;z<count;z++)
+for(z=0;z<count;z++)
-		{
+{
-			if([tvcols objectAtIndex:z] == aCol)
+if([tvcols objectAtIndex:z] == aCol)
-			{
+{
-				col = z;
+col = z;
-				break;
+break;
-			}
+}
-		}
+}
-		if(col != -1)
+if(col != -1)
-		{
+{
-			int index = (int)(aRow * count) + col;
+int index = (int)(aRow * count) + col;
-			id this = [data objectAtIndex:index];
+id this = [data objectAtIndex:index];
-			return ([this isKindOfClass:[NSNull class]]) ? nil : this;
+return ([this isKindOfClass:[NSNull class]]) ? nil : this;
-		}
+}
-	}
+}
-	return nil;
+return nil;
 }
 -(BOOL)tableView:(NSTableView *)aTableView shouldEditTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex { return NO; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(id)scrollview { return scrollview; }
 }
 return 0;
 }
 -(int)addRows:(int)number
 {
-	if(tvcols)
+if(tvcols)
-	{
+{
-		int count = (int)(number * [tvcols count]);
+int count = (int)(number * [tvcols count]);
-		int z;
+int z;
-		lastAddPoint = (int)[titles count];
+lastAddPoint = (int)[titles count];
-		for(z=0;z<count;z++)
+for(z=0;z<count;z++)
-		{
+{
-			[data addObject:[NSNull null]];
+[data addObject:[NSNull null]];
-		}
+}
-		for(z=0;z<number;z++)
+for(z=0;z<number;z++)
-		{
+{
-			[titles addPointer:NULL];
+[titles addPointer:NULL];
-		}
+}
-		return (int)[titles count];
+return (int)[titles count];
-	}
+}
-	return 0;
+return 0;
 }
 -(void)editCell:(id)input at:(int)row and:(int)col
 {
-	if(tvcols && input)
+if(tvcols && input)
-	{
+{
-		int index = (int)(row * [tvcols count]) + col;
+int index = (int)(row * [tvcols count]) + col;
-		[data replaceObjectAtIndex:index withObject:input];
+[data replaceObjectAtIndex:index withObject:input];
-	}
+}
 }
 -(void)removeRow:(int)row
 {
-	if(tvcols)
+if(tvcols)
-	{
+{
-		int z, start, end;
+int z, start, end;
-		int count = (int)[tvcols count];
+int count = (int)[tvcols count];
-		start = count * row;
+start = count * row;
-		end = start + count;
+end = start + count;
-		for(z=start;z<end;z++)
+for(z=start;z<end;z++)
-		{
+{
-			[data removeObjectAtIndex:z];
+[data removeObjectAtIndex:z];
-		}
+}
-		[titles removePointerAtIndex:row];
+[titles removePointerAtIndex:row];
-		if(lastAddPoint > 0 && lastAddPoint < row)
+if(lastAddPoint > 0 && lastAddPoint < row)
-		{
+{
-			lastAddPoint--;
+lastAddPoint--;
-		}
+}
-	}
+}
 }
 -(void)setRow:(int)row title:(void *)input { if(titles && input) { [titles replacePointerAtIndex:row withPointer:input]; } }
 -(void *)getRowTitle:(int)row { if(titles && row > -1) { return [titles pointerAtIndex:row]; } return NULL; }
 -(id)getRow:(int)row and:(int)col { if(data) { int index = (int)(row * [tvcols count]) + col; return [data objectAtIndex:index]; } return nil; }
 -(int)cellType:(int)col { return [[types objectAtIndex:col] intValue]; }
 -(int)lastQueryPoint { return lastQueryPoint; }
 -(void)setLastQueryPoint:(int)input { lastQueryPoint = input; }
 -(void)clear { if(data) { [data removeAllObjects]; while([titles count]) { [titles removePointerAtIndex:0]; } } lastAddPoint = 0; }
 -(void)setup
 {
-	tvcols = [[[NSMutableArray alloc] init] retain];
+tvcols = [[[NSMutableArray alloc] init] retain];
-	data = [[[NSMutableArray alloc] init] retain];
+data = [[[NSMutableArray alloc] init] retain];
-	types = [[[NSMutableArray alloc] init] retain];
+types = [[[NSMutableArray alloc] init] retain];
-	titles = [[NSPointerArray pointerArrayWithWeakObjects] retain];
+titles = [[NSPointerArray pointerArrayWithWeakObjects] retain];
-	[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectionChanged:) name:NSTableViewSelectionDidChangeNotification object:self];
+[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(selectionChanged:) name:NSTableViewSelectionDidChangeNotification object:self];
 }
 -(void)doubleClicked:(id)sender
 {
 /* Handler for container class */
-	_event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 9);
+_event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 9);
 }
 -(void)selectionChanged:(id)sender
 {
 /* Handler for container class */
-	_event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 12);
+_event_handler(self, (NSEvent *)[self getRowTitle:(int)[self selectedRow]], 12);
 /* Handler for listbox class */
-	_event_handler(self, (NSEvent *)(int)[self selectedRow], 11);
+_event_handler(self, (NSEvent *)(int)[self selectedRow], 11);
 }
 -(NSMenu *)menuForEvent:(NSEvent *)event
 {
 int row;
 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
 @interface DWTree : NSOutlineView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSOutlineViewDataSource>
 #endif
 {
-	void *userdata;
+void *userdata;
-	NSTableColumn *imagecol;
+NSTableColumn *imagecol;
 NSTableColumn *textcol;
-	NSMutableArray *data;
+NSMutableArray *data;
 /* Each data item consists of a linked lists of tree item data.
 * NSImage *, NSString *, Item Data *, NSMutableArray * of Children
 */
 id scrollview;
 }
 }
 return self;
 }
 -(id)outlineView:(NSOutlineView *)outlineView child:(int)index ofItem:(id)item
 {
-	if(item)
+if(item)
 {
 NSMutableArray *array = [item pointerAtIndex:3];
-		return array ? [array objectAtIndex:index] : nil;
+return array ? [array objectAtIndex:index] : nil;
-	}
+}
-	else
+else
 {
-		return [data objectAtIndex:index];
+return [data objectAtIndex:index];
 }
 }
 -(BOOL)outlineView:(NSOutlineView *)outlineView isItemExpandable:(id)item
 {
-	return [self outlineView:outlineView numberOfChildrenOfItem:item] != 0;
+return [self outlineView:outlineView numberOfChildrenOfItem:item] != 0;
 }
 -(int)outlineView:(NSOutlineView *)outlineView numberOfChildrenOfItem:(id)item
 {
-	if(item)
+if(item)
 {
-		if([item isKindOfClass:[NSPointerArray class]])
+if([item isKindOfClass:[NSPointerArray class]])
 {
 NSMutableArray *array = [item pointerAtIndex:3];
-			return array ? (int)[array count] : 0;
+return array ? (int)[array count] : 0;
 }
-		else
+else
 {
-			return 0;
+return 0;
 }
 }
 else
 {
 return data ? (int)[data count] : 0;
 }
 }
 -(id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
 {
-	if(item)
+if(item)
 {
-		if([item isKindOfClass:[NSPointerArray class]])
+if([item isKindOfClass:[NSPointerArray class]])
 {
-			NSPointerArray *this = (NSPointerArray *)item;
+NSPointerArray *this = (NSPointerArray *)item;
 if(tableColumn == imagecol)
 {
 return [this pointerAtIndex:0];
 }
 return [this pointerAtIndex:1];
 }
-		else
+else
 {
-			return nil;
+return nil;
 }
-	}
+}
 return @"List Root";
 }
 -(BOOL)outlineView:(NSOutlineView *)outlineView shouldEditTableColumn:(NSTableColumn *)tableColumn item:(id)item { return NO; }
 -(void)addTree:(NSPointerArray *)item and:(NSPointerArray *)parent;
 {
 @end
 /* Subclass for a Calendar type */
 @interface DWCalendar : NSDatePicker
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 @end
 @interface DWComboBox : NSComboBox
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSComboBoxDelegate>
 #endif
 {
-	void *userdata;
+void *userdata;
 }
 -(void *)userdata;
 -(void)setUserdata:(void *)input;
 -(void)comboBoxSelectionDidChange:(NSNotification *)not;
 @end
 @interface DWSpinButton : NSView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 <NSTextFieldDelegate>
 #endif
 {
-	void *userdata;
+void *userdata;
 NSTextField *textfield;
 DWStepper *stepper;
 }
 -(id)init;
 -(void *)userdata;
 /* This function adds a signal handler callback into the linked list.
 */
 void _new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *data)
 {
-	SignalHandler *new = malloc(sizeof(SignalHandler));
+SignalHandler *new = malloc(sizeof(SignalHandler));
-	new->message = message;
+new->message = message;
-	new->window = window;
+new->window = window;
-	new->id = msgid;
+new->id = msgid;
-	new->signalfunction = signalfunction;
+new->signalfunction = signalfunction;
-	new->data = data;
+new->data = data;
-	new->next = NULL;
+new->next = NULL;
-	if (!Root)
+if (!Root)
-		Root = new;
+Root = new;
-	else
+else
-	{
+{
-		SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = Root;
-		while(tmp)
+while(tmp)
-		{
+{
-			if(tmp->message == message &&
+if(tmp->message == message &&
-			   tmp->window == window &&
+tmp->window == window &&
-			   tmp->id == msgid &&
+tmp->id == msgid &&
-			   tmp->signalfunction == signalfunction)
+tmp->signalfunction == signalfunction)
-			{
+{
-				tmp->data = data;
+tmp->data = data;
-				free(new);
+free(new);
-				return;
+return;
-			}
+}
-			prev = tmp;
+prev = tmp;
-			tmp = tmp->next;
+tmp = tmp->next;
-		}
+}
-		if(prev)
+if(prev)
-			prev->next = new;
+prev->next = new;
-		else
+else
-			Root = new;
+Root = new;
-	}
+}
 }
 /* Finds the message number for a given signal name */
 ULONG _findsigmessage(char *signame)
 {
-	int z;
+int z;
-	for(z=0;z<SIGNALMAX;z++)
+for(z=0;z<SIGNALMAX;z++)
-	{
+{
-		if(strcasecmp(signame, SignalTranslate[z].name) == 0)
+if(strcasecmp(signame, SignalTranslate[z].name) == 0)
-			return SignalTranslate[z].message;
+return SignalTranslate[z].message;
-	}
+}
-	return 0L;
+return 0L;
 }
 unsigned long _foreground = 0xAAAAAA, _background = 0;
 /* This function calculates how much space the widgets and boxes require
 int uymax = 0, uxmax = 0;
 int upymax = 0, upxmax = 0;
 /* Used for the SIZEEXPAND */
 int nux = *usedx, nuy = *usedy;
 int nupx = *usedpadx, nupy = *usedpady;
 (*usedx) += (thisbox->pad * 2);
 (*usedy) += (thisbox->pad * 2);
 for(z=0;z<thisbox->count;z++)
 {
 if(thisbox->items[z].type == TYPEBOX)
 {
-		int initialx, initialy;
+int initialx, initialy;
-		DWBox *box = thisbox->items[z].hwnd;
+DWBox *box = thisbox->items[z].hwnd;
-		Box *tmp = [box box];
+Box *tmp = [box box];
 initialx = x - (*usedx);
 initialy = y - (*usedy);
 if(tmp)
 thisbox->items[z].yratio = ((float)((thisbox->height * thisbox->parentyratio)-thisbox->upy))/((float)(thisbox->minheight-thisbox->upy));
 }
 if(thisbox->items[z].type == TYPEBOX)
 {
-			DWBox *box = thisbox->items[z].hwnd;
+DWBox *box = thisbox->items[z].hwnd;
-			Box *tmp = [box box];
+Box *tmp = [box box];
 if(tmp)
 {
 tmp->parentxratio = thisbox->items[z].xratio;
 tmp->parentyratio = thisbox->items[z].yratio;
 if(thisbox->items[z].vsize == SIZEEXPAND && thisbox->type == DW_HORZ)
 thisbox->items[z].height = uymax-(thisbox->items[z].pad*2);
 /* Run this code segment again to finalize the sized after setting uxmax/uymax values. */
 if(thisbox->items[z].type == TYPEBOX)
 {
-			DWBox *box = thisbox->items[z].hwnd;
+DWBox *box = thisbox->items[z].hwnd;
-			Box *tmp = [box box];
+Box *tmp = [box box];
 if(tmp)
 {
 if(*depth > 0)
 {
 {
 int height = thisbox->items[z].height;
 int width = thisbox->items[z].width;
 int pad = thisbox->items[z].pad;
 NSView *handle = thisbox->items[z].hwnd;
-		 NSPoint point;
+NSPoint point;
-		 NSSize size;
+NSSize size;
 int vectorx, vectory;
 /* When upxmax != pad*2 then ratios are incorrect. */
 vectorx = (int)((width*thisbox->items[z].xratio)-width);
 vectory = (int)((height*thisbox->items[z].yratio)-height);
 if(thisbox->items[z].vsize != SIZEEXPAND)
 vectory = 0;
 if(thisbox->items[z].hsize != SIZEEXPAND)
 vectorx = 0;
-			point.x = currentx + pad;
+point.x = currentx + pad;
-			point.y = currenty + pad;
+point.y = currenty + pad;
-			size.width = width + vectorx;
+size.width = width + vectorx;
-			size.height = height + vectory;
+size.height = height + vectory;
-			[handle setFrameOrigin:point];
+[handle setFrameOrigin:point];
-			[handle setFrameSize:size];
+[handle setFrameSize:size];
-			/* Special handling for notebook controls */
+/* Special handling for notebook controls */
-			if([handle isMemberOfClass:[DWNotebook class]])
+if([handle isMemberOfClass:[DWNotebook class]])
-			{
+{
-				DWNotebook *notebook = (DWNotebook *)handle;
+DWNotebook *notebook = (DWNotebook *)handle;
-				DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
+DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
-				DWBox *view = [notepage view];
+DWBox *view = [notepage view];
-				if(view != nil)
+if(view != nil)
-				{
+{
-					Box *box = [view box];
+Box *box = [view box];
-					NSSize size = [view frame].size;
+NSSize size = [view frame].size;
-					_do_resize(box, size.width, size.height);
+_do_resize(box, size.width, size.height);
-				}
+}
-			}
+}
 /* Special handling for spinbutton controls */
 else if([handle isMemberOfClass:[DWSpinButton class]])
 {
 DWSpinButton *spinbutton = (DWSpinButton *)handle;
 NSTextField *textfield = [spinbutton textfield];
 [textfield setFrameOrigin:NSMakePoint(0,0)];
 [textfield setFrameSize:NSMakeSize(size.width-20,size.height)];
 [stepper setFrameOrigin:NSMakePoint(size.width-20,0)];
 [stepper setFrameSize:NSMakeSize(20,size.height)];
 }
-			else if([handle isMemberOfClass:[DWRender class]])
+else if([handle isMemberOfClass:[DWRender class]])
-			{
+{
-				_event_handler(handle, nil, 1);
+_event_handler(handle, nil, 1);
-			}
+}
-			else if([handle isMemberOfClass:[DWSplitBar class]] && size.width > 20 && size.height > 20)
+else if([handle isMemberOfClass:[DWSplitBar class]] && size.width > 20 && size.height > 20)
-			{
+{
 DWSplitBar *split = (DWSplitBar *)handle;
-				float percent = [split percent];
+float percent = [split percent];
 if(percent > 0)
 {
 dw_splitbar_set(handle, percent);
 [split setPercent:0];
 }
-			}
+}
-			if(thisbox->type == DW_HORZ)
+if(thisbox->type == DW_HORZ)
 currentx += width + vectorx + (pad * 2);
 if(thisbox->type == DW_VERT)
 currenty += height + vectory + (pad * 2);
 }
 }
 }
 NSMenu *_generate_main_menu()
 {
 NSString *applicationName = nil;
 /* This only works on 10.6 so we have a backup method */
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 applicationName = [[NSRunningApplication currentApplication] localizedName];
 #endif
 if(applicationName == nil)
 {
 applicationName = [[NSProcessInfo processInfo] processName];
 }
-	/* Create the main menu */
+/* Create the main menu */
-	NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
+NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
-	NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
+NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
-	NSMenu * menu = [[[NSMenu alloc] initWithTitle:@"Apple"] autorelease];
+NSMenu * menu = [[[NSMenu alloc] initWithTitle:@"Apple"] autorelease];
-	[DWApp performSelector:@selector(setAppleMenu:) withObject:menu];
+[DWApp performSelector:@selector(setAppleMenu:) withObject:menu];
-	/* Setup the Application menu */
+/* Setup the Application menu */
-	NSMenuItem * item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"About", nil), applicationName]
+NSMenuItem * item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"About", nil), applicationName]
-										action:@selector(orderFrontStandardAboutPanel:)
+action:@selector(orderFrontStandardAboutPanel:)
-								 keyEquivalent:@""];
+keyEquivalent:@""];
-	[item setTarget:DWApp];
+[item setTarget:DWApp];
-	[menu addItem:[NSMenuItem separatorItem]];
+[menu addItem:[NSMenuItem separatorItem]];
-	item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil)
+item = [menu addItemWithTitle:NSLocalizedString(@"Services", nil)
-						   action:NULL
+action:NULL
-					keyEquivalent:@""];
+keyEquivalent:@""];
-	NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
+NSMenu * servicesMenu = [[[NSMenu alloc] initWithTitle:@"Services"] autorelease];
-	[menu setSubmenu:servicesMenu forItem:item];
+[menu setSubmenu:servicesMenu forItem:item];
-	[DWApp setServicesMenu:servicesMenu];
+[DWApp setServicesMenu:servicesMenu];
-	[menu addItem:[NSMenuItem separatorItem]];
+[menu addItem:[NSMenuItem separatorItem]];
-	item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName]
+item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Hide", nil), applicationName]
-						   action:@selector(hide:)
+action:@selector(hide:)
-					keyEquivalent:@"h"];
+keyEquivalent:@"h"];
-	[item setTarget:DWApp];
+[item setTarget:DWApp];
-	item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
+item = [menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil)
-						   action:@selector(hideOtherApplications:)
+action:@selector(hideOtherApplications:)
-					keyEquivalent:@"h"];
+keyEquivalent:@"h"];
-	[item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
+[item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask];
-	[item setTarget:DWApp];
+[item setTarget:DWApp];
-	item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil)
+item = [menu addItemWithTitle:NSLocalizedString(@"Show All", nil)
-						   action:@selector(unhideAllApplications:)
+action:@selector(unhideAllApplications:)
-					keyEquivalent:@""];
+keyEquivalent:@""];
-	[item setTarget:DWApp];
+[item setTarget:DWApp];
-	[menu addItem:[NSMenuItem separatorItem]];
+[menu addItem:[NSMenuItem separatorItem]];
-	item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName]
+item = [menu addItemWithTitle:[NSString stringWithFormat:@"%@ %@", NSLocalizedString(@"Quit", nil), applicationName]
-						   action:@selector(terminate:)
+action:@selector(terminate:)
-					keyEquivalent:@"q"];
+keyEquivalent:@"q"];
-	[item setTarget:DWApp];
+[item setTarget:DWApp];
-	[mainMenu setSubmenu:menu forItem:mitem];
+[mainMenu setSubmenu:menu forItem:mitem];
-	return mainMenu;
+return mainMenu;
 }
 /*
 * Runs a message loop for Dynamic Windows.
 */
 * Parameters:
 *       exitcode: Exit code reported to the operating system.
 */
 void API dw_exit(int exitcode)
 {
-	exit(exitcode);
+exit(exitcode);
 }
 /*
 * Free's memory allocated by dynamic windows.
 * Parameters:
 * current user directory.  Or the root directory (C:\ on
 * OS/2 and Windows).
 */
 char *dw_user_dir(void)
 {
-	static char _user_dir[1024] = "";
+static char _user_dir[1024] = "";
-	if(!_user_dir[0])
+if(!_user_dir[0])
-	{
+{
-		char *home = getenv("HOME");
+char *home = getenv("HOME");
-		if(home)
+if(home)
-			strcpy(_user_dir, home);
+strcpy(_user_dir, home);
-		else
+else
-			strcpy(_user_dir, "/");
+strcpy(_user_dir, "/");
-	}
+}
-	return _user_dir;
+return _user_dir;
 }
 /*
 * Displays a Message Box with given text and title..
 * Parameters:
 *           format: printf style format string.
 *           ...: Additional variables for use in the format.
 */
 int API dw_messagebox(char *title, int flags, char *format, ...)
 {
-	int iResponse;
+int iResponse;
-	NSString *button1 = @"OK";
+NSString *button1 = @"OK";
-	NSString *button2 = nil;
+NSString *button2 = nil;
-	NSString *button3 = nil;
+NSString *button3 = nil;
-	va_list args;
+va_list args;
-	char outbuf[1000];
+char outbuf[1000];
-	va_start(args, format);
+va_start(args, format);
-	vsprintf(outbuf, format, args);
+vsprintf(outbuf, format, args);
-	va_end(args);
+va_end(args);
-	if(flags & DW_MB_OKCANCEL)
+if(flags & DW_MB_OKCANCEL)
-	{
+{
-		button2 = @"Cancel";
+button2 = @"Cancel";
-	}
+}
-	else if(flags & DW_MB_YESNO)
+else if(flags & DW_MB_YESNO)
-	{
+{
-		button1 = @"Yes";
+button1 = @"Yes";
-		button2 = @"No";
+button2 = @"No";
-	}
+}
-	else if(flags & DW_MB_YESNOCANCEL)
+else if(flags & DW_MB_YESNOCANCEL)
-	{
+{
-		button1 = @"Yes";
+button1 = @"Yes";
-		button2 = @"No";
+button2 = @"No";
-		button3 = @"Cancel";
+button3 = @"Cancel";
-	}
+}
-	if(flags & DW_MB_ERROR)
+if(flags & DW_MB_ERROR)
-	{
+{
-		iResponse = (int)
+iResponse = (int)
-		NSRunCriticalAlertPanel([ NSString stringWithUTF8String:title ],
+NSRunCriticalAlertPanel([ NSString stringWithUTF8String:title ],
-								[ NSString stringWithUTF8String:outbuf ],
+[ NSString stringWithUTF8String:outbuf ],
-								button1, button2, button3);	}
+button1, button2, button3); }
-	else
+else
-	{
+{
-		iResponse = (int)
+iResponse = (int)
-		NSRunAlertPanel([ NSString stringWithUTF8String:title ],
+NSRunAlertPanel([ NSString stringWithUTF8String:title ],
-						[ NSString stringWithUTF8String:outbuf ],
+[ NSString stringWithUTF8String:outbuf ],
-						button1, button2, button3);
+button1, button2, button3);
-	}
+}
-	switch(iResponse)
+switch(iResponse)
-	{
+{
-		case NSAlertDefaultReturn:    /* user pressed OK */
+case NSAlertDefaultReturn:    /* user pressed OK */
-			if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL)
+if(flags & DW_MB_YESNO || flags & DW_MB_YESNOCANCEL)
-			{
+{
-				return DW_MB_RETURN_YES;
+return DW_MB_RETURN_YES;
-			}
+}
-			return DW_MB_RETURN_OK;
+return DW_MB_RETURN_OK;
-		case NSAlertAlternateReturn:  /* user pressed Cancel */
+case NSAlertAlternateReturn:  /* user pressed Cancel */
-			if(flags & DW_MB_OKCANCEL)
+if(flags & DW_MB_OKCANCEL)
-			{
+{
-				return DW_MB_RETURN_CANCEL;
+return DW_MB_RETURN_CANCEL;
-			}
+}
-			return DW_MB_RETURN_NO;
+return DW_MB_RETURN_NO;
-		case NSAlertOtherReturn:      /* user pressed the third button */
+case NSAlertOtherReturn:      /* user pressed the third button */
-			return DW_MB_RETURN_CANCEL;
+return DW_MB_RETURN_CANCEL;
-		case NSAlertErrorReturn:      /* an error occurred */
+case NSAlertErrorReturn:      /* an error occurred */
-			break;
+break;
-	}
+}
-	return 0;
+return 0;
 }
 /*
 * Opens a file dialog and queries user selection.
 * Parameters:
 *       the file path on success.
 *
 */
 char * API dw_file_browse(char *title, char *defpath, char *ext, int flags)
 {
-	if(flags == DW_FILE_OPEN)
+if(flags == DW_FILE_OPEN)
-	{
+{
-		/* Create the File Open Dialog class. */
+/* Create the File Open Dialog class. */
-		NSOpenPanel* openDlg = [NSOpenPanel openPanel];
+NSOpenPanel* openDlg = [NSOpenPanel openPanel];
-		/* Enable the selection of files in the dialog. */
+/* Enable the selection of files in the dialog. */
-		[openDlg setCanChooseFiles:YES];
+[openDlg setCanChooseFiles:YES];
-		[openDlg setCanChooseDirectories:NO];
+[openDlg setCanChooseDirectories:NO];
-		/* Disable multiple selection */
+/* Disable multiple selection */
-		[openDlg setAllowsMultipleSelection:NO];
+[openDlg setAllowsMultipleSelection:NO];
-		/* Display the dialog.  If the OK button was pressed,
+/* Display the dialog.  If the OK button was pressed,
-		 * process the files.
+* process the files.
-		 */
+*/
-		if([openDlg runModal] == NSOKButton)
+if([openDlg runModal] == NSOKButton)
-		{
+{
-			/* Get an array containing the full filenames of all
+/* Get an array containing the full filenames of all
-			 * files and directories selected.
+* files and directories selected.
-			 */
+*/
-			NSArray* files = [openDlg filenames];
+NSArray* files = [openDlg filenames];
-			NSString* fileName = [files objectAtIndex:0];
+NSString* fileName = [files objectAtIndex:0];
-			return strdup([ fileName UTF8String ]);
+return strdup([ fileName UTF8String ]);
-		}
+}
-	}
+}
-	else
+else
-	{
+{
-		/* Create the File Save Dialog class. */
+/* Create the File Save Dialog class. */
-		NSSavePanel* saveDlg = [NSSavePanel savePanel];
+NSSavePanel* saveDlg = [NSSavePanel savePanel];
-		/* Enable the creation of directories in the dialog. */
+/* Enable the creation of directories in the dialog. */
-		[saveDlg setCanCreateDirectories:YES];
+[saveDlg setCanCreateDirectories:YES];
-		/* Display the dialog.  If the OK button was pressed,
+/* Display the dialog.  If the OK button was pressed,
-		 * process the files.
+* process the files.
-		 */
+*/
-		if([saveDlg runModal] == NSFileHandlingPanelOKButton)
+if([saveDlg runModal] == NSFileHandlingPanelOKButton)
-		{
+{
-			/* Get an array containing the full filenames of all
+/* Get an array containing the full filenames of all
-			 * files and directories selected.
+* files and directories selected.
-			 */
+*/
-			NSString* fileName = [saveDlg filename];
+NSString* fileName = [saveDlg filename];
-			return strdup([ fileName UTF8String ]);
+return strdup([ fileName UTF8String ]);
-		}
+}
-	}
+}
-	return NULL;
+return NULL;
 }
 /*
 * Gets the contents of the default clipboard as text.
 * Parameters:
 *       Pointer to an allocated string of text or NULL if clipboard empty or contents could not
 *       be converted to text.
 */
 char *dw_clipboard_get_text()
 {
-	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
+NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-	NSString *str = [pasteboard stringForType:NSStringPboardType];
+NSString *str = [pasteboard stringForType:NSStringPboardType];
-	if(str != nil)
+if(str != nil)
-	{
+{
-		return strdup([ str UTF8String ]);
+return strdup([ str UTF8String ]);
-	}
+}
-	return NULL;
+return NULL;
 }
 /*
 * Sets the contents of the default clipboard to the supplied text.
 * Parameters:
 *       Text.
 */
 void dw_clipboard_set_text( char *str, int len)
 {
-	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
+NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
 /* Only in Snow Leopard */
 if(DWOSMinor > 5)
 {
 [pasteboard clearContents];
 }
-	[pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSStringPboardType];
+[pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSStringPboardType];
 }
 /*
 * Allocates and initializes a dialog struct.
 * Parameters:
 *           data: User defined data to be passed to functions.
 */
 DWDialog * API dw_dialog_new(void *data)
 {
-	DWDialog *tmp = malloc(sizeof(DWDialog));
+DWDialog *tmp = malloc(sizeof(DWDialog));
-	if(tmp)
+if(tmp)
-	{
+{
-		tmp->eve = dw_event_new();
+tmp->eve = dw_event_new();
-		dw_event_reset(tmp->eve);
+dw_event_reset(tmp->eve);
-		tmp->data = data;
+tmp->data = data;
-		tmp->done = FALSE;
+tmp->done = FALSE;
-		tmp->result = NULL;
+tmp->result = NULL;
-	}
+}
-	return tmp;
+return tmp;
 }
 /*
 * Accepts a dialog struct and returns the given data to the
 * initial called of dw_dialog_wait().
 *           dialog: Pointer to a dialog struct aquired by dw_dialog_new).
 *           result: Data to be returned by dw_dialog_wait().
 */
 int API dw_dialog_dismiss(DWDialog *dialog, void *result)
 {
-	dialog->result = result;
+dialog->result = result;
-	dw_event_post(dialog->eve);
+dw_event_post(dialog->eve);
-	dialog->done = TRUE;
+dialog->done = TRUE;
-	return 0;
+return 0;
 }
 /*
 * Accepts a dialog struct waits for dw_dialog_dismiss() to be
 * called by a signal handler with the given dialog struct.
 * Parameters:
 *           dialog: Pointer to a dialog struct aquired by dw_dialog_new).
 */
 void * API dw_dialog_wait(DWDialog *dialog)
 {
-	void *tmp;
+void *tmp;
-	while(!dialog->done)
+while(!dialog->done)
-	{
+{
-		_dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
+_dw_main_iteration([NSDate dateWithTimeIntervalSinceNow:0.01]);
-	}
+}
-	dw_event_close(&dialog->eve);
+dw_event_close(&dialog->eve);
-	tmp = dialog->result;
+tmp = dialog->result;
-	free(dialog);
+free(dialog);
-	return tmp;
+return tmp;
 }
 /*
 * Create a new Box to be packed.
 * Parameters:
 HWND API dw_box_new(int type, int pad)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 DWBox *view = [[DWBox alloc] init];
-	Box *newbox = [view box];
+Box *newbox = [view box];
-	memset(newbox, 0, sizeof(Box));
+memset(newbox, 0, sizeof(Box));
-	newbox->pad = pad;
+newbox->pad = pad;
-	newbox->type = type;
+newbox->type = type;
 DW_MUTEX_UNLOCK;
-	return view;
+return view;
 }
 /*
 * Create a new Group Box to be packed.
 * Parameters:
 *       pad: Number of pixels to pad around the box.
 *       title: Text to be displayined in the group outline.
 */
 HWND API dw_groupbox_new(int type, int pad, char *title)
 {
-	DWBox *box = dw_box_new(type, pad);
+DWBox *box = dw_box_new(type, pad);
-	[box setFocusRingType:NSFocusRingTypeExterior];
+[box setFocusRingType:NSFocusRingTypeExterior];
-	return box;
+return box;
 }
 #ifndef INCOMPLETE
 /*
 * Create a new scrollable Box to be packed.
 */
 void API dw_box_pack_end(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSObject *object = box;
+NSObject *object = box;
-	DWBox *view = box;
+DWBox *view = box;
-	DWBox *this = item;
+DWBox *this = item;
-	Box *thisbox;
+Box *thisbox;
 int z;
 Item *tmpitem, *thisitem;
-	/* Query the objects */
+/* Query the objects */
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = box;
+NSWindow *window = box;
-		view = [window contentView];
+view = [window contentView];
-	}
+}
-	thisbox = [view box];
+thisbox = [view box];
-	thisitem = thisbox->items;
+thisitem = thisbox->items;
-	object = item;
+object = item;
-	/* Query the objects */
+/* Query the objects */
-	if([ object isKindOfClass:[ DWContainer class ] ])
+if([ object isKindOfClass:[ DWContainer class ] ])
-	{
+{
-		DWContainer *cont = item;
+DWContainer *cont = item;
-		this = item = [cont scrollview];
+this = item = [cont scrollview];
-	}
+}
-	else if([ object isKindOfClass:[ DWTree class ] ])
+else if([ object isKindOfClass:[ DWTree class ] ])
-	{
+{
-		DWTree *tree = item;
+DWTree *tree = item;
-		this = item = [tree scrollview];
+this = item = [tree scrollview];
-	}
+}
-	/* Duplicate the existing data */
+/* Duplicate the existing data */
 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 for(z=0;z<thisbox->count;z++)
 {
 tmpitem[z+1] = thisitem[z];
 }
-	/* Sanity checks */
+/* Sanity checks */
 if(vsize && !height)
 height = 1;
 if(hsize && !width)
 width = 1;
-	/* Fill in the item data appropriately */
+/* Fill in the item data appropriately */
-	if([ object isKindOfClass:[ DWBox class ] ])
+if([ object isKindOfClass:[ DWBox class ] ])
 tmpitem[0].type = TYPEBOX;
 else
 tmpitem[0].type = TYPEITEM;
 tmpitem[0].hwnd = item;
 else
 tmpitem[0].vsize = SIZESTATIC;
 thisbox->items = tmpitem;
-	/* Update the item count */
+/* Update the item count */
 thisbox->count++;
-	/* Add the item to the box */
+/* Add the item to the box */
-	[view addSubview:this];
+[view addSubview:this];
-	/* Free the old data */
+/* Free the old data */
 if(thisbox->count)
 free(thisitem);
 DW_MUTEX_UNLOCK;
 }
 */
 void API dw_box_pack_start(HWND box, HWND item, int width, int height, int hsize, int vsize, int pad)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSObject *object = box;
+NSObject *object = box;
-	DWBox *view = box;
+DWBox *view = box;
-	DWBox *this = item;
+DWBox *this = item;
-	Box *thisbox;
+Box *thisbox;
 int z;
 Item *tmpitem, *thisitem;
-	/* Query the objects */
+/* Query the objects */
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = box;
+NSWindow *window = box;
-		view = [window contentView];
+view = [window contentView];
-	}
+}
-	thisbox = [view box];
+thisbox = [view box];
-	thisitem = thisbox->items;
+thisitem = thisbox->items;
-	object = item;
+object = item;
-	/* Query the objects */
+/* Query the objects */
-	if([ object isKindOfClass:[ DWContainer class ] ])
+if([ object isKindOfClass:[ DWContainer class ] ])
-	{
+{
-		DWContainer *cont = item;
+DWContainer *cont = item;
-		this = item = [cont scrollview];
+this = item = [cont scrollview];
-	}
+}
-	else if([ object isKindOfClass:[ DWTree class ] ])
+else if([ object isKindOfClass:[ DWTree class ] ])
-	{
+{
-		DWTree *tree = item;
+DWTree *tree = item;
-		this = item = [tree scrollview];
+this = item = [tree scrollview];
-	}
+}
-	/* Duplicate the existing data */
+/* Duplicate the existing data */
 tmpitem = malloc(sizeof(Item)*(thisbox->count+1));
 for(z=0;z<thisbox->count;z++)
 {
 tmpitem[z] = thisitem[z];
 }
-	/* Sanity checks */
+/* Sanity checks */
 if(vsize && !height)
 height = 1;
 if(hsize && !width)
 width = 1;
-	/* Fill in the item data appropriately */
+/* Fill in the item data appropriately */
-	if([ object isKindOfClass:[ DWBox class ] ])
+if([ object isKindOfClass:[ DWBox class ] ])
 tmpitem[thisbox->count].type = TYPEBOX;
 else
 tmpitem[thisbox->count].type = TYPEITEM;
 tmpitem[thisbox->count].hwnd = item;
 if(vsize)
 tmpitem[thisbox->count].vsize = SIZEEXPAND;
 else
 tmpitem[thisbox->count].vsize = SIZESTATIC;
-	thisbox->items = tmpitem;
+thisbox->items = tmpitem;
-	/* Update the item count */
+/* Update the item count */
 thisbox->count++;
-	/* Add the item to the box */
+/* Add the item to the box */
-	[view addSubview:this];
+[view addSubview:this];
-	/* Free the old data */
+/* Free the old data */
 if(thisbox->count)
 free(thisitem);
 DW_MUTEX_UNLOCK;
 }
 [button setButtonType:NSMomentaryPushInButton];
 [button setBezelStyle:NSRoundedBezelStyle];
 [button setImagePosition:NSNoImage];
 [button setAlignment:NSCenterTextAlignment];
 [[button cell] setControlTint:NSBlueControlTint];
-	return button;
+return button;
 }
 /*
 * Create a new Entryfield window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_entryfield_new(char *text, ULONG cid)
 {
-	DWEntryField *entry = [[DWEntryField alloc] init];
+DWEntryField *entry = [[DWEntryField alloc] init];
-	[entry setStringValue:[ NSString stringWithUTF8String:text ]];
+[entry setStringValue:[ NSString stringWithUTF8String:text ]];
-	[entry setTag:cid];
+[entry setTag:cid];
-	return entry;
+return entry;
 }
 /*
 * Create a new Entryfield (password) window (widget) to be packed.
 * Parameters:
 *       text: The default text to be in the entryfield widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_entryfield_password_new(char *text, ULONG cid)
 {
-	DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
+DWEntryFieldPassword *entry = [[DWEntryFieldPassword alloc] init];
-	[entry setStringValue:[ NSString stringWithUTF8String:text ]];
+[entry setStringValue:[ NSString stringWithUTF8String:text ]];
-	[entry setTag:cid];
+[entry setTag:cid];
-	return entry;
+return entry;
 }
 /*
 * Sets the entryfield character limit.
 * Parameters:
 *          handle: Handle to the spinbutton to be set.
 *          limit: Number of characters the entryfield will take.
 */
 void API dw_entryfield_set_limit(HWND handle, ULONG limit)
 {
-	NSLog(@"dw_entryfield_set_limit() unimplemented\n");
+NSLog(@"dw_entryfield_set_limit() unimplemented\n");
 }
 /*
 * Create a new bitmap button window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_spinbutton_new(char *text, ULONG cid)
 {
 DWSpinButton *spinbutton = [[DWSpinButton alloc] init];
-	NSStepper *stepper = [spinbutton stepper];
+NSStepper *stepper = [spinbutton stepper];
 [stepper setIncrement:1];
 [stepper setTag:cid];
 return spinbutton;
 }
 *          position: Current value of the spinbutton.
 */
 void API dw_spinbutton_set_pos(HWND handle, long position)
 {
 DWSpinButton *spinbutton = handle;
-	NSStepper *stepper = [spinbutton stepper];
+NSStepper *stepper = [spinbutton stepper];
 NSTextField *textfield = [spinbutton textfield];
 [stepper setIntValue:(int)position];
 [textfield takeIntValueFrom:stepper];
 }
 *          lower: Lower limit.
 */
 void API dw_spinbutton_set_limits(HWND handle, long upper, long lower)
 {
 DWSpinButton *spinbutton = handle;
-	NSStepper *stepper = [spinbutton stepper];
+NSStepper *stepper = [spinbutton stepper];
 [stepper setMinValue:(double)lower];
 [stepper setMaxValue:(double)upper];
 }
 /*
 *          handle: Handle to the spinbutton to be queried.
 */
 long API dw_spinbutton_get_pos(HWND handle)
 {
 DWSpinButton *spinbutton = handle;
-	NSStepper *stepper = [spinbutton stepper];
+NSStepper *stepper = [spinbutton stepper];
 return (long)[stepper integerValue];
 }
 /*
 * Create a new radiobutton window (widget) to be packed.
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_radiobutton_new(char *text, ULONG cid)
 {
-	DWButton *button = _button_new(text, cid);
+DWButton *button = _button_new(text, cid);
-	[button setButtonType:NSRadioButton];
+[button setButtonType:NSRadioButton];
-	return button;
+return button;
 }
 /*
 * Create a new slider window (widget) to be packed.
 * Parameters:
 * Parameters:
 *          handle: Handle to the slider to be queried.
 */
 unsigned int API dw_slider_get_pos(HWND handle)
 {
-	DWSlider *slider = handle;
+DWSlider *slider = handle;
-	double val = [slider doubleValue];
+double val = [slider doubleValue];
-	return (int)val;
+return (int)val;
 }
 /*
 * Sets the slider position.
 * Parameters:
 *          handle: Handle to the slider to be set.
 *          position: Position of the slider withing the range.
 */
 void API dw_slider_set_pos(HWND handle, unsigned int position)
 {
-	DWSlider *slider = handle;
+DWSlider *slider = handle;
-	[slider setDoubleValue:(double)position];
+[slider setDoubleValue:(double)position];
 }
 /*
 * Create a new scrollbar window (widget) to be packed.
 * Parameters:
 * Parameters:
 *          handle: Handle to the scrollbar to be queried.
 */
 unsigned int API dw_scrollbar_get_pos(HWND handle)
 {
-	DWScrollbar *scrollbar = handle;
+DWScrollbar *scrollbar = handle;
-	float range = [scrollbar range];
+float range = [scrollbar range];
-	float fresult = [scrollbar doubleValue] * range;
+float fresult = [scrollbar doubleValue] * range;
-	return (int)fresult;
+return (int)fresult;
 }
 /*
 * Sets the scrollbar position.
 * Parameters:
 *          handle: Handle to the scrollbar to be set.
 *          position: Position of the scrollbar withing the range.
 */
 void API dw_scrollbar_set_pos(HWND handle, unsigned int position)
 {
-	DWScrollbar *scrollbar = handle;
+DWScrollbar *scrollbar = handle;
-	double range = (double)[scrollbar range];
+double range = (double)[scrollbar range];
-	double newpos = (double)position/range;
+double newpos = (double)position/range;
-	[scrollbar setDoubleValue:newpos];
+[scrollbar setDoubleValue:newpos];
 }
 /*
 * Sets the scrollbar range.
 * Parameters:
 *          range: Maximum range value.
 *          visible: Visible area relative to the range.
 */
 void API dw_scrollbar_set_range(HWND handle, unsigned int range, unsigned int visible)
 {
-	DWScrollbar *scrollbar = handle;
+DWScrollbar *scrollbar = handle;
-	float knob = (float)visible/(float)range;
+float knob = (float)visible/(float)range;
-	[scrollbar setRange:(float)range andVisible:(float)visible];
+[scrollbar setRange:(float)range andVisible:(float)visible];
-	[scrollbar setKnobProportion:knob];
+[scrollbar setKnobProportion:knob];
 }
 /*
 * Create a new percent bar window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_percent_new(ULONG cid)
 {
-	DWPercent *percent = [[DWPercent alloc] init];
+DWPercent *percent = [[DWPercent alloc] init];
 [percent setStyle:NSProgressIndicatorBarStyle];
-	[percent setBezeled:YES];
+[percent setBezeled:YES];
-	[percent setMaxValue:100];
+[percent setMaxValue:100];
-	[percent setMinValue:0];
+[percent setMinValue:0];
 [percent incrementBy:1];
 [percent setIndeterminate:NO];
-	/*[percent setTag:cid]; Why doesn't this work? */
+/*[percent setTag:cid]; Why doesn't this work? */
-	return percent;
+return percent;
 }
 /*
 * Sets the percent bar position.
 * Parameters:
 *          handle: Handle to the percent bar to be set.
 *          position: Position of the percent bar withing the range.
 */
 void API dw_percent_set_pos(HWND handle, unsigned int position)
 {
-	DWPercent *percent = handle;
+DWPercent *percent = handle;
-	[percent setDoubleValue:(double)position];
+[percent setDoubleValue:(double)position];
 }
 /*
 * Create a new checkbox window (widget) to be packed.
 * Parameters:
 *       text: The text to be display by the static text widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_checkbox_new(char *text, ULONG cid)
 {
-	DWButton *button = _button_new(text, cid);
+DWButton *button = _button_new(text, cid);
-	[button setButtonType:NSSwitchButton];
+[button setButtonType:NSSwitchButton];
-	[button setBezelStyle:NSRegularSquareBezelStyle];
+[button setBezelStyle:NSRegularSquareBezelStyle];
-	return button;
+return button;
 }
 /*
 * Returns the state of the checkbox.
 * Parameters:
 *          handle: Handle to the checkbox to be queried.
 */
 int API dw_checkbox_get(HWND handle)
 {
-	DWButton *button = handle;
+DWButton *button = handle;
-	if([button state])
+if([button state])
-	{
+{
-		return TRUE;
+return TRUE;
-	}
+}
-	return FALSE;
+return FALSE;
 }
 /*
 * Sets the state of the checkbox.
 * Parameters:
 *          handle: Handle to the checkbox to be queried.
 *          value: TRUE for checked, FALSE for unchecked.
 */
 void API dw_checkbox_set(HWND handle, int value)
 {
-	DWButton *button = handle;
+DWButton *button = handle;
-	if(value)
+if(value)
-	{
+{
-		[button setState:NSOnState];
+[button setState:NSOnState];
-	}
+}
-	else
+else
-	{
+{
-		[button setState:NSOffState];
+[button setState:NSOffState];
-	}
+}
 }
 /* Common code for containers and listboxes */
 HWND _cont_new(ULONG cid, int multi)
 {
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
-	DWContainer *cont = [[DWContainer alloc] init];
+DWContainer *cont = [[DWContainer alloc] init];
 [cont setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
-	if(multi)
+if(multi)
-	{
+{
-		[cont setAllowsMultipleSelection:YES];
+[cont setAllowsMultipleSelection:YES];
-	}
+}
-	else
+else
-	{
+{
-		[cont setAllowsMultipleSelection:NO];
+[cont setAllowsMultipleSelection:NO];
-	}
+}
-	[cont setDataSource:cont];
+[cont setDataSource:cont];
 [scrollview setDocumentView:cont];
 [cont setTag:cid];
 [scrollview release];
-	return cont;
+return cont;
 }
 /*
 * Create a new listbox window (widget) to be packed.
 * Parameters:
 */
 HWND API dw_listbox_new(ULONG cid, int multi)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = _cont_new(cid, multi);
+DWContainer *cont = _cont_new(cid, multi);
-	[cont setHeaderView:nil];
+[cont setHeaderView:nil];
-	int type = DW_CFA_STRING;
+int type = DW_CFA_STRING;
-	[cont setup];
+[cont setup];
-	NSTableColumn *column = [[NSTableColumn alloc] init];
+NSTableColumn *column = [[NSTableColumn alloc] init];
-	[cont addTableColumn:column];
+[cont addTableColumn:column];
-	[cont addColumn:column andType:type];
+[cont addColumn:column andType:type];
 [column release];
 DW_MUTEX_UNLOCK;
-	return cont;
+return cont;
 }
 /*
 * Appends the specified text to the listbox's (or combobox) entry list.
 * Parameters:
 */
 void API dw_listbox_append(HWND handle, char *text)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		[combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
+[combo addItemWithObjectValue:[ NSString stringWithUTF8String:text ]];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 NSString *nstr = [ NSString stringWithUTF8String:text ];
 NSArray *newrow = [NSArray arrayWithObject:nstr];
 */
 void API dw_listbox_insert(HWND handle, char *text, int pos)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		[combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
+[combo insertItemWithObjectValue:[ NSString stringWithUTF8String:text ] atIndex:pos];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 NSString *nstr = [ NSString stringWithUTF8String:text ];
 NSArray *newrow = [NSArray arrayWithObject:nstr];
 */
 void API dw_listbox_list_append(HWND handle, char **text, int count)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		int z;
+int z;
-		for(z=0;z<count;z++)
+for(z=0;z<count;z++)
-		{
+{
-			[combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
+[combo addItemWithObjectValue:[ NSString stringWithUTF8String:text[z] ]];
-		}
+}
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
-		int z;
+int z;
-		for(z=0;z<count;z++)
+for(z=0;z<count;z++)
-		{
+{
 NSString *nstr = [ NSString stringWithUTF8String:text[z] ];
 NSArray *newrow = [[NSArray alloc] arrayWithObject:nstr];
 [cont addRow:newrow];
 }
 */
 void API dw_listbox_clear(HWND handle)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		[combo removeAllItems];
+[combo removeAllItems];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 [cont clear];
 * Parameters:
 *          handle: Handle to the listbox to be cleared.
 */
 int API dw_listbox_count(HWND handle)
 {
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		return (int)[combo numberOfItems];
+return (int)[combo numberOfItems];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 DWContainer *cont = handle;
 int result = (int)[cont numberOfRowsInTableView:cont];
 DW_MUTEX_UNLOCK;
 return result;
 }
-	return 0;
+return 0;
 }
 /*
 * Sets the topmost item in the viewport.
 * Parameters:
 */
 void API dw_listbox_set_top(HWND handle, int top)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		[combo scrollItemAtIndexToTop:top];
+[combo scrollItemAtIndexToTop:top];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 [cont scrollRowToVisible:top];
 */
 void API dw_listbox_get_text(HWND handle, unsigned int index, char *buffer, unsigned int length)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
 int count = (int)[combo numberOfItems];
 if(index > count)
 {
 *buffer = '\0';
 else
 {
 NSString *nstr = [combo itemObjectValueAtIndex:index];
 strncpy(buffer, [ nstr UTF8String ], length - 1);
 }
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 int count = (int)[cont numberOfRowsInTableView:cont];
 */
 void API dw_listbox_set_text(HWND handle, unsigned int index, char *buffer)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
 int count = (int)[combo numberOfItems];
 if(index <= count)
 {
 [combo removeItemAtIndex:index];
 [combo insertItemWithObjectValue:[ NSString stringWithUTF8String:buffer ] atIndex:index];
 }
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 int count = (int)[cont numberOfRowsInTableView:cont];
 * Parameters:
 *          handle: Handle to the listbox to be queried.
 */
 unsigned int API dw_listbox_selected(HWND handle)
 {
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		return (int)[combo indexOfSelectedItem];
+return (int)[combo indexOfSelectedItem];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 DWContainer *cont = handle;
 int result = (int)[cont selectedRow];
 DW_MUTEX_UNLOCK;
 return result;
 }
-	return -1;
+return -1;
 }
 /*
 * Returns the index to the current selected item or -1 when done.
 * Parameters:
 */
 int API dw_listbox_selected_multi(HWND handle, int where)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
 int retval = -1;
 if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 {
 retval = (int)result;
 }
 }
 DW_MUTEX_UNLOCK;
-	return retval;
+return retval;
 }
 /*
 * Sets the selection state of a given index.
 * Parameters:
 */
 void API dw_listbox_select(HWND handle, int index, int state)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		if(state)
+if(state)
-			[combo selectItemAtIndex:index];
+[combo selectItemAtIndex:index];
-		else
+else
-			[combo deselectItemAtIndex:index];
+[combo deselectItemAtIndex:index];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 NSIndexSet *selected = [[NSIndexSet alloc] initWithIndex:(NSUInteger)index];
 */
 void API dw_listbox_delete(HWND handle, int index)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id object = handle;
+id object = handle;
-	if([object isMemberOfClass:[DWComboBox class]])
+if([object isMemberOfClass:[DWComboBox class]])
-	{
+{
-		DWComboBox *combo = handle;
+DWComboBox *combo = handle;
-		[combo removeItemAtIndex:index];
+[combo removeItemAtIndex:index];
-	}
+}
 else if([object isMemberOfClass:[DWContainer class]])
 {
 DWContainer *cont = handle;
 [cont removeRow:index];
 *       text: The default text to be in the combpbox widget.
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_combobox_new(char *text, ULONG cid)
 {
-	DWComboBox *combo = [[DWComboBox alloc] init];
+DWComboBox *combo = [[DWComboBox alloc] init];
 [combo setDelegate:combo];
 [combo setTag:cid];
-	return combo;
+return combo;
 }
 /*
 * Create a new Multiline Editbox window (widget) to be packed.
 * Parameters:
 *       id: An ID to be used with dw_window_from_id() or 0L.
 */
 HWND API dw_mle_new(ULONG cid)
 {
-	DWMLE *mle = [[DWMLE alloc] init];
+DWMLE *mle = [[DWMLE alloc] init];
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 [scrollview setAutoresizingMask:NSViewWidthSizable|NSViewHeightSizable];
 [scrollview setDocumentView:mle];
 [mle setAutoresizingMask:NSViewWidthSizable];
 /* [mle setTag:cid]; Why doesn't this work? */
 [mle release];
-	return scrollview;
+return scrollview;
 }
 /*
 * Adds text to an MLE box and returns the current point.
 * Parameters:
 *          handle: Handle to the MLE to be queried.
 *          startpoint: Point to start entering text.
 */
 unsigned int API dw_mle_import(HWND handle, char *buffer, int startpoint)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSString *nstr = [NSString stringWithUTF8String:buffer];
 NSMutableString *ms = [ts mutableString];
 [ms insertString:nstr atIndex:(startpoint+1)];
-	return (unsigned int)strlen(buffer) + startpoint;
+return (unsigned int)strlen(buffer) + startpoint;
 }
 /*
 * Grabs text from an MLE box.
 * Parameters:
 *          length: Amount of text to be grabbed.
 */
 void API dw_mle_export(HWND handle, char *buffer, int startpoint, int length)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 strncpy(buffer, [ms UTF8String], length);
 }
 *          lines: A pointer to a variable to return the number of lines.
 */
 void API dw_mle_get_size(HWND handle, unsigned long *bytes, unsigned long *lines)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 *bytes = [ms length];
 *lines = 0; /* TODO: Line count */
 *          length: Amount of text to be deleted.
 */
 void API dw_mle_delete(HWND handle, int startpoint, int length)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 [ms deleteCharactersInRange:NSMakeRange(startpoint+1, length)];
 }
 *          handle: Handle to the MLE to be cleared.
 */
 void API dw_mle_clear(HWND handle)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 NSTextStorage *ts = [mle textStorage];
 NSMutableString *ms = [ts mutableString];
 NSUInteger length = [ms length];
 [ms deleteCharactersInRange:NSMakeRange(0, length)];
 }
 *          line: Line to be visible.
 */
 void API dw_mle_set_visible(HWND handle, int line)
 {
 /*NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 [mle scrollrangeToVisible:NSMakeRange(0,13)];*/
-	NSLog(@"dw_mle_set_visible() unimplemented\n");
+NSLog(@"dw_mle_set_visible() unimplemented\n");
 }
 /*
 * Sets the editablity of an MLE box.
 * Parameters:
 *          state: TRUE if it can be edited, FALSE for readonly.
 */
 void API dw_mle_set_editable(HWND handle, int state)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
-	if(state)
+if(state)
-	{
+{
-		[mle setEditable:YES];
+[mle setEditable:YES];
-	}
+}
-	else
+else
-	{
+{
-		[mle setEditable:NO];
+[mle setEditable:NO];
-	}
+}
 }
 /*
 * Sets the word wrap state of an MLE box.
 * Parameters:
 *          state: TRUE if it wraps, FALSE if it doesn't.
 */
 void API dw_mle_set_word_wrap(HWND handle, int state)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 if(state)
 {
 [mle setHorizontallyResizable:NO];
 }
 else
 *          point: Point to position cursor.
 */
 void API dw_mle_set_cursor(HWND handle, int point)
 {
 NSScrollView *sv = handle;
-	DWMLE *mle = [sv documentView];
+DWMLE *mle = [sv documentView];
 [mle setSelectedRange: NSMakeRange(point,point)];
 }
 /*
 * Finds text in an MLE box.
 *          point: Start point of search.
 *          flags: Search specific flags.
 */
 int API dw_mle_search(HWND handle, char *text, int point, unsigned long flags)
 {
-	NSLog(@"dw_mle_search() unimplemented\n");
+NSLog(@"dw_mle_search() unimplemented\n");
-	return 0;
+return 0;
 }
 /*
 * Stops redrawing of an MLE box.
 * Parameters:
 *          handle: Handle to the MLE to freeze.
 */
 void API dw_mle_freeze(HWND handle)
 {
-	/* Don't think this is necessary */
+/* Don't think this is necessary */
 }
 /*
 * Resumes redrawing of an MLE box.
 * Parameters:
 *          handle: Handle to the MLE to thaw.
 */
 void API dw_mle_thaw(HWND handle)
 {
-	/* Don't think this is necessary */
+/* Don't think this is necessary */
 }
 /*
 * Create a new status text window (widget) to be packed.
 * Parameters:
 HWND API dw_status_text_new(char *text, ULONG cid)
 {
 NSTextField *textfield = dw_text_new(text, cid);
 [textfield setBordered:YES];
 if(DWOSMinor > 5)
-	{
+{
 [textfield setBezeled:YES];
 [textfield setBezelStyle:NSTextFieldSquareBezel];
 }
 [textfield setBackgroundColor:[NSColor clearColor]];
 [textfield setDrawsBackground:NO];
 * Returns:
 *       A handle to the widget or NULL on failure.
 */
 HWND API dw_render_new(unsigned long cid)
 {
-	DWRender *render = [[DWRender alloc] init];
+DWRender *render = [[DWRender alloc] init];
 /* [render setTag:cid]; Why doesn't this work? */
-	return render;
+return render;
 }
 /* Sets the current foreground drawing color.
 * Parameters:
 *       red: red value.
 *       blue: blue value.
 */
 void API dw_color_foreground_set(unsigned long value)
 {
 /* This may need to be thread specific */
-	_foreground = _get_color(value);
+_foreground = _get_color(value);
 }
 /* Sets the current background drawing color.
 * Parameters:
 *       red: red value.
 *       blue: blue value.
 */
 void API dw_color_background_set(unsigned long value)
 {
 /* This may need to be thread specific */
-	_background = _get_color(value);
+_background = _get_color(value);
 }
 /* Allows the user to choose a color using the system's color chooser dialog.
 * Parameters:
 *       value: current color
 /* Set defaults for the dialog. */
 [colorDlg setContinuous:NO];
 [colorDlg setTarget:colorDlg];
 [colorDlg setAction:@selector(changeColor:)];
 }
 dialog = dw_dialog_new(colorDlg);
 [colorDlg setColor:color];
 [colorDlg setDialog:dialog];
 [colorDlg makeKeyAndOrderFront:nil];
 */
 void API dw_draw_point(HWND handle, HPIXMAP pixmap, int x, int y)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id image = handle;
+id image = handle;
-	if(pixmap)
+if(pixmap)
-	{
+{
-		image = (id)pixmap->image;
+image = (id)pixmap->image;
-		[image lockFocus];
+[image lockFocus];
-	}
+}
-	else
+else
-	{
+{
-		if([image lockFocusIfCanDraw] == NO)
+if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-		_DWLastDrawable = handle;
+_DWLastDrawable = handle;
-	}
+}
-	NSBezierPath* aPath = [NSBezierPath bezierPath];
+NSBezierPath* aPath = [NSBezierPath bezierPath];
-	[aPath setLineWidth: 0.5];
+[aPath setLineWidth: 0.5];
 NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
 [color set];
-	[aPath moveToPoint:NSMakePoint(x, y)];
+[aPath moveToPoint:NSMakePoint(x, y)];
-	[aPath stroke];
+[aPath stroke];
-	[image unlockFocus];
+[image unlockFocus];
 DW_MUTEX_UNLOCK;
 }
 /* Draw a line on a window (preferably a render window).
 * Parameters:
 */
 void API dw_draw_line(HWND handle, HPIXMAP pixmap, int x1, int y1, int x2, int y2)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id image = handle;
+id image = handle;
-	if(pixmap)
+if(pixmap)
-	{
+{
-		image = (id)pixmap->image;
+image = (id)pixmap->image;
-		[image lockFocus];
+[image lockFocus];
-	}
+}
-	else
+else
-	{
+{
-		if([image lockFocusIfCanDraw] == NO)
+if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-		_DWLastDrawable = handle;
+_DWLastDrawable = handle;
-	}
+}
-	NSBezierPath* aPath = [NSBezierPath bezierPath];
+NSBezierPath* aPath = [NSBezierPath bezierPath];
-	[aPath setLineWidth: 0.5];
+[aPath setLineWidth: 0.5];
 NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
 [color set];
-	[aPath moveToPoint:NSMakePoint(x1, y1)];
+[aPath moveToPoint:NSMakePoint(x1, y1)];
-	[aPath lineToPoint:NSMakePoint(x2, y2)];
+[aPath lineToPoint:NSMakePoint(x2, y2)];
-	[aPath stroke];
+[aPath stroke];
-	[image unlockFocus];
+[image unlockFocus];
 DW_MUTEX_UNLOCK;
 }
 /* Draw text on a window (preferably a render window).
 * Parameters:
 */
 void API dw_draw_polygon( HWND handle, HPIXMAP pixmap, int fill, int npoints, int *x, int *y )
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id image = handle;
+id image = handle;
-	int z;
+int z;
-	if(pixmap)
+if(pixmap)
-	{
+{
-		image = (id)pixmap->image;
+image = (id)pixmap->image;
-		[image lockFocus];
+[image lockFocus];
-	}
+}
-	else
+else
-	{
+{
-		if([image lockFocusIfCanDraw] == NO)
+if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-		_DWLastDrawable = handle;
+_DWLastDrawable = handle;
-	}
+}
-	NSBezierPath* aPath = [NSBezierPath bezierPath];
+NSBezierPath* aPath = [NSBezierPath bezierPath];
-	[aPath setLineWidth: 0.5];
+[aPath setLineWidth: 0.5];
 NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
 [color set];
-	[aPath moveToPoint:NSMakePoint(*x, *y)];
+[aPath moveToPoint:NSMakePoint(*x, *y)];
-	for(z=1;z<npoints;z++)
+for(z=1;z<npoints;z++)
-	{
+{
-		[aPath lineToPoint:NSMakePoint(x[z], y[z])];
+[aPath lineToPoint:NSMakePoint(x[z], y[z])];
-	}
+}
-	[aPath closePath];
+[aPath closePath];
-	if(fill)
+if(fill)
-	{
+{
-		[aPath fill];
+[aPath fill];
-	}
+}
-	[aPath stroke];
+[aPath stroke];
-	[image unlockFocus];
+[image unlockFocus];
 DW_MUTEX_UNLOCK;
 }
 /* Draw a rectangle on a window (preferably a render window).
 * Parameters:
 */
 void API dw_draw_rect(HWND handle, HPIXMAP pixmap, int fill, int x, int y, int width, int height)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	id image = handle;
+id image = handle;
-	if(pixmap)
+if(pixmap)
-	{
+{
-		image = (id)pixmap->image;
+image = (id)pixmap->image;
-		[image lockFocus];
+[image lockFocus];
-	}
+}
-	else
+else
-	{
+{
-		if([image lockFocusIfCanDraw] == NO)
+if([image lockFocusIfCanDraw] == NO)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-		_DWLastDrawable = handle;
+_DWLastDrawable = handle;
-	}
+}
-	NSBezierPath* aPath = [NSBezierPath bezierPath];
+NSBezierPath* aPath = [NSBezierPath bezierPath];
-	[aPath setLineWidth: 0.5];
+[aPath setLineWidth: 0.5];
 NSColor *color = [NSColor colorWithDeviceRed: DW_RED_VALUE(_foreground)/255.0 green: DW_GREEN_VALUE(_foreground)/255.0 blue: DW_BLUE_VALUE(_foreground)/255.0 alpha: 1];
 [color set];
-	[aPath moveToPoint:NSMakePoint(x, y)];
+[aPath moveToPoint:NSMakePoint(x, y)];
-	[aPath lineToPoint:NSMakePoint(x, y + height)];
+[aPath lineToPoint:NSMakePoint(x, y + height)];
-	[aPath lineToPoint:NSMakePoint(x + width, y + height)];
+[aPath lineToPoint:NSMakePoint(x + width, y + height)];
-	[aPath lineToPoint:NSMakePoint(x + width, y)];
+[aPath lineToPoint:NSMakePoint(x + width, y)];
 [aPath closePath];
 [aPath fill];
-	[aPath stroke];
+[aPath stroke];
-	[image unlockFocus];
+[image unlockFocus];
 DW_MUTEX_UNLOCK;
 }
 /*
 * Create a tree object to be packed.
 HWND API dw_tree_new(ULONG cid)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 NSScrollView *scrollview  = [[NSScrollView alloc] init];
-	DWTree *tree = [[DWTree alloc] init];
+DWTree *tree = [[DWTree alloc] init];
 [tree setScrollview:scrollview];
 [scrollview setBorderType:NSBezelBorder];
 [scrollview setHasVerticalScroller:YES];
 [scrollview setAutohidesScrollers:YES];
 [tree setAllowsMultipleSelection:NO];
-	[tree setDataSource:tree];
+[tree setDataSource:tree];
 [scrollview setDocumentView:tree];
 [tree setHeaderView:nil];
 [tree setTag:cid];
 [scrollview release];
 DW_MUTEX_UNLOCK;
 [treenode addPointer:itemdata];
 [treenode addPointer:NULL];
 [tree addTree:treenode and:parent];
 [tree reloadData];
 DW_MUTEX_UNLOCK;
-	return treenode;
+return treenode;
 }
 /*
 * Inserts an item into a tree window (widget).
 * Parameters:
 *          handle: Handle to the tree containing the item.
 *          item: Handle of the item to be modified.
 */
 HTREEITEM API dw_tree_get_parent(HWND handle, HTREEITEM item)
 {
-	NSLog(@"dw_tree_get_parent() unimplemented\n");
+NSLog(@"dw_tree_get_parent() unimplemented\n");
-	return HWND_DESKTOP;
+return HWND_DESKTOP;
 }
 /*
 * Sets the text and icon of an item in a tree window (widget).
 * Parameters:
 */
 int API dw_container_setup(HWND handle, unsigned long *flags, char **titles, int count, int separator)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	int z;
+int z;
-	DWContainer *cont = handle;
+DWContainer *cont = handle;
-	[cont setup];
+[cont setup];
-	for(z=0;z<count;z++)
+for(z=0;z<count;z++)
-	{
+{
-		NSTableColumn *column = [[NSTableColumn alloc] init];
+NSTableColumn *column = [[NSTableColumn alloc] init];
-		[[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
+[[column headerCell] setStringValue:[ NSString stringWithUTF8String:titles[z] ]];
 if(flags[z] & DW_CFA_BITMAPORICON)
 {
 NSImageCell *imagecell = [[NSImageCell alloc] init];
 [column setDataCell:imagecell];
 if(z == 0 && titles[z] && strcmp(titles[z], "Icon") == 0)
 [column setResizingMask:NSTableColumnNoResizing];
 [column setWidth:20];
 }
 [imagecell release];
 }
-		[cont addTableColumn:column];
+[cont addTableColumn:column];
-		[cont addColumn:column andType:(int)flags[z]];
+[cont addColumn:column andType:(int)flags[z]];
 [column release];
-	}
+}
 DW_MUTEX_UNLOCK;
-	return TRUE;
+return TRUE;
 }
 /*
 * Sets up the filesystem columns, note: filesystem always has an icon/filename field.
 * Parameters:
 *          titles: An array of strings with column text titles.
 *          count: The number of columns (this should match the arrays).
 */
 int API dw_filesystem_setup(HWND handle, unsigned long *flags, char **titles, int count)
 {
-	char **newtitles = malloc(sizeof(char *) * (count + 2));
+char **newtitles = malloc(sizeof(char *) * (count + 2));
-	unsigned long *newflags = malloc(sizeof(unsigned long) * (count + 2));
+unsigned long *newflags = malloc(sizeof(unsigned long) * (count + 2));
-	newtitles[0] = "Icon";
+newtitles[0] = "Icon";
-	newtitles[1] = "Filename";
+newtitles[1] = "Filename";
-	newflags[0] = DW_CFA_BITMAPORICON | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
+newflags[0] = DW_CFA_BITMAPORICON | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
-	newflags[1] = DW_CFA_STRING | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
+newflags[1] = DW_CFA_STRING | DW_CFA_LEFT | DW_CFA_HORZSEPARATOR;
-	memcpy(&newtitles[2], titles, sizeof(char *) * count);
+memcpy(&newtitles[2], titles, sizeof(char *) * count);
-	memcpy(&newflags[2], flags, sizeof(unsigned long) * count);
+memcpy(&newflags[2], flags, sizeof(unsigned long) * count);
-	dw_container_setup(handle, newflags, newtitles, count + 2, 0);
+dw_container_setup(handle, newflags, newtitles, count + 2, 0);
-	free(newtitles);
+free(newtitles);
-	free(newflags);
+free(newflags);
-	return TRUE;
+return TRUE;
 }
 /*
 * Allocates memory used to populate a container.
 * Parameters:
 */
 void * API dw_container_alloc(HWND handle, int rowcount)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = handle;
+DWContainer *cont = handle;
-	[cont addRows:rowcount];
+[cont addRows:rowcount];
 DW_MUTEX_UNLOCK;
-	return cont;
+return cont;
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 */
 void API dw_container_set_item(HWND handle, void *pointer, int column, int row, void *data)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = handle;
+DWContainer *cont = handle;
-	id object = nil;
+id object = nil;
-	int type = [cont cellType:column];
+int type = [cont cellType:column];
-	int lastadd = [cont lastAddPoint];
+int lastadd = [cont lastAddPoint];
 if(!data)
 {
 DW_MUTEX_UNLOCK;
 return;
 }
-	if(type & DW_CFA_BITMAPORICON)
+if(type & DW_CFA_BITMAPORICON)
-	{
+{
-		object = *((NSImage **)data);
+object = *((NSImage **)data);
-	}
+}
-	else if(type & DW_CFA_STRING)
+else if(type & DW_CFA_STRING)
-	{
+{
 char *str = *((char **)data);
-		object = [ NSString stringWithUTF8String:str ];
+object = [ NSString stringWithUTF8String:str ];
-	}
+}
-	else
+else
-	{
+{
-		char textbuffer[100];
+char textbuffer[100];
-		if(type & DW_CFA_ULONG)
+if(type & DW_CFA_ULONG)
-		{
+{
-			ULONG tmp = *((ULONG *)data);
+ULONG tmp = *((ULONG *)data);
-			sprintf(textbuffer, "%lu", tmp);
+sprintf(textbuffer, "%lu", tmp);
-		}
+}
-		else if(type & DW_CFA_DATE)
+else if(type & DW_CFA_DATE)
-		{
+{
-			struct tm curtm;
+struct tm curtm;
-			CDATE cdate = *((CDATE *)data);
+CDATE cdate = *((CDATE *)data);
-			memset( &curtm, 0, sizeof(curtm) );
+memset( &curtm, 0, sizeof(curtm) );
-			curtm.tm_mday = cdate.day;
+curtm.tm_mday = cdate.day;
-			curtm.tm_mon = cdate.month - 1;
+curtm.tm_mon = cdate.month - 1;
-			curtm.tm_year = cdate.year - 1900;
+curtm.tm_year = cdate.year - 1900;
-			strftime(textbuffer, 100, "%x", &curtm);
+strftime(textbuffer, 100, "%x", &curtm);
-		}
+}
-		else if(type & DW_CFA_TIME)
+else if(type & DW_CFA_TIME)
-		{
+{
-			struct tm curtm;
+struct tm curtm;
-			CTIME ctime = *((CTIME *)data);
+CTIME ctime = *((CTIME *)data);
-			memset( &curtm, 0, sizeof(curtm) );
+memset( &curtm, 0, sizeof(curtm) );
-			curtm.tm_hour = ctime.hours;
+curtm.tm_hour = ctime.hours;
-			curtm.tm_min = ctime.minutes;
+curtm.tm_min = ctime.minutes;
-			curtm.tm_sec = ctime.seconds;
+curtm.tm_sec = ctime.seconds;
-			strftime(textbuffer, 100, "%X", &curtm);
+strftime(textbuffer, 100, "%X", &curtm);
-		}
+}
-		else
+else
-		{
+{
 DW_MUTEX_UNLOCK;
-			return;
+return;
-		}
+}
-		object = [ NSString stringWithUTF8String:textbuffer ];
+object = [ NSString stringWithUTF8String:textbuffer ];
-	}
+}
-	[cont editCell:object at:(row+lastadd) and:column];
+[cont editCell:object at:(row+lastadd) and:column];
 DW_MUTEX_UNLOCK;
 }
 /*
 * Changes an existing item in specified row and column to the given data.
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_container_change_item(HWND handle, int column, int row, void *data)
 {
-	dw_container_set_item(handle, NULL, column, row, data);
+dw_container_set_item(handle, NULL, column, row, data);
 }
 /*
 * Changes an existing item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_change_item(HWND handle, int column, int row, void *data)
 {
-	dw_container_change_item(handle, column+2, row, data);
+dw_container_change_item(handle, column+2, row, data);
 }
 /*
 * Changes an item in specified row and column to the given data.
 * Parameters:
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_change_file(HWND handle, int row, char *filename, HICN icon)
 {
 dw_container_change_item(handle, 0, row, &icon);
-	dw_container_change_item(handle, 1, row, &filename);
+dw_container_change_item(handle, 1, row, &filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_set_file(HWND handle, void *pointer, int row, char *filename, HICN icon)
 {
 dw_container_set_item(handle, pointer, 0, row, &icon);
-	dw_container_set_item(handle, pointer, 1, row, &filename);
+dw_container_set_item(handle, pointer, 1, row, &filename);
 }
 /*
 * Sets an item in specified row and column to the given data.
 * Parameters:
 *          row: Zero based row of data being set.
 *          data: Pointer to the data to be added.
 */
 void API dw_filesystem_set_item(HWND handle, void *pointer, int column, int row, void *data)
 {
-	dw_container_set_item(handle, pointer, column+2, row, data);
+dw_container_set_item(handle, pointer, column+2, row, data);
 }
 /*
 * Gets column type for a container column
 * Parameters:
 */
 void API dw_container_set_row_title(void *pointer, int row, char *title)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = pointer;
+DWContainer *cont = pointer;
-	[cont setRow:row title:title];
+[cont setRow:row title:title];
 DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the title of a row in the container.
 */
 void API dw_container_insert(HWND handle, void *pointer, int rowcount)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = handle;
+DWContainer *cont = handle;
 [cont reloadData];
 DW_MUTEX_UNLOCK;
 }
 /*
 */
 void API dw_container_clear(HWND handle, int redraw)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = handle;
+DWContainer *cont = handle;
-	[cont clear];
+[cont clear];
 if(redraw)
 {
 [cont reloadData];
 }
 DW_MUTEX_UNLOCK;
 *                  DW_SCROLL_BOTTOM. (rows is ignored for last two)
 *       rows: The number of rows to be scrolled.
 */
 void API dw_container_scroll(HWND handle, int direction, long rows)
 {
-	NSLog(@"dw_container_scroll() unimplemented\n");
+NSLog(@"dw_container_scroll() unimplemented\n");
 }
 /*
 * Starts a new query of a container.
 * Parameters:
 {
 retval = [cont getRowTitle:(int)result];
 [cont setLastQueryPoint:(int)result];
 }
 DW_MUTEX_UNLOCK;
-	return retval;
+return retval;
 }
 /*
 * Continues an existing query of a container.
 * Parameters:
 {
 retval = [cont getRowTitle:(int)result];
 [cont setLastQueryPoint:(int)result];
 }
 DW_MUTEX_UNLOCK;
-	return retval;
+return retval;
 }
 /*
 * Cursors the item with the text speficied, and scrolls to that item.
 * Parameters:
 */
 void API dw_container_optimize(HWND handle)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWContainer *cont = handle;
+DWContainer *cont = handle;
-	/*[cont sizeToFit];*/
+/*[cont sizeToFit];*/
-	[cont setColumnAutoresizingStyle:NSTableViewUniformColumnAutoresizingStyle];
+[cont setColumnAutoresizingStyle:NSTableViewUniformColumnAutoresizingStyle];
 DW_MUTEX_UNLOCK;
 }
 /*
 * Inserts an icon into the taskbar.
 *       icon: Icon handle to display in the taskbar.
 *       bubbletext: Text to show when the mouse is above the icon.
 */
 void API dw_taskbar_insert(HWND handle, HICN icon, char *bubbletext)
 {
-	NSLog(@"dw_taskbar_insert() unimplemented\n");
+NSLog(@"dw_taskbar_insert() unimplemented\n");
 }
 /*
 * Deletes an icon from the taskbar.
 * Parameters:
 *       handle: Window handle that was used with dw_taskbar_insert().
 *       icon: Icon handle that was used with dw_taskbar_insert().
 */
 void API dw_taskbar_delete(HWND handle, HICN icon)
 {
-	NSLog(@"dw_taskbar_delete() unimplemented\n");
+NSLog(@"dw_taskbar_delete() unimplemented\n");
 }
 /*
 * Obtains an icon from a module (or header in GTK).
 * Parameters:
 HICN API dw_icon_load(unsigned long module, unsigned long resid)
 {
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 NSString *filepath = [respath stringByAppendingFormat:@"/%u.png", resid];
-	NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
+NSImage *image = [[NSImage alloc] initWithContentsOfFile:filepath];
-	return image;
+return image;
 }
 /*
 * Obtains an icon from a file.
 * Parameters:
 if(!image)
 {
 nstr = [nstr stringByAppendingString:@".png"];
 image = [[NSImage alloc] initWithContentsOfFile:nstr];
 }
-	return image;
+return image;
 }
 /*
 * Obtains an icon from data
 * Parameters:
 *                 DW pick the appropriate file extension.
 *                 (ICO on OS/2 or Windows, XPM on Unix)
 */
 HICN API dw_icon_load_from_data(char *data, int len)
 {
-	NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
+NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
-	NSImage *image = [[NSImage alloc] initWithData:thisdata];
+NSImage *image = [[NSImage alloc] initWithData:thisdata];
-	return image;
+return image;
 }
 /*
 * Frees a loaded resource in OS/2 and Windows.
 * Parameters:
 HWND API dw_splitbar_new(int type, HWND topleft, HWND bottomright, unsigned long cid)
 {
 HWND tmpbox = dw_box_new(DW_VERT, 0);
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	DWSplitBar *split = [[DWSplitBar alloc] init];
+DWSplitBar *split = [[DWSplitBar alloc] init];
 [split setDelegate:split];
 dw_box_pack_start(tmpbox, topleft, 0, 0, TRUE, TRUE, 0);
-	[split addSubview:tmpbox];
+[split addSubview:tmpbox];
 tmpbox = dw_box_new(DW_VERT, 0);
 dw_box_pack_start(tmpbox, bottomright, 0, 0, TRUE, TRUE, 0);
-	[split addSubview:tmpbox];
+[split addSubview:tmpbox];
-	if(type == DW_VERT)
+if(type == DW_VERT)
-	{
+{
-		[split setVertical:NO];
+[split setVertical:NO];
-	}
+}
 else
 {
 [split setVertical:YES];
 }
 /* [split setTag:cid]; Why doesn't this work? */
 DW_MUTEX_UNLOCK;
-	return split;
+return split;
 }
 /*
 * Sets the position of a splitbar (pecentage).
 * Parameters:
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
 void API dw_splitbar_set(HWND handle, float percent)
 {
-	DWSplitBar *split = handle;
+DWSplitBar *split = handle;
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
 NSRect rect = [split frame];
 float pos;
 /* Calculate the position based on the size */
 * Parameters:
 *       handle: The handle to the splitbar returned by dw_splitbar_new().
 */
 float API dw_splitbar_get(HWND handle)
 {
-	DWSplitBar *split = handle;
+DWSplitBar *split = handle;
 NSRect rect1 = [split frame];
 NSArray *subviews = [split subviews];
 NSView *view = [subviews objectAtIndex:0];
 NSRect rect2 = [view frame];
 float pos, total, retval = 0.0;
 }
 if(total > 0)
 {
 retval = pos / total;
 }
-	return retval;
+return retval;
 }
 /*
 * Create a bitmap object to be packed.
 * Parameters:
 */
 HWND API dw_bitmap_new(ULONG cid)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSImageView *bitmap = [[NSImageView alloc] init];
+NSImageView *bitmap = [[NSImageView alloc] init];
-	[bitmap setImageFrameStyle:NSImageFrameNone];
+[bitmap setImageFrameStyle:NSImageFrameNone];
-	[bitmap setEditable:NO];
+[bitmap setEditable:NO];
 [bitmap setTag:cid];
 DW_MUTEX_UNLOCK;
-	return bitmap;
+return bitmap;
 }
 /*
 * Creates a pixmap with given parameters.
 * Parameters:
 */
 HPIXMAP API dw_pixmap_new(HWND handle, unsigned long width, unsigned long height, int depth)
 {
 NSSize size = { (float)width, (float)height };
 HPIXMAP pixmap;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
 pixmap->width = width;
 pixmap->height = height;
 pixmap->handle = handle;
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_file(HWND handle, char *filename)
 {
 HPIXMAP pixmap;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
 NSString *nstr = [ NSString stringWithUTF8String:filename ];
 NSImage *image = [[NSImage alloc] initWithContentsOfFile:nstr];
 if(!image)
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_new_from_data(HWND handle, char *data, int len)
 {
 HPIXMAP pixmap;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
 NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
 NSImage *image = [[NSImage alloc] initWithData:thisdata];
 NSSize size = [image size];
 /*
 * Creates a bitmap mask for rendering bitmaps with transparent backgrounds
 */
 void API dw_pixmap_set_transparent_color( HPIXMAP pixmap, ULONG color )
 {
-	NSLog(@"dw_pixmap_set_transparent_color() unimplemented\n");
+NSLog(@"dw_pixmap_set_transparent_color() unimplemented\n");
 }
 /*
 * Creates a pixmap from internal resource graphic specified by id.
 * Parameters:
 *       A handle to a pixmap or NULL on failure.
 */
 HPIXMAP API dw_pixmap_grab(HWND handle, ULONG resid)
 {
 HPIXMAP pixmap;
 if(!(pixmap = calloc(1,sizeof(struct _hpixmap))))
 return NULL;
 NSBundle *bundle = [NSBundle mainBundle];
 NSString *respath = [bundle resourcePath];
 *       pixmap: Handle to a pixmap returned by
 *               dw_pixmap_new..
 */
 void API dw_pixmap_destroy(HPIXMAP pixmap)
 {
-	NSImage *image = (NSImage *)pixmap->image;
+NSImage *image = (NSImage *)pixmap->image;
-	[image dealloc];
+[image dealloc];
-	free(pixmap);
+free(pixmap);
 }
 /*
 * Copies from one item to another.
 * Parameters:
 void dw_calendar_set_date(HWND handle, unsigned int year, unsigned int month, unsigned int day)
 {
 DWCalendar *calendar = handle;
 NSDate *date;
 char buffer[100];
 sprintf(buffer, "%04d-%02d-%02d 00:00:00 +0600", year, month, day);
 date = [[NSDate alloc] initWithString:[ NSString stringWithUTF8String:buffer ]];
 [calendar setDateValue:date];
 [date release];
 }
 *       handle: Handle to the window.
 *       action: One of the DW_HTML_* constants.
 */
 void API dw_html_action(HWND handle, int action)
 {
-	WebView *html = handle;
+WebView *html = handle;
-	switch(action)
+switch(action)
-	{
+{
-		case DW_HTML_GOBACK:
+case DW_HTML_GOBACK:
-			[html goBack];
+[html goBack];
-			break;
+break;
-		case DW_HTML_GOFORWARD:
+case DW_HTML_GOFORWARD:
-			[html goForward];
+[html goForward];
-			break;
+break;
-		case DW_HTML_GOHOME:
+case DW_HTML_GOHOME:
-			break;
+break;
-		case DW_HTML_SEARCH:
+case DW_HTML_SEARCH:
-			break;
+break;
-		case DW_HTML_RELOAD:
+case DW_HTML_RELOAD:
-			[html reload:html];
+[html reload:html];
-			break;
+break;
-		case DW_HTML_STOP:
+case DW_HTML_STOP:
-			[html stopLoading:html];
+[html stopLoading:html];
-			break;
+break;
-		case DW_HTML_PRINT:
+case DW_HTML_PRINT:
-			break;
+break;
-	}
+}
 }
 /*
 * Render raw HTML code in the embedded HTML widget..
 * Parameters:
 * Returns:
 *       0 on success.
 */
 int API dw_html_raw(HWND handle, char *string)
 {
-	WebView *html = handle;
+WebView *html = handle;
-	[[html mainFrame] loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
+[[html mainFrame] loadHTMLString:[ NSString stringWithUTF8String:string ] baseURL:nil];
-	return 0;
+return 0;
 }
 /*
 * Render file or web page in the embedded HTML widget..
 * Parameters:
 * Returns:
 *       0 on success.
 */
 int API dw_html_url(HWND handle, char *url)
 {
-	WebView *html = handle;
+WebView *html = handle;
-	[[html mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
+[[html mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:[ NSString stringWithUTF8String:url ]]]];
-	return 0;
+return 0;
 }
 /*
 * Create a new HTML window (widget) to be packed.
 * Not available under OS/2, eCS
 */
 HWND API dw_html_new(unsigned long cid)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	WebView *web = [[WebView alloc] init];
+WebView *web = [[WebView alloc] init];
 /* [web setTag:cid]; Why doesn't this work? */
 DW_MUTEX_UNLOCK;
-	return web;
+return web;
 }
 /*
 * Returns the current X and Y coordinates of the mouse pointer.
 * Parameters:
 */
 void API dw_pointer_query_pos(long *x, long *y)
 {
 NSPoint mouseLoc;
 mouseLoc = [NSEvent mouseLocation];
-	if(x)
+if(x)
-	{
+{
-		*x = mouseLoc.x;
+*x = mouseLoc.x;
-	}
+}
-	if(y)
+if(y)
-	{
+{
-		*y = mouseLoc.y;
+*y = mouseLoc.y;
-	}
+}
 }
 /*
 * Sets the X and Y coordinates of the mouse pointer.
 * Parameters:
 *       x: X coordinate.
 *       y: Y coordinate.
 */
 void API dw_pointer_set_pos(long x, long y)
 {
-	/* From what I have read this isn't possible, agaist human interface rules */
+/* From what I have read this isn't possible, agaist human interface rules */
 }
 /*
 * Create a menu object to be popped up.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
 HMENUI API dw_menu_new(ULONG cid)
 {
-	NSMenu *menu = [[[NSMenu alloc] init] autorelease];
+NSMenu *menu = [[[NSMenu alloc] init] autorelease];
-	[menu setAutoenablesItems:NO];
+[menu setAutoenablesItems:NO];
 /* [menu setTag:cid]; Why doesn't this work? */
-	return menu;
+return menu;
 }
 /*
 * Create a menubar on a window.
 * Parameters:
 *       location: Handle of a window frame to be attached to.
 */
 HMENUI API dw_menubar_new(HWND location)
 {
-	NSWindow *window = location;
+NSWindow *window = location;
-	NSMenu *windowmenu = _generate_main_menu();
+NSMenu *windowmenu = _generate_main_menu();
-	[[window contentView] setMenu:windowmenu];
+[[window contentView] setMenu:windowmenu];
-	return (HMENUI)windowmenu;
+return (HMENUI)windowmenu;
 }
 /*
 * Destroys a menu created with dw_menubar_new or dw_menu_new.
 * Parameters:
 *       menu: Handle of a menu.
 */
 void API dw_menu_destroy(HMENUI *menu)
 {
-	NSMenu *thismenu = *menu;
+NSMenu *thismenu = *menu;
-	[thismenu release];
+[thismenu release];
 }
 /*
 * Pops up a context menu at given x and y coordinates.
 * Parameters:
 [NSMenu popUpContextMenu:thismenu withEvent:fake forView:view];
 }
 char _removetilde(char *dest, char *src)
 {
-	int z, cur=0;
+int z, cur=0;
-	char accel = '\0';
+char accel = '\0';
-	for(z=0;z<strlen(src);z++)
+for(z=0;z<strlen(src);z++)
-	{
+{
-		if(src[z] != '~')
+if(src[z] != '~')
-		{
+{
-			dest[cur] = src[z];
+dest[cur] = src[z];
-			cur++;
+cur++;
-		}
+}
-		else
+else
-		{
+{
-			accel = src[z+1];
+accel = src[z+1];
-		}
+}
-	}
+}
-	dest[cur] = 0;
+dest[cur] = 0;
-	return accel;
+return accel;
 }
 /*
 * Adds a menuitem or submenu to an existing menu.
 * Parameters:
 *       flags: Extended attributes to set on the menu.
 *       submenu: Handle to an existing menu to be a submenu or NULL.
 */
 HWND API dw_menu_append_item(HMENUI menux, char *title, ULONG itemid, ULONG flags, int end, int check, HMENUI submenux)
 {
-	NSMenu *menu = menux;
+NSMenu *menu = menux;
-	NSMenu *submenu = submenux;
+NSMenu *submenu = submenux;
-	NSMenuItem *item = NULL;
+NSMenuItem *item = NULL;
-	if(strlen(title) == 0)
+if(strlen(title) == 0)
-	{
+{
-		[menu addItem:[NSMenuItem separatorItem]];
+[menu addItem:[NSMenuItem separatorItem]];
-	}
+}
-	else
+else
-	{
+{
-		char accel[2];
+char accel[2];
-		char *newtitle = malloc(strlen(title)+1);
+char *newtitle = malloc(strlen(title)+1);
-		NSString *nstr;
+NSString *nstr;
-		accel[0] = _removetilde(newtitle, title);
+accel[0] = _removetilde(newtitle, title);
-		accel[1] = 0;
+accel[1] = 0;
-		nstr = [ NSString stringWithUTF8String:newtitle ];
+nstr = [ NSString stringWithUTF8String:newtitle ];
-		free(newtitle);
+free(newtitle);
-		item = [menu addItemWithTitle:	nstr
+item = [menu addItemWithTitle:  nstr
-										action:@selector(menuHandler:)
+action:@selector(menuHandler:)
-										keyEquivalent:[ NSString stringWithUTF8String:accel ]];
+keyEquivalent:[ NSString stringWithUTF8String:accel ]];
-		[item setTag:itemid];
+[item setTag:itemid];
-		if(flags & DW_MIS_CHECKED)
+if(flags & DW_MIS_CHECKED)
-		{
+{
-			[item setState:NSOnState];
+[item setState:NSOnState];
-		}
+}
-		if(flags & DW_MIS_DISABLED)
+if(flags & DW_MIS_DISABLED)
-		{
+{
-			[item setEnabled:NO];
+[item setEnabled:NO];
-		}
+}
-		if(submenux)
+if(submenux)
-		{
+{
-			[submenu setTitle:nstr];
+[submenu setTitle:nstr];
-			[menu setSubmenu:submenu forItem:item];
+[menu setSubmenu:submenu forItem:item];
-		}
+}
-		return item;
+return item;
-	}
+}
-	return item;
+return item;
 }
 /*
 * Sets the state of a menu item check.
 * Deprecated; use dw_menu_item_set_state()
 *       id: Menuitem id.
 *       check: TRUE for checked FALSE for not checked.
 */
 void API dw_menu_item_set_check(HMENUI menux, unsigned long itemid, int check)
 {
-	id menu = menux;
+id menu = menux;
-	NSMenuItem *menuitem = (NSMenuItem *)[menu itemWithTag:itemid];
+NSMenuItem *menuitem = (NSMenuItem *)[menu itemWithTag:itemid];
-	if(menuitem != nil)
+if(menuitem != nil)
-	{
+{
-		if(check)
+if(check)
-		{
+{
-			[menuitem setState:NSOnState];
+[menuitem setState:NSOnState];
-		}
+}
-		else
+else
-		{
+{
-			[menuitem setState:NSOffState];
+[menuitem setState:NSOffState];
-		}
+}
-	}
+}
 }
 /*
 * Sets the state of a menu item.
 * Parameters:
 *       flags: DW_MIS_ENABLED/DW_MIS_DISABLED
 *              DW_MIS_CHECKED/DW_MIS_UNCHECKED
 */
 void API dw_menu_item_set_state(HMENUI menux, unsigned long itemid, unsigned long state)
 {
-	id menu = menux;
+id menu = menux;
-	NSMenuItem *menuitem = (NSMenuItem *)[menu itemWithTag:itemid];
+NSMenuItem *menuitem = (NSMenuItem *)[menu itemWithTag:itemid];
-	if(menuitem != nil)
+if(menuitem != nil)
-	{
+{
-		if(state & DW_MIS_CHECKED)
+if(state & DW_MIS_CHECKED)
-		{
+{
-			[menuitem setState:NSOnState];
+[menuitem setState:NSOnState];
-		}
+}
-		else if(state & DW_MIS_UNCHECKED)
+else if(state & DW_MIS_UNCHECKED)
-		{
+{
-			[menuitem setState:NSOffState];
+[menuitem setState:NSOffState];
-		}
+}
-		if(state & DW_MIS_ENABLED)
+if(state & DW_MIS_ENABLED)
-		{
+{
-			[menuitem setEnabled:YES];
+[menuitem setEnabled:YES];
-		}
+}
-		else if(state & DW_MIS_DISABLED)
+else if(state & DW_MIS_DISABLED)
-		{
+{
-			[menuitem setEnabled:NO];
+[menuitem setEnabled:NO];
-		}
+}
-	}
+}
 }
 /* Gets the notebook page from associated ID */
 DWNotebookPage *_notepage_from_id(DWNotebook *notebook, unsigned long pageid)
 {
-	NSArray *pages = [notebook tabViewItems];
+NSArray *pages = [notebook tabViewItems];
-	for(DWNotebookPage *notepage in pages)
+for(DWNotebookPage *notepage in pages)
-	{
+{
-		if([notepage pageid] == pageid)
+if([notepage pageid] == pageid)
-		{
+{
-			return notepage;
+return notepage;
-		}
+}
-	}
+}
-	return nil;
+return nil;
 }
 /*
 * Create a notebook object to be packed.
 * Parameters:
 *       id: An ID to be used for getting the resource from the
 *           resource file.
 */
 HWND API dw_notebook_new(ULONG cid, int top)
 {
-	DWNotebook *notebook = [[DWNotebook alloc] init];
+DWNotebook *notebook = [[DWNotebook alloc] init];
-	[notebook setDelegate:notebook];
+[notebook setDelegate:notebook];
 /* [notebook setTag:cid]; Why doesn't this work? */
-	return notebook;
+return notebook;
 }
 /*
 * Adds a new page to specified notebook.
 * Parameters:
 *          flags: Any additional page creation flags.
 *          front: If TRUE page is added at the beginning.
 */
 unsigned long API dw_notebook_page_new(HWND handle, ULONG flags, int front)
 {
-	DWNotebook *notebook = handle;
+DWNotebook *notebook = handle;
-	NSInteger page = [notebook pageid];
+NSInteger page = [notebook pageid];
-	DWNotebookPage *notepage = [[DWNotebookPage alloc] initWithIdentifier:nil];
+DWNotebookPage *notepage = [[DWNotebookPage alloc] initWithIdentifier:nil];
-	[notepage setPageid:(NSInteger)page];
+[notepage setPageid:(NSInteger)page];
-	if(front)
+if(front)
-	{
+{
-		[notebook insertTabViewItem:notepage atIndex:(NSInteger)0];
+[notebook insertTabViewItem:notepage atIndex:(NSInteger)0];
-	}
+}
-	else
+else
-	{
+{
-		[notebook addTabViewItem:notepage];
+[notebook addTabViewItem:notepage];
-	}
+}
-	[notebook setPageid:(page+1)];
+[notebook setPageid:(page+1)];
 [notepage release];
-	return (unsigned long)page;
+return (unsigned long)page;
 }
 /*
 * Remove a page from a notebook.
 * Parameters:
 *          handle: Handle to the notebook widget.
 *          pageid: ID of the page to be destroyed.
 */
 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid)
 {
-	DWNotebook *notebook = handle;
+DWNotebook *notebook = handle;
-	DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
-	if(notepage != nil)
+if(notepage != nil)
-	{
+{
-		[notebook removeTabViewItem:notepage];
+[notebook removeTabViewItem:notepage];
-		[notepage release];
+[notepage release];
-	}
+}
 }
 /*
 * Queries the currently visible page ID.
 * Parameters:
 *          handle: Handle to the notebook widget.
 */
 unsigned long API dw_notebook_page_get(HWND handle)
 {
-	DWNotebook *notebook = handle;
+DWNotebook *notebook = handle;
-	DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
+DWNotebookPage *notepage = (DWNotebookPage *)[notebook selectedTabViewItem];
-	return [notepage pageid];
+return [notepage pageid];
 }
 /*
 * Sets the currently visibale page ID.
 * Parameters:
 *          handle: Handle to the notebook widget.
 *          pageid: ID of the page to be made visible.
 */
 void API dw_notebook_page_set(HWND handle, unsigned int pageid)
 {
-	DWNotebook *notebook = handle;
+DWNotebook *notebook = handle;
-	DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
-	if(notepage != nil)
+if(notepage != nil)
-	{
+{
-		[notebook selectTabViewItem:notepage];
+[notebook selectTabViewItem:notepage];
-	}
+}
 }
 /*
 * Sets the text on the specified notebook tab.
 * Parameters:
 *          pageid: Page ID of the tab to set.
 *          text: Pointer to the text to set.
 */
 void API dw_notebook_page_set_text(HWND handle, ULONG pageid, char *text)
 {
-	DWNotebook *notebook = handle;
+DWNotebook *notebook = handle;
-	DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
-	if(notepage != nil)
+if(notepage != nil)
-	{
+{
-		[notepage setLabel:[ NSString stringWithUTF8String:text ]];
+[notepage setLabel:[ NSString stringWithUTF8String:text ]];
-	}
+}
 }
 /*
 * Sets the text on the specified notebook tab status area.
 * Parameters:
 *          pageid: Page ID of the tab to set.
 *          text: Pointer to the text to set.
 */
 void API dw_notebook_page_set_status_text(HWND handle, ULONG pageid, char *text)
 {
-	/* Note supported here... do nothing */
+/* Note supported here... do nothing */
 }
 /*
 * Packs the specified box into the notebook page.
 * Parameters:
 *          pageid: Page ID in the notebook which is being packed.
 *          page: Box handle to be packed.
 */
 void API dw_notebook_pack(HWND handle, ULONG pageid, HWND page)
 {
-	DWNotebook *notebook = handle;
+DWNotebook *notebook = handle;
-	DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
-	if(notepage != nil)
+if(notepage != nil)
-	{
+{
 HWND tmpbox = dw_box_new(DW_VERT, 0);
 DWBox *box = tmpbox;
 dw_box_pack_start(tmpbox, page, 0, 0, TRUE, TRUE, 0);
-		[notepage setView:box];
+[notepage setView:box];
-	}
+}
 }
 /*
 * Create a new Window Frame.
 * Parameters:
 styleMask:(flStyle | NSTexturedBackgroundWindowMask)
 backing:NSBackingStoreBuffered
 defer:false];
 [window setTitle:[ NSString stringWithUTF8String:title ]];
 DWView *view = [[DWView alloc] init];
 [window setContentView:view];
 [window setDelegate:view];
 [view release];
 /* If it isn't a toplevel window... */
 */
 void API dw_window_set_pointer(HWND handle, int pointertype)
 {
 id object = handle;
-	if([ object isKindOfClass:[ NSView class ] ])
+if([ object isKindOfClass:[ NSView class ] ])
-	{
+{
-		NSView *view = handle;
+NSView *view = handle;
 if(pointertype == DW_POINTER_DEFAULT)
 {
 [view discardCursorRects];
 }
 *           handle: The window handle to make visible.
 */
 int API dw_window_show(HWND handle)
 {
 NSObject *object = handle;
 if([ object isKindOfClass:[ NSWindow class ] ])
 {
 NSWindow *window = handle;
 NSRect rect = [window frame];
 if([window isMiniaturized])
 * Parameters:
 *           handle: The window handle to make visible.
 */
 int API dw_window_hide(HWND handle)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
 [window orderOut:nil];
 }
-	return 0;
+return 0;
 }
 /*
 * Sets the colors used by a specified window (widget) handle.
 * Parameters:
 id object = handle;
 unsigned long _fore = _get_color(fore);
 unsigned long _back = _get_color(back);
 NSColor *fg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_fore)/255.0 green: DW_GREEN_VALUE(_fore)/255.0 blue: DW_BLUE_VALUE(_fore)/255.0 alpha: 1];
 NSColor *bg = [NSColor colorWithDeviceRed: DW_RED_VALUE(_back)/255.0 green: DW_GREEN_VALUE(_back)/255.0 blue: DW_BLUE_VALUE(_back)/255.0 alpha: 1];
 if([object isMemberOfClass:[NSTextFieldCell class]])
 {
 NSTextFieldCell *text = object;
 [text setTextColor:fg];
 }
 else if([object isMemberOfClass:[DWBox class]])
 {
-		DWBox *box = object;
+DWBox *box = object;
-		[box setColor:_back];
+[box setColor:_back];
 }
 else if([object isMemberOfClass:[DWButton class]])
 {
 DWButton *button = object;
 *          handle: The window (widget) handle.
 *          border: Size of the window border in pixels.
 */
 int API dw_window_set_border(HWND handle, int border)
 {
-	return 0;
+return 0;
 }
 /*
 * Sets the style of a given window (widget).
 * Parameters:
 *          width: New width in pixels.
 *          height: New height in pixels.
 */
 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
 {
-	id object = handle;
+id object = handle;
 if(DWOSMinor > 5 && [object isMemberOfClass:[NSWindow class]])
 {
 NSWindow *window = object;
 int currentstyle = (int)[window styleMask];
 int tmp;
 tmp = currentstyle | (int)mask;
 tmp ^= mask;
 tmp |= style;
 [window setStyleMask:tmp];
 }
 else if([object isKindOfClass:[NSTextField class]])
 {
 NSTextField *tf = object;
 *         window: Toplevel window or dialog.
 *         defaultitem: Handle to the dialog item to be default.
 */
 void API dw_window_default(HWND window, HWND defaultitem)
 {
-	NSLog(@"dw_window_default() unimplemented\n");
+NSLog(@"dw_window_default() unimplemented\n");
 }
 /*
 * Sets window to click the default dialog item when an ENTER is pressed.
 * Parameters:
 *         window: Window (widget) to look for the ENTER press.
 *         next: Window (widget) to move to next (or click)
 */
 void API dw_window_click_default(HWND window, HWND next)
 {
-	NSLog(@"dw_window_click_default() unimplemented\n");
+NSLog(@"dw_window_click_default() unimplemented\n");
 }
 static id _DWCapture;
 /*
 * Parameters:
 *       handle: Handle to frame to be tracked.
 */
 void API dw_window_track(HWND handle)
 {
-	NSLog(@"dw_window_track() unimplemented\n");
+NSLog(@"dw_window_track() unimplemented\n");
 }
 /*
 * Changes a window's parent to newparent.
 * Parameters:
 */
 int API dw_window_destroy(HWND handle)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		[window close];
+[window close];
-	}
+}
 DW_MUTEX_UNLOCK;
-	return 0;
+return 0;
 }
 /*
 * Gets the text used for a given window.
 * Parameters:
 * Returns:
 *       text: The text associsated with a given window.
 */
 char * API dw_window_get_text(HWND handle)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSControl class ] ])
+if([ object isKindOfClass:[ NSControl class ] ])
-	{
+{
-		NSControl *control = handle;
+NSControl *control = handle;
-		NSString *nsstr = [ control stringValue];
+NSString *nsstr = [ control stringValue];
-		return strdup([ nsstr UTF8String ]);
+return strdup([ nsstr UTF8String ]);
-	}
+}
-	else if([ object isKindOfClass:[ NSWindow class ] ])
+else if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		NSString *nsstr = [ window title];
+NSString *nsstr = [ window title];
-		return strdup([ nsstr UTF8String ]);
+return strdup([ nsstr UTF8String ]);
-	}
+}
-	return NULL;
+return NULL;
 }
 /*
 * Sets the text used for a given window.
 * Parameters:
 */
 void API dw_window_set_text(HWND handle, char *text)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSControl class ] ])
+if([ object isKindOfClass:[ NSControl class ] ])
-	{
+{
-		NSControl *control = handle;
+NSControl *control = handle;
-		[control setStringValue:[ NSString stringWithUTF8String:text ]];
+[control setStringValue:[ NSString stringWithUTF8String:text ]];
-	}
+}
-	else if([ object isKindOfClass:[ NSWindow class ] ])
+else if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		[window setTitle:[ NSString stringWithUTF8String:text ]];
+[window setTitle:[ NSString stringWithUTF8String:text ]];
-	}
+}
 DW_MUTEX_UNLOCK;
 }
 /*
 * Disables given window (widget).
 * Parameters:
 *       handle: Handle to the window.
 */
 void API dw_window_disable(HWND handle)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSControl class ] ])
+if([ object isKindOfClass:[ NSControl class ] ])
-	{
+{
-		NSControl *control = handle;
+NSControl *control = handle;
-		[control setEnabled:NO];
+[control setEnabled:NO];
-	}
+}
 }
 /*
 * Enables given window (widget).
 * Parameters:
 *       handle: Handle to the window.
 */
 void API dw_window_enable(HWND handle)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSControl class ] ])
+if([ object isKindOfClass:[ NSControl class ] ])
-	{
+{
-		NSControl *control = handle;
+NSControl *control = handle;
-		[control setEnabled:YES];
+[control setEnabled:YES];
-	}
+}
 }
 /*
 * Sets the bitmap used for a given static window.
 * Parameters:
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
 */
 void API dw_window_set_bitmap_from_data(HWND handle, unsigned long cid, char *data, int len)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSImageView class ] ])
+if([ object isKindOfClass:[ NSImageView class ] ])
-	{
+{
-		NSImageView *iv = handle;
+NSImageView *iv = handle;
-		NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
+NSData *thisdata = [[NSData alloc] dataWithBytes:data length:len];
-		NSImage *pixmap = [[NSImage alloc] initWithData:thisdata];
+NSImage *pixmap = [[NSImage alloc] initWithData:thisdata];
 if(pixmap)
 {
 [iv setImage:pixmap];
 }
 [pixmap release];
-	}
+}
 }
 /*
 * Sets the bitmap used for a given static window.
 * Parameters:
 *                 Windows and a pixmap on Unix, pass
 *                 NULL if you use the id param)
 */
 void API dw_window_set_bitmap(HWND handle, unsigned long resid, char *filename)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSImageView class ] ])
+if([ object isKindOfClass:[ NSImageView class ] ])
-	{
+{
-		NSImageView *iv = handle;
+NSImageView *iv = handle;
 NSImage *bitmap = nil;
 if(filename)
 {
 bitmap = [[NSImage alloc] initWithContentsOfFile:[ NSString stringWithUTF8String:filename ]];
 }
 else if(resid > 0 && resid < 65536)
 {
 bitmap = dw_icon_load(0, resid);
 }
 if(bitmap)
 {
 [iv setImage:bitmap];
 }
-	}
+}
 }
 /*
 * Sets the icon used for a given window.
 * Parameters:
 *       handle: Handle to the window.
 *       id: An ID to be used to specify the icon.
 */
 void API dw_window_set_icon(HWND handle, HICN icon)
 {
-	/* This isn't needed, it is loaded from the bundle */
+/* This isn't needed, it is loaded from the bundle */
 }
 /*
 * Gets the child window handle with specified ID.
 * Parameters:
 *       handle: Handle to the parent window.
 *       id: Integer ID of the child.
 */
 HWND API dw_window_from_id(HWND handle, int cid)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	NSView *view = handle;
+NSView *view = handle;
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		view = [window contentView];
+view = [window contentView];
-	}
+}
-	return [view viewWithTag:cid];
+return [view viewWithTag:cid];
 }
 /*
 * Minimizes or Iconifies a top-level window.
 * Parameters:
 *           handle: The window handle to minimize.
 */
 int API dw_window_minimize(HWND handle)
 {
-	NSWindow *window = handle;
+NSWindow *window = handle;
-	[window miniaturize:nil];
+[window miniaturize:nil];
-	return 0;
+return 0;
 }
 /* Causes entire window to be invalidated and redrawn.
 * Parameters:
 *           handle: Toplevel window handle to be redrawn.
 */
 void API dw_window_redraw(HWND handle)
 {
-	NSWindow *window = handle;
+NSWindow *window = handle;
-	[window flushWindow];
+[window flushWindow];
 }
 /*
 * Makes the window topmost.
 * Parameters:
 *           handle: The window handle to make topmost.
 */
 int API dw_window_raise(HWND handle)
 {
-	NSWindow *window = handle;
+NSWindow *window = handle;
-	[window orderFront:nil];
+[window orderFront:nil];
-	return 0;
+return 0;
 }
 /*
 * Makes the window bottommost.
 * Parameters:
 *           handle: The window handle to make bottommost.
 */
 int API dw_window_lower(HWND handle)
 {
-	NSWindow *window = handle;
+NSWindow *window = handle;
-	[window orderBack:nil];
+[window orderBack:nil];
-	return 0;
+return 0;
 }
 /*
 * Sets the size of a given window (widget).
 * Parameters:
 */
 void API dw_window_set_size(HWND handle, ULONG width, ULONG height)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSObject *object = handle;
+NSObject *object = handle;
-	NSSize size;
+NSSize size;
-	size.width = width;
+size.width = width;
-	size.height = height;
+size.height = height;
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		[window setContentSize:size];
+[window setContentSize:size];
-	}
+}
 DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the position of a given window (widget).
 */
 void API dw_window_set_pos(HWND handle, LONG x, LONG y)
 {
 int _locked_by_me = FALSE;
 DW_MUTEX_LOCK;
-	NSObject *object = handle;
+NSObject *object = handle;
-	NSPoint point;
+NSPoint point;
-	point.x = x;
+point.x = x;
-	point.y = y;
+point.y = y;
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		[window setFrameOrigin:point];
+[window setFrameOrigin:point];
-	}
+}
 DW_MUTEX_UNLOCK;
 }
 /*
 * Sets the position and size of a given window (widget).
 *          width: Width of the widget.
 *          height: Height of the widget.
 */
 void API dw_window_set_pos_size(HWND handle, LONG x, LONG y, ULONG width, ULONG height)
 {
-	dw_window_set_pos(handle, x, y);
+dw_window_set_pos(handle, x, y);
-	dw_window_set_size(handle, width, height);
+dw_window_set_size(handle, width, height);
 }
 /*
 * Gets the position and size of a given window (widget).
 * Parameters:
 *          width: Width of the widget.
 *          height: Height of the widget.
 */
 void API dw_window_get_pos_size(HWND handle, LONG *x, LONG *y, ULONG *width, ULONG *height)
 {
-	NSObject *object = handle;
+NSObject *object = handle;
-	if([ object isKindOfClass:[ NSWindow class ] ])
+if([ object isKindOfClass:[ NSWindow class ] ])
-	{
+{
-		NSWindow *window = handle;
+NSWindow *window = handle;
-		NSRect rect = [window frame];
+NSRect rect = [window frame];
-		if(x)
+if(x)
-			*x = rect.origin.x;
+*x = rect.origin.x;
-		if(y)
+if(y)
-			*y = rect.origin.y;
+*y = rect.origin.y;
-		if(width)
+if(width)
-			*width = rect.size.width;
+*width = rect.size.width;
-		if(height)
+if(height)
-			*height = rect.size.height;
+*height = rect.size.height;
-		return;
+return;
-	}
+}
 }
 /*
 * Returns the width of the screen.
 */
 int API dw_screen_width(void)
 {
-	NSRect screenRect = [[NSScreen mainScreen] frame];
+NSRect screenRect = [[NSScreen mainScreen] frame];
-	return screenRect.size.width;
+return screenRect.size.width;
 }
 /*
 * Returns the height of the screen.
 */
 int API dw_screen_height(void)
 {
-	NSRect screenRect = [[NSScreen mainScreen] frame];
+NSRect screenRect = [[NSScreen mainScreen] frame];
-	return screenRect.size.height;
+return screenRect.size.height;
 }
 /* This should return the current color depth */
 unsigned long API dw_color_depth_get(void)
 {
-	NSWindowDepth screenDepth = [[NSScreen mainScreen] depth];
+NSWindowDepth screenDepth = [[NSScreen mainScreen] depth];
-	return NSBitsPerPixelFromDepth(screenDepth);
+return NSBitsPerPixelFromDepth(screenDepth);
 }
 /*
 * Returns some information about the current operating environment.
 * Parameters:
 *       env: Pointer to a DWEnv struct.
 */
 void dw_environment_query(DWEnv *env)
 {
-	struct utsname name;
+struct utsname name;
-	uname(&name);
+uname(&name);
-	strcpy(env->osName, "MacOS");
+strcpy(env->osName, "MacOS");
-	strcpy(env->buildDate, __DATE__);
+strcpy(env->buildDate, __DATE__);
-	strcpy(env->buildTime, __TIME__);
+strcpy(env->buildTime, __TIME__);
-	env->DWMajorVersion = DW_MAJOR_VERSION;
+env->DWMajorVersion = DW_MAJOR_VERSION;
-	env->DWMinorVersion = DW_MINOR_VERSION;
+env->DWMinorVersion = DW_MINOR_VERSION;
-	env->DWSubVersion = DW_SUB_VERSION;
+env->DWSubVersion = DW_SUB_VERSION;
 env->MajorVersion = DWOSMajor;
 env->MinorVersion = DWOSMinor;
 env->MajorBuild = DWOSBuild;
 }
 *       freq: Frequency.
 *       dur: Duration.
 */
 void API dw_beep(int freq, int dur)
 {
-	NSBeep();
+NSBeep();
 }
 /* Call this after drawing to the screen to make sure
 * anything you have drawn is visible.
 */
 * a given window handle.  Used in dw_window_set_data() and
 * dw_window_get_data().
 */
 UserData *_find_userdata(UserData **root, char *varname)
 {
-	UserData *tmp = *root;
+UserData *tmp = *root;
-	while(tmp)
+while(tmp)
-	{
+{
-		if(strcasecmp(tmp->varname, varname) == 0)
+if(strcasecmp(tmp->varname, varname) == 0)
-			return tmp;
+return tmp;
-		tmp = tmp->next;
+tmp = tmp->next;
-	}
+}
-	return NULL;
+return NULL;
 }
 int _new_userdata(UserData **root, char *varname, void *data)
 {
-	UserData *new = _find_userdata(root, varname);
+UserData *new = _find_userdata(root, varname);
-	if(new)
+if(new)
-	{
+{
-		new->data = data;
+new->data = data;
-		return TRUE;
+return TRUE;
-	}
+}
-	else
+else
-	{
+{
-		new = malloc(sizeof(UserData));
+new = malloc(sizeof(UserData));
-		if(new)
+if(new)
-		{
+{
-			new->varname = strdup(varname);
+new->varname = strdup(varname);
-			new->data = data;
+new->data = data;
-			new->next = NULL;
+new->next = NULL;
-			if (!*root)
+if (!*root)
-				*root = new;
+*root = new;
-			else
+else
-			{
+{
-				UserData *prev = NULL, *tmp = *root;
+UserData *prev = NULL, *tmp = *root;
-				while(tmp)
+while(tmp)
-				{
+{
-					prev = tmp;
+prev = tmp;
-					tmp = tmp->next;
+tmp = tmp->next;
-				}
+}
-				if(prev)
+if(prev)
-					prev->next = new;
+prev->next = new;
-				else
+else
-					*root = new;
+*root = new;
-			}
+}
-			return TRUE;
+return TRUE;
-		}
+}
-	}
+}
-	return FALSE;
+return FALSE;
 }
 int _remove_userdata(UserData **root, char *varname, int all)
 {
-	UserData *prev = NULL, *tmp = *root;
+UserData *prev = NULL, *tmp = *root;
-	while(tmp)
+while(tmp)
-	{
+{
-		if(all || strcasecmp(tmp->varname, varname) == 0)
+if(all || strcasecmp(tmp->varname, varname) == 0)
-		{
+{
-			if(!prev)
+if(!prev)
-			{
+{
-				*root = tmp->next;
+*root = tmp->next;
-				free(tmp->varname);
+free(tmp->varname);
-				free(tmp);
+free(tmp);
-				if(!all)
+if(!all)
-					return 0;
+return 0;
-				tmp = *root;
+tmp = *root;
-			}
+}
-			else
+else
-			{
+{
-				/* If all is true we should
+/* If all is true we should
-				 * never get here.
+* never get here.
-				 */
+*/
-				prev->next = tmp->next;
+prev->next = tmp->next;
-				free(tmp->varname);
+free(tmp->varname);
-				free(tmp);
+free(tmp);
-				return 0;
+return 0;
-			}
+}
-		}
+}
-		else
+else
-		{
+{
-			prev = tmp;
+prev = tmp;
-			tmp = tmp->next;
+tmp = tmp->next;
-		}
+}
-	}
+}
-	return 0;
+return 0;
 }
 /*
 * Add a named user data item to a window handle.
 * Parameters:
 *       dataname: A string pointer identifying which signal to be hooked.
 *       data: User data to be passed to the handler function.
 */
 void dw_window_set_data(HWND window, char *dataname, void *data)
 {
-	id object = window;
+id object = window;
 if([object isMemberOfClass:[NSWindow class]])
 {
 NSWindow *win = window;
 object = [win contentView];
 }
 else if([object isMemberOfClass:[NSScrollView class]])
 {
 NSScrollView *sv = window;
 object = [sv documentView];
 }
-	WindowData *blah = (WindowData *)[object userdata];
+WindowData *blah = (WindowData *)[object userdata];
-	if(!blah)
+if(!blah)
-	{
+{
-		if(!dataname)
+if(!dataname)
-			return;
+return;
-		blah = calloc(1, sizeof(WindowData));
+blah = calloc(1, sizeof(WindowData));
-		[object setUserdata:blah];
+[object setUserdata:blah];
-	}
+}
-	if(data)
+if(data)
-		_new_userdata(&(blah->root), dataname, data);
+_new_userdata(&(blah->root), dataname, data);
-	else
+else
-	{
+{
-		if(dataname)
+if(dataname)
-			_remove_userdata(&(blah->root), dataname, FALSE);
+_remove_userdata(&(blah->root), dataname, FALSE);
-		else
+else
-			_remove_userdata(&(blah->root), NULL, TRUE);
+_remove_userdata(&(blah->root), NULL, TRUE);
-	}
+}
 }
 /*
 * Gets a named user data item to a window handle.
 * Parameters:
 *       dataname: A string pointer identifying which signal to be hooked.
 *       data: User data to be passed to the handler function.
 */
 void *dw_window_get_data(HWND window, char *dataname)
 {
-	id object = window;
+id object = window;
 if([object isMemberOfClass:[NSWindow class]])
 {
 NSWindow *win = window;
 object = [win contentView];
 }
 else if([object isMemberOfClass:[NSScrollView class]])
 {
 NSScrollView *sv = window;
 object = [sv documentView];
 }
-	WindowData *blah = (WindowData *)[object userdata];
+WindowData *blah = (WindowData *)[object userdata];
-	if(blah && blah->root && dataname)
+if(blah && blah->root && dataname)
-	{
+{
-		UserData *ud = _find_userdata(&(blah->root), dataname);
+UserData *ud = _find_userdata(&(blah->root), dataname);
-		if(ud)
+if(ud)
-			return ud->data;
+return ud->data;
-	}
+}
-	return NULL;
+return NULL;
 }
 #define DW_TIMER_MAX 64
 NSTimer *DWTimers[DW_TIMER_MAX];
 * Returns:
 *       Timer ID for use with dw_timer_disconnect(), 0 on error.
 */
 int API dw_timer_connect(int interval, void *sigfunc, void *data)
 {
-	int z;
+int z;
-	for(z=0;z<DW_TIMER_MAX;z++)
+for(z=0;z<DW_TIMER_MAX;z++)
-	{
+{
-		if(!DWTimers[z])
+if(!DWTimers[z])
-		{
+{
-			break;
+break;
-		}
+}
-	}
+}
-	if(sigfunc && !DWTimers[z])
+if(sigfunc && !DWTimers[z])
-	{
+{
-		NSTimeInterval seconds = (double)interval / 1000.0;
+NSTimeInterval seconds = (double)interval / 1000.0;
-		NSTimer *thistimer = DWTimers[z] = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
+NSTimer *thistimer = DWTimers[z] = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
-		_new_signal(0, thistimer, z+1, sigfunc, data);
+_new_signal(0, thistimer, z+1, sigfunc, data);
-		return z+1;
+return z+1;
-	}
+}
-	return 0;
+return 0;
 }
 /*
 * Removes timer callback.
 * Parameters:
 *       id: Timer ID returned by dw_timer_connect().
 */
 void API dw_timer_disconnect(int timerid)
 {
-	SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = Root;
-	NSTimer *thistimer;
+NSTimer *thistimer;
-	/* 0 is an invalid timer ID */
+/* 0 is an invalid timer ID */
-	if(timerid < 1 || !DWTimers[timerid-1])
+if(timerid < 1 || !DWTimers[timerid-1])
-		return;
+return;
-	thistimer = DWTimers[timerid-1];
+thistimer = DWTimers[timerid-1];
-	DWTimers[timerid-1] = nil;
+DWTimers[timerid-1] = nil;
-	[thistimer invalidate];
+[thistimer invalidate];
-	while(tmp)
+while(tmp)
-	{
+{
-		if(tmp->id == timerid && tmp->window == thistimer)
+if(tmp->id == timerid && tmp->window == thistimer)
-		{
+{
-			if(prev)
+if(prev)
-			{
+{
-				prev->next = tmp->next;
+prev->next = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = prev->next;
+tmp = prev->next;
-			}
+}
-			else
+else
-			{
+{
-				Root = tmp->next;
+Root = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = Root;
+tmp = Root;
-			}
+}
-		}
+}
-		else
+else
-		{
+{
-			prev = tmp;
+prev = tmp;
-			tmp = tmp->next;
+tmp = tmp->next;
-		}
+}
-	}
+}
 }
 /*
 * Add a callback to a window event.
 * Parameters:
 *       sigfunc: The pointer to the function to be used as the callback.
 *       data: User data to be passed to the handler function.
 */
 void API dw_signal_connect(HWND window, char *signame, void *sigfunc, void *data)
 {
-	ULONG message = 0, msgid = 0;
+ULONG message = 0, msgid = 0;
-	if(window && signame && sigfunc)
+if(window && signame && sigfunc)
-	{
+{
-		if((message = _findsigmessage(signame)) != 0)
+if((message = _findsigmessage(signame)) != 0)
-		{
+{
-			_new_signal(message, window, (int)msgid, sigfunc, data);
+_new_signal(message, window, (int)msgid, sigfunc, data);
-		}
+}
-	}
+}
 }
 /*
 * Removes callbacks for a given window with given name.
 * Parameters:
 *       window: Window handle of callback to be removed.
 */
 void API dw_signal_disconnect_by_name(HWND window, char *signame)
 {
-	SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = Root;
-	ULONG message;
+ULONG message;
-	if(!window || !signame || (message = _findsigmessage(signame)) == 0)
+if(!window || !signame || (message = _findsigmessage(signame)) == 0)
-		return;
+return;
-	while(tmp)
+while(tmp)
-	{
+{
-		if(tmp->window == window && tmp->message == message)
+if(tmp->window == window && tmp->message == message)
-		{
+{
-			if(prev)
+if(prev)
-			{
+{
-				prev->next = tmp->next;
+prev->next = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = prev->next;
+tmp = prev->next;
-			}
+}
-			else
+else
-			{
+{
-				Root = tmp->next;
+Root = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = Root;
+tmp = Root;
-			}
+}
-		}
+}
-		else
+else
-		{
+{
-			prev = tmp;
+prev = tmp;
-			tmp = tmp->next;
+tmp = tmp->next;
-		}
+}
-	}
+}
 }
 /*
 * Removes all callbacks for a given window.
 * Parameters:
 *       window: Window handle of callback to be removed.
 */
 void API dw_signal_disconnect_by_window(HWND window)
 {
-	SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = Root;
-	while(tmp)
+while(tmp)
-	{
+{
-		if(tmp->window == window)
+if(tmp->window == window)
-		{
+{
-			if(prev)
+if(prev)
-			{
+{
-				prev->next = tmp->next;
+prev->next = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = prev->next;
+tmp = prev->next;
-			}
+}
-			else
+else
-			{
+{
-				Root = tmp->next;
+Root = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = Root;
+tmp = Root;
-			}
+}
-		}
+}
-		else
+else
-		{
+{
-			prev = tmp;
+prev = tmp;
-			tmp = tmp->next;
+tmp = tmp->next;
-		}
+}
-	}
+}
 }
 /*
 * Removes all callbacks for a given window with specified data.
 * Parameters:
 *       window: Window handle of callback to be removed.
 *       data: Pointer to the data to be compared against.
 */
 void API dw_signal_disconnect_by_data(HWND window, void *data)
 {
-	SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = Root;
-	while(tmp)
+while(tmp)
-	{
+{
-		if(tmp->window == window && tmp->data == data)
+if(tmp->window == window && tmp->data == data)
-		{
+{
-			if(prev)
+if(prev)
-			{
+{
-				prev->next = tmp->next;
+prev->next = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = prev->next;
+tmp = prev->next;
-			}
+}
-			else
+else
-			{
+{
-				Root = tmp->next;
+Root = tmp->next;
-				free(tmp);
+free(tmp);
-				tmp = Root;
+tmp = Root;
-			}
+}
-		}
+}
-		else
+else
-		{
+{
-			prev = tmp;
+prev = tmp;
-			tmp = tmp->next;
+tmp = tmp->next;
-		}
+}
-	}
+}
 }
 void _my_strlwr(char *buf)
 {
 int z, len = strlen(buf);
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
 HEV dw_named_event_new(char *name)
 {
-	struct sockaddr_un un;
+struct sockaddr_un un;
-	int ev, *tmpsock = (int *)malloc(sizeof(int)*2);
+int ev, *tmpsock = (int *)malloc(sizeof(int)*2);
-	HEV eve;
+HEV eve;
-	DWTID dwthread;
+DWTID dwthread;
-	if(!tmpsock)
+if(!tmpsock)
-		return NULL;
+return NULL;
-	eve = (HEV)malloc(sizeof(struct _dw_unix_event));
+eve = (HEV)malloc(sizeof(struct _dw_unix_event));
-	if(!eve)
+if(!eve)
-	{
+{
-		free(tmpsock);
+free(tmpsock);
-	return NULL;
+return NULL;
-	}
+}
-	tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
+tmpsock[0] = socket(AF_UNIX, SOCK_STREAM, 0);
-	ev = socket(AF_UNIX, SOCK_STREAM, 0);
+ev = socket(AF_UNIX, SOCK_STREAM, 0);
-	memset(&un, 0, sizeof(un));
+memset(&un, 0, sizeof(un));
-	un.sun_family=AF_UNIX;
+un.sun_family=AF_UNIX;
-	mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
+mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
-	strcpy(un.sun_path, "/tmp/.dw/");
+strcpy(un.sun_path, "/tmp/.dw/");
-	strcat(un.sun_path, name);
+strcat(un.sun_path, name);
-	/* just to be safe, this should be changed
+/* just to be safe, this should be changed
-	 * to support multiple instances.
+* to support multiple instances.
-	 */
+*/
-	remove(un.sun_path);
+remove(un.sun_path);
-	bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
+bind(tmpsock[0], (struct sockaddr *)&un, sizeof(un));
-	listen(tmpsock[0], 0);
+listen(tmpsock[0], 0);
-	connect(ev, (struct sockaddr *)&un, sizeof(un));
+connect(ev, (struct sockaddr *)&un, sizeof(un));
-	tmpsock[1] = accept(tmpsock[0], 0, 0);
+tmpsock[1] = accept(tmpsock[0], 0, 0);
-	if(tmpsock[0] < 0 || tmpsock[1] < 0 || ev < 0)
+if(tmpsock[0] < 0 || tmpsock[1] < 0 || ev < 0)
-	{
+{
-		if(tmpsock[0] > -1)
+if(tmpsock[0] > -1)
-			close(tmpsock[0]);
+close(tmpsock[0]);
-		if(tmpsock[1] > -1)
+if(tmpsock[1] > -1)
-			close(tmpsock[1]);
+close(tmpsock[1]);
-		if(ev > -1)
+if(ev > -1)
-			close(ev);
+close(ev);
-		free(tmpsock);
+free(tmpsock);
-		free(eve);
+free(eve);
-		return NULL;
+return NULL;
-	}
+}
-	/* Create a thread to handle this event semaphore */
+/* Create a thread to handle this event semaphore */
-	pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
+pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
-	eve->alive = ev;
+eve->alive = ev;
-	return eve;
+return eve;
 }
 /* Open an already existing named event semaphore.
 * Parameters:
 *         eve: Pointer to an event handle to receive handle.
 *         name: Name given to semaphore which can be opened
 *               by other processes.
 */
 HEV dw_named_event_get(char *name)
 {
-	struct sockaddr_un un;
+struct sockaddr_un un;
-	HEV eve;
+HEV eve;
-	int ev = socket(AF_UNIX, SOCK_STREAM, 0);
+int ev = socket(AF_UNIX, SOCK_STREAM, 0);
-	if(ev < 0)
+if(ev < 0)
-		return NULL;
+return NULL;
-	eve = (HEV)malloc(sizeof(struct _dw_unix_event));
+eve = (HEV)malloc(sizeof(struct _dw_unix_event));
-	if(!eve)
+if(!eve)
-	{
+{
-		close(ev);
+close(ev);
-	return NULL;
+return NULL;
-	}
+}
-	un.sun_family=AF_UNIX;
+un.sun_family=AF_UNIX;
-	mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
+mkdir("/tmp/.dw", S_IWGRP|S_IWOTH);
-	strcpy(un.sun_path, "/tmp/.dw/");
+strcpy(un.sun_path, "/tmp/.dw/");
-	strcat(un.sun_path, name);
+strcat(un.sun_path, name);
-	connect(ev, (struct sockaddr *)&un, sizeof(un));
+connect(ev, (struct sockaddr *)&un, sizeof(un));
-	eve->alive = ev;
+eve->alive = ev;
-	return eve;
+return eve;
 }
 /* Resets the event semaphore so threads who call wait
 * on this semaphore will block.
 * Parameters:
 int dw_named_event_close(HEV eve)
 {
 /* Finally close the domain socket,
 * cleanup will continue in _handle_sem.
 */
-	if(eve)
+if(eve)
-	{
+{
-		close(eve->alive);
+close(eve->alive);
-		free(eve);
+free(eve);
-	}
+}
-	return 0;
+return 0;
 }
 #if !defined(GARBAGE_COLLECT)
 pthread_key_t _dw_pool_key;
 #endif
 {
 void (*threadfunc)(void *) = NULL;
 void **tmp = (void **)data;
 /* If we aren't using garbage collection we need autorelease pools */
 #if !defined(GARBAGE_COLLECT)
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 pthread_setspecific(_dw_pool_key, pool);
 #endif
 threadfunc = (void (*)(void *))tmp[0];
 threadfunc(tmp[1]);
 /* Release the pool when we are done so we don't leak */
 #if !defined(GARBAGE_COLLECT)
 pool = pthread_getspecific(_dw_pool_key);
-	[pool drain];
+[pool drain];
 #endif
 free(tmp);
 }
 void _dw_default_font(char *fontname)
 *       data: Parameter(s) passed to the function.
 *       stack: Stack size of new thread (OS/2 and Windows only).
 */
 DWTID dw_thread_new(void *func, void *data, int stack)
 {
-	DWTID thread;
+DWTID thread;
-	void **tmp = malloc(sizeof(void *) * 2);
+void **tmp = malloc(sizeof(void *) * 2);
-	int rc;
+int rc;
 tmp[0] = func;
 tmp[1] = data;
 rc = pthread_create(&thread, NULL, (void *)_dwthreadstart, (void *)tmp);
 * Returns:
 *       -1 on error.
 */
 int dw_exec(char *program, int type, char **params)
 {
-	int ret = -1;
+int ret = -1;
 if(type == DW_EXEC_GUI)
 {
 if(params && params[0] && params[1])
 {
 [[NSWorkspace sharedWorkspace] openFile:[NSString stringWithUTF8String:params[1]]
 [[NSWorkspace sharedWorkspace] launchApplication:[NSString stringWithUTF8String:program]];
 }
 return 0;
 }
-	if((ret = fork()) == 0)
+if((ret = fork()) == 0)
-	{
+{
-		int i;
+int i;
-		for (i = 3; i < 256; i++)
-			close(i);
-		setsid();
-		if(type == DW_EXEC_CON)
+for (i = 3; i < 256; i++)
-		{
+close(i);
-			char **tmpargs;
+setsid();
-			if(!params)
+if(type == DW_EXEC_CON)
-			{
+{
-				tmpargs = malloc(sizeof(char *));
+char **tmpargs;
-				tmpargs[0] = NULL;
-			}
+if(!params)
-			else
+{
-			{
+tmpargs = malloc(sizeof(char *));
-				int z = 0;
+tmpargs[0] = NULL;
+}
-				while(params[z])
+else
-				{
+{
-					z++;
+int z = 0;
-				}
-				tmpargs = malloc(sizeof(char *)*(z+3));
+while(params[z])
-				z=0;
+{
-				tmpargs[0] = "xterm";
+z++;
-				tmpargs[1] = "-e";
+}
-				while(params[z])
+tmpargs = malloc(sizeof(char *)*(z+3));
-				{
+z=0;
-					tmpargs[z+2] = params[z];
+tmpargs[0] = "xterm";
-					z++;
+tmpargs[1] = "-e";
-				}
+while(params[z])
-				tmpargs[z+2] = NULL;
+{
-			}
+tmpargs[z+2] = params[z];
-			execvp("xterm", tmpargs);
+z++;
-			free(tmpargs);
+}
-		}
+tmpargs[z+2] = NULL;
-		/* If we got here exec failed */
+}
-		_exit(-1);
+execvp("xterm", tmpargs);
-	}
+free(tmpargs);
-	return ret;
+}
+/* If we got here exec failed */
+_exit(-1);
+}
+return ret;
 }
 /*
 * Loads a web browser pointed at the given URL.
 * Parameters:

Mercurial > dwindows

comparison mac/dw.m @ 752:cf447811d322