dwindows: mac/dw.m comparison

comparison mac/dw.m @ 2392:9fcc9ee25c4b

Mac: Prefix any global internal functions or variables with _dw or make them static to prevent global namespace polution. Done on Mac, iOS and GTK4... Will do GTK2/3 in the future, not necessary on OS/2 and Windows due to explicit exports... but may do it there too in the future.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 25 Mar 2021 07:34:13 +0000
parents	6feefce31675
children	e0c63f2cbdbf

comparison

equal deleted inserted replaced

-:a7bfb97fd80e
+:9fcc9ee25c4b
 HMTX DWThreadMutex;
 HMTX DWThreadMutex2;
 DWTID _dw_mutex_locked = (DWTID)-1;
 #endif
-unsigned long _colors[] =
+unsigned long _dw_colors[] =
 {
 0x00000000,   /* 0  black */
 0x000000bb,   /* 1  red */
 0x0000bb00,   /* 2  green */
 0x0000aaaa,   /* 3  yellow */
 /*
 * List those icons that have transparency first
 */
 #define NUM_EXTS 8
-char *image_exts[NUM_EXTS] =
+char *_dw_image_exts[NUM_EXTS+1] =
 {
 ".png",
 ".ico",
 ".icns",
 ".gif",
 ".jpg",
 ".jpeg",
 ".tiff",
-".bmp"
+".bmp",
+NULL
 };
 char *_dw_get_image_extension(const char *filename)
 {
 char *file = alloca(strlen(filename) + 6);
 /* Try various extentions */
 for ( i = 0; i < NUM_EXTS; i++ )
 {
 strcpy( file, filename );
-strcat( file, image_exts[i] );
+strcat( file, _dw_image_exts[i] );
 if ( access( file, R_OK ) == 0 )
 {
 found_ext = 1;
 break;
 }
 }
 if ( found_ext == 1 )
 {
-return image_exts[i];
+return _dw_image_exts[i];
 }
 return NULL;
 }
 /* Return the RGB color regardless if a predefined color was passed */
-unsigned long _get_color(unsigned long thiscolor)
+unsigned long _dw_get_color(unsigned long thiscolor)
 {
 if(thiscolor & DW_RGB_COLOR)
 {
 return thiscolor & ~DW_RGB_COLOR;
 }
 else if(thiscolor < 17)
 {
-return _colors[thiscolor];
+return _dw_colors[thiscolor];
 }
 return 0;
 }
 /* Returns TRUE of Mojave or later is in Dark Mode */
-BOOL _is_dark(id object)
+BOOL _dw_is_dark(id object)
 {
 #ifdef BUILDING_FOR_MOJAVE
 NSAppearance *appearance = [object effectiveAppearance];
 if(@available(macOS 10.14, *))
 #if !defined(GARBAGE_COLLECT)
 pthread_key_t _dw_pool_key;
 #endif
 pthread_key_t _dw_fg_color_key;
 pthread_key_t _dw_bg_color_key;
-int DWOSMajor, DWOSMinor, DWOSBuild;
+static int DWOSMajor, DWOSMinor, DWOSBuild;
 static char _dw_bundle_path[PATH_MAX+1] = { 0 };
 static char _dw_app_id[_DW_APP_ID_SIZE+1]= {0};
 /* Create a default colors for a thread */
-void _init_colors(void)
+void _dw_init_colors(void)
 {
 NSColor *fgcolor = [[NSColor grayColor] retain];
 pthread_setspecific(_dw_fg_color_key, fgcolor);
 pthread_setspecific(_dw_bg_color_key, NULL);
 }
 void *discfunction;
 void *data;
 } SignalHandler;
-SignalHandler *Root = NULL;
+static SignalHandler *DWRoot = NULL;
 /* Some internal prototypes */
-static void _do_resize(Box *thisbox, int x, int y);
+static void _dw_do_resize(Box *thisbox, int x, int y);
-void _handle_resize_events(Box *thisbox);
+void _dw_handle_resize_events(Box *thisbox);
-int _remove_userdata(UserData **root, const char *varname, int all);
+int _dw_remove_userdata(UserData **root, const char *varname, int all);
 int _dw_main_iteration(NSDate *date);
 NSGraphicsContext *_dw_draw_context(NSBitmapImageRep *image);
 typedef id (*DWIMP)(id, SEL, ...);
 /* Internal function to queue a window redraw */
 {
 dw_window_redraw(redraw);
 }
 }
-SignalHandler *_get_handler(HWND window, int messageid)
+SignalHandler *_dw_get_handler(HWND window, int messageid)
 {
-SignalHandler *tmp = Root;
+SignalHandler *tmp = DWRoot;
 /* Find any callbacks for this function */
 while(tmp)
 {
 if(tmp->message == messageid && window == tmp->window)
 } SignalList;
 /* List of signals */
 #define SIGNALMAX 19
-SignalList SignalTranslate[SIGNALMAX] = {
+static SignalList DWSignalTranslate[SIGNALMAX] = {
 { 1,    DW_SIGNAL_CONFIGURE },
 { 2,    DW_SIGNAL_KEY_PRESS },
 { 3,    DW_SIGNAL_BUTTON_PRESS },
 { 4,    DW_SIGNAL_BUTTON_RELEASE },
 { 5,    DW_SIGNAL_MOTION_NOTIFY },
 { 17,   DW_SIGNAL_COLUMN_CLICK },
 { 18,   DW_SIGNAL_HTML_RESULT },
 { 19,   DW_SIGNAL_HTML_CHANGED }
 };
-int _event_handler1(id object, NSEvent *event, int message)
+int _dw_event_handler1(id object, NSEvent *event, int message)
 {
-SignalHandler *handler = _get_handler(object, message);
+SignalHandler *handler = _dw_get_handler(object, message);
 /* NSLog(@"Event handler - type %d\n", message); */
 if(handler)
 {
 switch(message)
 }
 return -1;
 }
 /* Sub function to handle redraws */
-int _event_handler(id object, NSEvent *event, int message)
+int _dw_event_handler(id object, NSEvent *event, int message)
 {
-int ret = _event_handler1(object, event, message);
+int ret = _dw_event_handler1(object, event, message);
 if(ret != -1)
 _dw_redraw(nil, FALSE);
 return ret;
 }
 @interface DWTimerHandler : NSObject { }
 -(void)runTimer:(id)sender;
 @end
 @implementation DWTimerHandler
--(void)runTimer:(id)sender { _event_handler(sender, nil, 0); }
+-(void)runTimer:(id)sender { _dw_event_handler(sender, nil, 0); }
 @end
-NSApplication *DWApp = nil;
+static NSApplication *DWApp = nil;
-NSFontManager *DWFontManager = nil;
+static NSFontManager *DWFontManager = nil;
-NSMenu *DWMainMenu;
+static NSMenu *DWMainMenu;
-NSFont *DWDefaultFont;
+static NSFont *DWDefaultFont;
-DWTimerHandler *DWHandler;
+static DWTimerHandler *DWHandler;
-#if !defined(GARBAGE_COLLECT)
+#ifdef BUILDING_FOR_MOJAVE
-NSAutoreleasePool *pool;
+static NSMutableArray *_DWDirtyDrawables;
+#else
+static HWND _DWLastDrawable;
 #endif
-#ifdef BUILDING_FOR_MOJAVE
+static DWTID DWThread = (DWTID)-1;
-NSMutableArray *_DWDirtyDrawables;
-#else
-HWND _DWLastDrawable;
-#endif
-DWTID DWThread = (DWTID)-1;
 /* Send fake event to make sure the loop isn't stuck */
 void _dw_wakeup_app()
 {
 [DWApp postEvent:[NSEvent otherEventWithType:DWEventTypeApplicationDefined
 {
 UserData *root = userdata;
 if(box->items)
 free(box->items);
 free(box);
-_remove_userdata(&root, NULL, TRUE);
+_dw_remove_userdata(&root, NULL, TRUE);
 dw_signal_disconnect_by_window(self);
 [super dealloc];
 }
 -(Box *)box { return box; }
 -(id)contentView { return self; }
 [bgcolor set];
 NSRectFill([self bounds]);
 }
 }
 -(BOOL)isFlipped { return YES; }
--(void)mouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)1, 3); }
+-(void)mouseDown:(NSEvent *)theEvent { _dw_event_handler(self, (void *)1, 3); }
--(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)1, 4); }
+-(void)mouseUp:(NSEvent *)theEvent { _dw_event_handler(self, (void *)1, 4); }
--(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, (void *)2, 3); return nil; }
+-(NSMenu *)menuForEvent:(NSEvent *)theEvent { _dw_event_handler(self, (void *)2, 3); return nil; }
--(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)2, 4); }
+-(void)rightMouseUp:(NSEvent *)theEvent { _dw_event_handler(self, (void *)2, 4); }
--(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, (void *)3, 3); }
+-(void)otherMouseDown:(NSEvent *)theEvent { _dw_event_handler(self, (void *)3, 3); }
--(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, (void *)3, 4); }
+-(void)otherMouseUp:(NSEvent *)theEvent { _dw_event_handler(self, (void *)3, 4); }
--(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); }
+-(void)keyDown:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 2); }
 -(void)setColor:(unsigned long)input
 {
 id orig = bgcolor;
-if(input == _colors[DW_CLR_DEFAULT])
+if(input == _dw_colors[DW_CLR_DEFAULT])
 {
 bgcolor = nil;
 }
 else
 {
 -(void)sendEvent:(NSEvent *)theEvent
 {
 int rcode = -1;
 if([theEvent type] == DWEventTypeKeyDown)
 {
-rcode = _event_handler(self, theEvent, 2);
+rcode = _dw_event_handler(self, theEvent, 2);
 }
 if ( rcode != TRUE )
 [super sendEvent:theEvent];
 }
 -(void)keyDown:(NSEvent *)theEvent { }
--(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
+-(void)mouseDragged:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 5); }
 -(int)redraw { return redraw; }
 -(void)setRedraw:(int)val { redraw = val; }
 -(int)shown { return shown; }
 -(void)setShown:(int)val { shown = val; }
 -(void)dealloc { dw_signal_disconnect_by_window(self); [super dealloc]; }
 }
 #endif
 -(void)mouseDown:(NSEvent *)theEvent
 {
 if(![theEvent isMemberOfClass:[NSEvent class]] || !([theEvent modifierFlags] & DWEventModifierFlagControl))
-_event_handler(self, theEvent, 3);
+_dw_event_handler(self, theEvent, 3);
 }
--(void)mouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)mouseUp:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 4); }
--(NSMenu *)menuForEvent:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); return nil; }
+-(NSMenu *)menuForEvent:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 3); return nil; }
--(void)rightMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)rightMouseUp:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 4); }
--(void)otherMouseDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 3); }
+-(void)otherMouseDown:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 3); }
--(void)otherMouseUp:(NSEvent *)theEvent { _event_handler(self, theEvent, 4); }
+-(void)otherMouseUp:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 4); }
--(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
+-(void)mouseDragged:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 5); }
 -(void)delayedNeedsDisplay { [self setNeedsDisplay:YES]; }
 -(void)drawRect:(NSRect)rect {
-_event_handler(self, nil, 7);
+_dw_event_handler(self, nil, 7);
 #ifdef BUILDING_FOR_MOJAVE
 if (cachedDrawingRep)
 {
 [cachedDrawingRep drawInRect:self.bounds];
 [_DWDirtyDrawables removeObject:self];
 else
 [self performSelector:@selector(delayedNeedsDisplay) withObject:nil afterDelay:0];
 }
 #endif
 }
--(void)keyDown:(NSEvent *)theEvent { _event_handler(self, theEvent, 2); }
+-(void)keyDown:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 2); }
 -(BOOL)isFlipped { return YES; }
 -(void)dealloc {
 UserData *root = userdata;
-_remove_userdata(&root, NULL, TRUE);
+_dw_remove_userdata(&root, NULL, TRUE);
 [font release];
 dw_signal_disconnect_by_window(self);
 #ifdef BUILDING_FOR_MOJAVE
 [cachedDrawingRep release];
 [_DWDirtyDrawables removeObject:self];
 if([item state] == DWControlStateValueOn)
 [item setState:DWControlStateValueOff];
 else
 [item setState:DWControlStateValueOn];
 }
-_event_handler(param, nil, 8);
+_dw_event_handler(param, nil, 8);
 }
 #ifdef BUILDING_FOR_MOJAVE
 -(void)callBack:(NSPointerArray *)params
 {
 void (*mycallback)(NSPointerArray *) = [params pointerAtIndex:0];
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)webView:(WKWebView *)webView didCommitNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [[self URL] absoluteString] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
 -(void)webView:(WKWebView *)webView didFinishNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [[self URL] absoluteString] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
 -(void)webView:(WKWebView *)webView didStartProvisionalNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [[self URL] absoluteString] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
 -(void)webView:(WKWebView *)webView didReceiveServerRedirectForProvisionalNavigation:(WKNavigation *)navigation
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_REDIRECT), [[self URL] absoluteString] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 #else
 @interface DWWebView : WebView
 {
 void *userdata;
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_COMPLETE), [self mainFrameURL] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
 -(void)webView:(WebView *)sender didCommitLoadForFrame:(WebFrame *)frame
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_STARTED), [self mainFrameURL] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
 -(void)webView:(WebView *)sender didStartProvisionalLoadForFrame:(WebFrame *)frame
 {
 void *params[2] = { DW_INT_TO_POINTER(DW_HTML_CHANGE_LOADING), [self mainFrameURL] };
-_event_handler(self, (NSEvent *)params, 19);
+_dw_event_handler(self, (NSEvent *)params, 19);
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 #endif
 @implementation DWAppDel
 -(NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-if(_event_handler(sender, nil, 6) > 0)
+if(_dw_event_handler(sender, nil, 6) > 0)
 return NSTerminateCancel;
 return NSTerminateNow;
 }
 #if defined(BUILDING_FOR_MOUNTAIN_LION) && !defined(BUILDING_FOR_BIG_SUR)
 -(void)applicationDidFinishLaunching:(NSNotification *)aNotification
 notification = DW_UINT_TO_POINTER(handle);
 switch(usernotification.activationType)
 {
 case NSUserNotificationActivationTypeContentsClicked:
-_event_handler(notification, nil, 8);
+_dw_event_handler(notification, nil, 8);
 break;
 default:
 break;
 }
 dw_signal_disconnect_by_window(notification);
 @end
 @implementation DWView
 -(BOOL)windowShouldClose:(id)sender
 {
-if(_event_handler(sender, nil, 6) > 0)
+if(_dw_event_handler(sender, nil, 6) > 0)
 return NO;
 return YES;
 }
 -(void)viewDidMoveToWindow
 {
 {
 NSSize size = [self frame].size;
 if(oldsize.width != size.width || oldsize.height != size.height)
 {
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_event_handler([self window], nil, 1);
+_dw_event_handler([self window], nil, 1);
 oldsize.width = size.width;
 oldsize.height = size.height;
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 -(void)showWindow
 {
 NSSize size = [self frame].size;
 if(oldsize.width == size.width && oldsize.height == size.height)
 {
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 -(void)windowDidBecomeMain:(id)sender
 {
 }
 else
 {
 [DWApp setMainMenu:DWMainMenu];
 }
-_event_handler([self window], nil, 13);
+_dw_event_handler([self window], nil, 13);
 }
 -(void)setMenu:(NSMenu *)input { windowmenu = input; [windowmenu retain]; }
 -(void)menuHandler:(id)sender
 {
 id menu = [sender menu];
 [DWObj performSelector:@selector(menuHandler:) withObject:sender afterDelay:0];
 else
 [DWObj menuHandler:sender];
 _dw_wakeup_app();
 }
--(void)mouseDragged:(NSEvent *)theEvent { _event_handler(self, theEvent, 5); }
+-(void)mouseDragged:(NSEvent *)theEvent { _dw_event_handler(self, theEvent, 5); }
 -(void)mouseMoved:(NSEvent *)theEvent
 {
 id hit = [self hitTest:[theEvent locationInWindow]];
 if([hit isMemberOfClass:[DWRender class]])
 {
-_event_handler(hit, theEvent, 5);
+_dw_event_handler(hit, theEvent, 5);
 }
 }
 @end
 /* Subclass for a button type */
 @implementation DWButton
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)buttonClicked:(id)sender
 {
-_event_handler(self, nil, 8);
+_dw_event_handler(self, nil, 8);
 if([self buttonType] == DWButtonTypeRadio)
 {
 DWBox *viewbox = [self parent];
 Box *thisbox = [viewbox box];
 int z;
 [super keyDown:theEvent];
 }
 }
 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a progress type */
 @interface DWPercent : NSProgressIndicator
 {
 @end
 @implementation DWPercent
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a menu item type */
 @implementation DWMenuItem
 -(void)setCheck:(int)input { check = input; }
 @implementation DWScrollBox
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(void)setBox:(void *)input { box = input; }
 -(id)box { return box; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a textfield that supports vertical centering */
 @interface DWTextFieldCell : NSTextFieldCell
 {
 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"a"])
 return [NSApp sendAction:@selector(selectAll:) to:[[self window] firstResponder] from:self];
 }
 return [super performKeyEquivalent:theEvent];
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a text and status text type */
 @interface DWText : NSTextField
 {
 @end
 @implementation DWText
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); [super dealloc]; }
 @end
 /* Subclass for a entryfield password type */
 @interface DWEntryFieldPassword : NSSecureTextField
 else if ([[theEvent charactersIgnoringModifiers] isEqualToString:@"a"])
 return [NSApp sendAction:@selector(selectAll:) to:[[self window] firstResponder] from:self];
 }
 return [super performKeyEquivalent:theEvent];
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a Notebook control type */
 @interface DWNotebook : NSTabView
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 if([object isMemberOfClass:[DWBox class]])
 {
 DWBox *view = object;
 Box *box = [view box];
 NSSize size = [view frame].size;
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
-_event_handler(self, DW_INT_TO_POINTER([page pageid]), 15);
+_dw_event_handler(self, DW_INT_TO_POINTER([page pageid]), 15);
 }
 -(void)keyDown:(NSEvent *)theEvent
 {
 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
 }
 [super keyDown:theEvent];
 }
 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 @implementation DWNotebookPage
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(int)pageid { return pageid; }
 -(void)setPageid:(int)input { pageid = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a color chooser type */
 @interface DWColorChoose : NSColorPanel
 {
 if([object isMemberOfClass:[DWBox class]])
 {
 DWBox *view = object;
 Box *box = [view box];
 NSSize size = [view frame].size;
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 }
 -(void)setTag:(NSInteger)tag { Tag = tag; }
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(float)percent { return percent; }
 -(void)setPercent:(float)input { percent = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a slider type */
 @interface DWSlider : NSSlider
 {
 @end
 @implementation DWSlider
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)sliderChanged:(id)sender { _event_handler(self, (void *)[self integerValue], 14); }
+-(void)sliderChanged:(id)sender { _dw_event_handler(self, (void *)[self integerValue], 14); }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a slider type */
 @interface DWScrollbar : NSScroller
 {
 newpos = (newpos - (double)newposi) > 0.5 ? (double)(newposi + 1) : (double)newposi;
 if(newpos != result)
 {
 [self setDoubleValue:(newpos/max)];
 }
-_event_handler(self, DW_INT_TO_POINTER((int)newpos), 14);
+_dw_event_handler(self, DW_INT_TO_POINTER((int)newpos), 14);
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a MLE type */
 @interface DWMLE : NSTextView
 {
 @implementation DWMLE
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
 -(id)scrollview { return scrollview; }
 -(void)setScrollview:(id)input { scrollview = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 #ifndef DW_USE_NSVIEW
 /* Subclass NSTextFieldCell for displaying image and text */
 @interface DWImageAndTextCell : NSTextFieldCell
 -(void)refreshColors
 {
 NSColor *oldodd = oddcolor;
 NSColor *oldeven = evencolor;
 unsigned long thisodd = dw_oddcolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_ODD : dw_oddcolor;
-unsigned long _odd = _get_color(thisodd);
+unsigned long _odd = _dw_get_color(thisodd);
 unsigned long thiseven = dw_evencolor == DW_CLR_DEFAULT ? _DW_COLOR_ROW_EVEN : dw_evencolor;
-unsigned long _even = _get_color(thiseven);
+unsigned long _even = _dw_get_color(thiseven);
 /* Get the NSColor for non-default colors */
 if(thisodd != DW_RGB_TRANSPARENT)
 oddcolor = [[NSColor colorWithDeviceRed: DW_RED_VALUE(_odd)/255.0 green: DW_GREEN_VALUE(_odd)/255.0 blue: DW_BLUE_VALUE(_odd)/255.0 alpha: 1] retain];
 else
 }
 -(void)checkDark
 {
 /* Update any system colors based on the Dark Mode */
 _DW_COLOR_ROW_EVEN = DW_RGB_TRANSPARENT;
-if(_is_dark(self))
+if(_dw_is_dark(self))
 _DW_COLOR_ROW_ODD = DW_RGB(100, 100, 100);
 else
 _DW_COLOR_ROW_ODD = DW_RGB(230, 230, 230);
 /* Only refresh if we've been setup already */
 if(titles)
 params[0] = (void *)[self getRowTitle:(int)[self selectedRow]];
 params[1] = (void *)[self getRowData:(int)[self selectedRow]];
 /* Handler for container class */
-_event_handler(self, (NSEvent *)params, 9);
+_dw_event_handler(self, (NSEvent *)params, 9);
 }
 -(void)keyUp:(NSEvent *)theEvent
 {
 if([[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
 {
 void *params[2];
 params[0] = (void *)[self getRowTitle:(int)[self selectedRow]];
 params[1] = (void *)[self getRowData:(int)[self selectedRow]];
-_event_handler(self, (NSEvent *)params, 9);
+_dw_event_handler(self, (NSEvent *)params, 9);
 }
 [super keyUp:theEvent];
 }
 -(void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *)tableColumn
 {
 NSUInteger index = [tvcols indexOfObject:tableColumn];
 /* Handler for column click class */
-_event_handler(self, (NSEvent *)index, 17);
+_dw_event_handler(self, (NSEvent *)index, 17);
 }
 -(void)selectionChanged:(id)sender
 {
 void *params[2];
 params[0] = (void *)[self getRowTitle:(int)[self selectedRow]];
 params[1] = (void *)[self getRowData:(int)[self selectedRow]];
 /* Handler for container class */
-_event_handler(self, (NSEvent *)params, 12);
+_dw_event_handler(self, (NSEvent *)params, 12);
 /* Handler for listbox class */
-_event_handler(self, DW_INT_TO_POINTER((int)[self selectedRow]), 11);
+_dw_event_handler(self, DW_INT_TO_POINTER((int)[self selectedRow]), 11);
 }
 -(NSMenu *)menuForEvent:(NSEvent *)event
 {
 int row;
 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
 row = (int)[self rowAtPoint:where];
-_event_handler(self, (NSEvent *)[self getRowTitle:row], 10);
+_dw_event_handler(self, (NSEvent *)[self getRowTitle:row], 10);
 return nil;
 }
 -(void)keyDown:(NSEvent *)theEvent
 {
 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
 [self interpretKeyEvents:[NSArray arrayWithObject:theEvent]];
 [super keyDown:theEvent];
 }
 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Dive into the tree freeing all desired child nodes */
-void _free_tree_recurse(NSMutableArray *node, NSMutableArray *item)
+void _dw_free_tree_recurse(NSMutableArray *node, NSMutableArray *item)
 {
 if(node && ([node isKindOfClass:[NSArray class]]))
 {
 int count = (int)[node count];
 NSInteger index = -1;
 children = (NSMutableArray *)[pnt objectAtIndex:3];
 }
 if(z == index)
 {
-_free_tree_recurse(children, NULL);
+_dw_free_tree_recurse(children, NULL);
 [node removeObjectAtIndex:z];
 count = (int)[node count];
 index = -1;
 z--;
 }
 else if(item == NULL)
 {
 NSString *oldstr = [pnt objectAtIndex:1];
 [oldstr release];
-_free_tree_recurse(children, item);
+_dw_free_tree_recurse(children, item);
 }
 else
-_free_tree_recurse(children, item);
+_dw_free_tree_recurse(children, item);
 }
 }
 if(!item)
 {
 [node release];
 /* Handler for tree class */
 id item = [self itemAtRow:[self selectedRow]];
 if(item)
 {
-_event_handler(self, (void *)item, 12);
+_dw_event_handler(self, (void *)item, 12);
 }
 }
 -(void)treeItemExpanded:(NSNotification *)notification
 {
 id item = [[notification userInfo ] objectForKey: @"NSObject"];
 if(item)
 {
-_event_handler(self, (void *)item, 16);
+_dw_event_handler(self, (void *)item, 16);
 }
 }
 -(NSMenu *)menuForEvent:(NSEvent *)event
 {
 int row;
 NSPoint where = [self convertPoint:[event locationInWindow] fromView:nil];
 row = (int)[self rowAtPoint:where];
 id item = [self itemAtRow:row];
-_event_handler(self, (NSEvent *)item, 10);
+_dw_event_handler(self, (NSEvent *)item, 10);
 return nil;
 }
 -(NSScrollView *)scrollview { return scrollview; }
 -(void)setScrollview:(NSScrollView *)input { scrollview = input; }
--(void)deleteNode:(NSMutableArray *)item { _free_tree_recurse(data, item); }
+-(void)deleteNode:(NSMutableArray *)item { _dw_free_tree_recurse(data, item); }
 -(void)setForegroundColor:(NSColor *)input
 {
 NSTextFieldCell *cell = [treecol dataCell];
 fgcolor = input;
 [fgcolor retain];
 [cell setTextColor:fgcolor];
 }
--(void)clear { NSMutableArray *toclear = data; data = nil; _free_tree_recurse(toclear, NULL); [self reloadData]; }
+-(void)clear { NSMutableArray *toclear = data; data = nil; _dw_free_tree_recurse(toclear, NULL); [self reloadData]; }
 -(void)keyDown:(NSEvent *)theEvent
 {
 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
 if(vk == NSTabCharacter || vk == NSBackTabCharacter)
 -(void)insertTab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectNextKeyView:self]; }
 -(void)insertBacktab:(id)sender { if([[self window] firstResponder] == self) [[self window] selectPreviousKeyView:self]; }
 -(void)dealloc
 {
 UserData *root = userdata;
-_remove_userdata(&root, NULL, TRUE);
+_dw_remove_userdata(&root, NULL, TRUE);
-_free_tree_recurse(data, NULL);
+_dw_free_tree_recurse(data, NULL);
 [treecol release];
 dw_signal_disconnect_by_window(self);
 [super dealloc];
 }
 @end
 @end
 @implementation DWCalendar
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a Combobox type */
 @interface DWComboBox : NSComboBox
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 @end
 @implementation DWComboBox
 -(void *)userdata { return userdata; }
 -(void)setUserdata:(void *)input { userdata = input; }
--(void)comboBoxSelectionDidChange:(NSNotification *)not { _event_handler(self, (void *)[self indexOfSelectedItem], 11); }
+-(void)comboBoxSelectionDidChange:(NSNotification *)not { _dw_event_handler(self, (void *)[self indexOfSelectedItem], 11); }
 -(void)setClickDefault:(id)input { clickDefault = input; }
 -(void)keyUp:(NSEvent *)theEvent
 {
 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
 {
 } else
 {
 [super keyUp:theEvent];
 }
 }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 /* Subclass for a stepper component of the spinbutton type */
 /* This is a bad way of doing this... but I can't get the other methods to work */
 @interface DWStepper : NSStepper
 [self mouseUp:event];
 }
 -(void)mouseUp:(NSEvent *)event
 {
 [textfield takeIntValueFrom:self];
-_event_handler(parent, (void *)[self integerValue], 14);
+_dw_event_handler(parent, (void *)[self integerValue], 14);
 }
 -(void)keyDown:(NSEvent *)theEvent
 {
 unichar vk = [[theEvent charactersIgnoringModifiers] characterAtIndex:0];
 if(vk == VK_UP || vk == VK_DOWN)
 -(NSStepper *)stepper { return stepper; }
 -(void)controlTextDidChange:(NSNotification *)aNotification
 {
 [stepper takeIntValueFrom:textfield];
 [textfield takeIntValueFrom:stepper];
-_event_handler(self, (void *)[stepper integerValue], 14);
+_dw_event_handler(self, (void *)[stepper integerValue], 14);
 }
 -(void)setClickDefault:(id)input { clickDefault = input; }
 -(void)keyUp:(NSEvent *)theEvent
 {
 if(clickDefault && [[theEvent charactersIgnoringModifiers] characterAtIndex:0] == VK_RETURN)
 {
 [super keyUp:theEvent];
 }
 }
 -(void)performClick:(id)sender { [textfield performClick:sender]; }
--(void)dealloc { UserData *root = userdata; _remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
+-(void)dealloc { UserData *root = userdata; _dw_remove_userdata(&root, NULL, TRUE); dw_signal_disconnect_by_window(self); [super dealloc]; }
 @end
 #ifdef BUILDING_FOR_MOJAVE
 API_AVAILABLE(macos(10.14))
 @interface DWUserNotificationCenterDelegate : NSObject <UNUserNotificationCenterDelegate>
 dw_signal_disconnect_by_window(notification);
 }
 else if ([response.actionIdentifier isEqualToString:UNNotificationDefaultActionIdentifier])
 {
 /* The user launched the app. */
-_event_handler(notification, nil, 8);
+_dw_event_handler(notification, nil, 8);
 dw_signal_disconnect_by_window(notification);
 }
 completionHandler();
 }
 @end
 @implementation DWMDI
 @end
 /* This function adds a signal handler callback into the linked list.
 */
-void _new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data)
+void _dw_new_signal(ULONG message, HWND window, int msgid, void *signalfunction, void *discfunc, void *data)
 {
 SignalHandler *new = malloc(sizeof(SignalHandler));
 new->message = message;
 new->window = window;
 new->signalfunction = signalfunction;
 new->discfunction = discfunc;
 new->data = data;
 new->next = NULL;
-if (!Root)
+if (!DWRoot)
-Root = new;
+DWRoot = new;
 else
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 while(tmp)
 {
 if(tmp->message == message &&
 tmp->window == window &&
 tmp->id == msgid &&
 tmp = tmp->next;
 }
 if(prev)
 prev->next = new;
 else
-Root = new;
+DWRoot = new;
 }
 }
 /* Finds the message number for a given signal name */
-ULONG _findsigmessage(const char *signame)
+ULONG _dw_findsigmessage(const char *signame)
 {
 int z;
 for(z=0;z<SIGNALMAX;z++)
 {
-if(strcasecmp(signame, SignalTranslate[z].name) == 0)
+if(strcasecmp(signame, DWSignalTranslate[z].name) == 0)
-return SignalTranslate[z].message;
+return DWSignalTranslate[z].message;
 }
 return 0L;
 }
-unsigned long _foreground = 0xAAAAAA, _background = 0;
+unsigned long _dw_foreground = 0xAAAAAA, _dw_background = 0;
-void _handle_resize_events(Box *thisbox)
+void _dw_handle_resize_events(Box *thisbox)
 {
 int z;
 for(z=0;z<thisbox->count;z++)
 {
 {
 Box *tmp = (Box *)[handle box];
 if(tmp)
 {
-_handle_resize_events(tmp);
+_dw_handle_resize_events(tmp);
 }
 }
 else
 {
 if([handle isMemberOfClass:[DWRender class]])
 if(oldsize.width != newsize.width || oldsize.height != newsize.height)
 {
 if(newsize.width > 0 && newsize.height > 0)
 {
 [render setSize:newsize];
-_event_handler(handle, nil, 1);
+_dw_event_handler(handle, nil, 1);
 }
 }
 }
 /* Special handling for notebook controls */
 else if([handle isMemberOfClass:[DWNotebook class]])
 id view = [notepage view];
 if([view isMemberOfClass:[DWBox class]])
 {
 Box *box = (Box *)[view box];
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 */
 DWScrollBox *scrollbox = (DWScrollBox *)handle;
 DWBox *contentbox = [scrollbox documentView];
 Box *thisbox = [contentbox box];
 /* Get the required space for the box */
-_handle_resize_events(thisbox);
+_dw_handle_resize_events(thisbox);
 }
 }
 }
 }
 /* This function calculates how much space the widgets and boxes require
 * and does expansion as necessary.
 */
-static void _resize_box(Box *thisbox, int *depth, int x, int y, int pass)
+static void _dw_resize_box(Box *thisbox, int *depth, int x, int y, int pass)
 {
 /* Current item position */
 int z, currentx = thisbox->pad, currenty = thisbox->pad;
 /* Used x, y and padding maximum values...
 * These will be used to find the widest or
 if(pass == 1)
 {
 (*depth)++;
 /* Save the newly calculated values on the box */
-_resize_box(tmp, depth, x, y, pass);
+_dw_resize_box(tmp, depth, x, y, pass);
 /* Duplicate the values in the item list for use below */
 thisbox->items[z].width = tmp->minwidth;
 thisbox->items[z].height = tmp->minheight;
 Box *tmp = (Box *)[box box];
 if(tmp)
 {
 (*depth)++;
-_resize_box(tmp, depth, width, height, pass);
+_dw_resize_box(tmp, depth, width, height, pass);
 (*depth)--;
 }
 }
 /* Special handling for notebook controls */
 if([view isMemberOfClass:[DWBox class]])
 {
 Box *box = (Box *)[view box];
 NSSize size = [view frame].size;
-_do_resize(box, size.width, size.height);
+_dw_do_resize(box, size.width, size.height);
-_handle_resize_events(box);
+_dw_handle_resize_events(box);
 }
 }
 /* Handle laying out scrollviews... if required space is less
 * than available space, then expand.  Otherwise use required space.
 */
 DWBox *contentbox = [scrollbox documentView];
 Box *thisbox = [contentbox box];
 NSSize contentsize = [scrollbox contentSize];
 /* Get the required space for the box */
-_resize_box(thisbox, &depth, x, y, 1);
+_dw_resize_box(thisbox, &depth, x, y, 1);
 if(contentsize.width < thisbox->minwidth)
 {
 contentsize.width = thisbox->minwidth;
 }
 contentsize.height = thisbox->minheight;
 }
 [contentbox setFrameSize:contentsize];
 /* Layout the content of the scrollbox */
-_do_resize(thisbox, contentsize.width, contentsize.height);
+_dw_do_resize(thisbox, contentsize.width, contentsize.height);
-_handle_resize_events(thisbox);
+_dw_handle_resize_events(thisbox);
 }
 /* Special handling for spinbutton controls */
 else if([handle isMemberOfClass:[DWSpinButton class]])
 {
 DWSpinButton *spinbutton = (DWSpinButton *)handle;
 }
 }
 }
 }
-static void _do_resize(Box *thisbox, int x, int y)
+static void _dw_do_resize(Box *thisbox, int x, int y)
 {
 if(x > 0 && y > 0)
 {
 if(thisbox)
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, x, y, 1);
+_dw_resize_box(thisbox, &depth, x, y, 1);
 /* Finally place all the boxes and controls */
-_resize_box(thisbox, &depth, x, y, 2);
+_dw_resize_box(thisbox, &depth, x, y, 2);
 }
 }
 }
-NSMenu *_generate_main_menu()
+NSMenu *_dw_generate_main_menu()
 {
 NSString *applicationName = nil;
 /* This only works on 10.6 so we have a backup method */
 #ifdef BUILDING_FOR_SNOW_LEOPARD
 * Cleanly terminates a DW session, should be signal handler safe.
 */
 void API dw_shutdown(void)
 {
 #if !defined(GARBAGE_COLLECT)
-pool = pthread_getspecific(_dw_pool_key);
+NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
 [pool drain];
 #endif
 }
 /*
 }
 return range;
 }
 /* Return the handle to the text object */
-id _text_handle(id object)
+id _dw_text_handle(id object)
 {
 if([object isMemberOfClass:[ DWSpinButton class]])
 {
 DWSpinButton *spinbutton = object;
 object = [spinbutton textfield];
 */
 void _dw_control_size(id handle, int *width, int *height)
 {
 int thiswidth = 1, thisheight = 1, extrawidth = 0, extraheight = 0;
 NSString *nsstr = nil;
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 /* Handle all the different button types */
 if([ object isKindOfClass:[ NSButton class ] ])
 {
 switch([object buttonType])
 {
 NSColor *oldcolor = pthread_getspecific(_dw_fg_color_key);
 NSColor *newcolor;
 DW_LOCAL_POOL_IN;
-_foreground = _get_color(value);
+_dw_foreground = _dw_get_color(value);
-newcolor = [[NSColor colorWithDeviceRed:    DW_RED_VALUE(_foreground)/255.0 green:
+newcolor = [[NSColor colorWithDeviceRed:    DW_RED_VALUE(_dw_foreground)/255.0 green:
-DW_GREEN_VALUE(_foreground)/255.0 blue:
+DW_GREEN_VALUE(_dw_foreground)/255.0 blue:
-DW_BLUE_VALUE(_foreground)/255.0 alpha: 1] retain];
+DW_BLUE_VALUE(_dw_foreground)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_fg_color_key, newcolor);
 [oldcolor release];
 DW_LOCAL_POOL_OUT;
 }
 {
 pthread_setspecific(_dw_bg_color_key, NULL);
 }
 else
 {
-_background = _get_color(value);
+_dw_background = _dw_get_color(value);
-newcolor = [[NSColor colorWithDeviceRed:    DW_RED_VALUE(_background)/255.0 green:
+newcolor = [[NSColor colorWithDeviceRed:    DW_RED_VALUE(_dw_background)/255.0 green:
-DW_GREEN_VALUE(_background)/255.0 blue:
+DW_GREEN_VALUE(_dw_background)/255.0 blue:
-DW_BLUE_VALUE(_background)/255.0 alpha: 1] retain];
+DW_BLUE_VALUE(_dw_background)/255.0 alpha: 1] retain];
 pthread_setspecific(_dw_bg_color_key, newcolor);
 }
 [oldcolor release];
 DW_LOCAL_POOL_OUT;
 }
 {
 DW_LOCAL_POOL_OUT;
 return value;
 }
-unsigned long tempcol = _get_color(value);
+unsigned long tempcol = _dw_get_color(value);
 NSColor *color = [[NSColor colorWithDeviceRed: DW_RED_VALUE(tempcol)/255.0 green: DW_GREEN_VALUE(tempcol)/255.0 blue: DW_BLUE_VALUE(tempcol)/255.0 alpha: 1] retain];
 [colorDlg setColor:color];
 dialog = dw_dialog_new(colorDlg);
 [colorDlg setDialog:dialog];
 }
 /* Internal function to create an image graphics context...
 * with or without antialiasing enabled.
 */
-id _create_gc(id image, bool antialiased)
+id _dw_create_gc(id image, bool antialiased)
 {
 #ifdef BUILDING_FOR_YOSEMITE
 CGContextRef  context = (CGContextRef)[[NSGraphicsContext graphicsContextWithBitmapImageRep:image] CGContext];
 NSGraphicsContext *gc = [NSGraphicsContext graphicsContextWithCGContext:context flipped:YES];
 #else
 }
 #endif
 }
 if(bi)
 {
-id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
+id gc = _dw_create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw == YES)
 }
 #endif
 }
 if(bi)
 {
-id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
+id gc = _dw_create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw == YES)
 }
 #endif
 }
 if(bi)
 {
-id gc = _create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
+id gc = _dw_create_gc(bi, flags & DW_DRAW_NOAA ? NO : YES);
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:gc];
 }
 if(bCanDraw)
 bitsPerPixel:0];
 return pixmap;
 }
 /* Function takes an NSImage and copies it into a flipped NSBitmapImageRep */
-void _flip_image(NSImage *tmpimage, NSBitmapImageRep *image, NSSize size)
+void _dw_flip_image(NSImage *tmpimage, NSBitmapImageRep *image, NSSize size)
 {
 NSCompositingOperation op = DWCompositingOperationSourceOver;
 [NSGraphicsContext saveGraphicsState];
 [NSGraphicsContext setCurrentContext:_dw_draw_context(image)];
 [[[NSDictionary alloc] initWithObjectsAndKeys:image, NSGraphicsContextDestinationAttributeName, nil] autorelease];
 hasAlpha:YES
 isPlanar:NO
 colorSpaceName:NSDeviceRGBColorSpace
 bytesPerRow:0
 bitsPerPixel:0];
-_flip_image(tmpimage, image, size);
+_dw_flip_image(tmpimage, image, size);
 pixmap->width = size.width;
 pixmap->height = size.height;
 pixmap->image = image;
 pixmap->handle = handle;
 DW_LOCAL_POOL_OUT;
 hasAlpha:YES
 isPlanar:NO
 colorSpaceName:NSDeviceRGBColorSpace
 bytesPerRow:0
 bitsPerPixel:0];
-_flip_image(tmpimage, image, size);
+_dw_flip_image(tmpimage, image, size);
 pixmap->width = size.width;
 pixmap->height = size.height;
 pixmap->image = image;
 pixmap->handle = handle;
 DW_LOCAL_POOL_OUT;
 hasAlpha:YES
 isPlanar:NO
 colorSpaceName:NSDeviceRGBColorSpace
 bytesPerRow:0
 bitsPerPixel:0];
-_flip_image(temp, image, size);
+_dw_flip_image(temp, image, size);
 pixmap->width = size.width;
 pixmap->height = size.height;
 pixmap->image = image;
 pixmap->handle = handle;
 [temp release];
 #if WK_API_ENABLED
 [html evaluateJavaScript:[NSString stringWithUTF8String:script] completionHandler:^(NSString *result, NSError *error)
 {
 void *params[2] = { result, scriptdata };
-_event_handler(html, (NSEvent *)params, 18);
+_dw_event_handler(html, (NSEvent *)params, 18);
 }];
 #else
 NSString *result = [html stringByEvaluatingJavaScriptFromString:[NSString stringWithUTF8String:script]];
 void *params[2] = { result, scriptdata };
-_event_handler(html, (NSEvent *)params, 18);
+_dw_event_handler(html, (NSEvent *)params, 18);
 #endif
 DW_LOCAL_POOL_OUT;
 return DW_ERROR_NONE;
 }
 *       location: Handle of a window frame to be attached to.
 */
 HMENUI API dw_menubar_new(HWND location)
 {
 NSWindow *window = location;
-NSMenu *windowmenu = _generate_main_menu();
+NSMenu *windowmenu = _dw_generate_main_menu();
 [[window contentView] setMenu:windowmenu];
 return (HMENUI)windowmenu;
 }
 /*
 }
 /* Handle deprecation of convertScreenToBase in 10.10 yet still supporting
 * 10.6 and earlier since convertRectFromScreen was introduced in 10.7.
 */
-NSPoint _windowPointFromScreen(id window, NSPoint p)
+NSPoint _dw_windowPointFromScreen(id window, NSPoint p)
 {
 SEL crfs = NSSelectorFromString(@"convertRectFromScreen:");
 if([window respondsToSelector:crfs])
 {
 if(!window)
 window = [event window];
 [thismenu autorelease];
 NSPoint p = NSMakePoint(x, [[NSScreen mainScreen] frame].size.height - y);
 NSEvent* fake = [NSEvent mouseEventWithType:DWEventTypeRightMouseDown
-location:_windowPointFromScreen(window, p)
+location:_dw_windowPointFromScreen(window, p)
 modifierFlags:0
 timestamp:[event timestamp]
 windowNumber:[window windowNumber]
 context:[NSGraphicsContext currentContext]
 eventNumber:1
 clickCount:1
 pressure:0.0];
 [NSMenu popUpContextMenu:thismenu withEvent:fake forView:view];
 }
-char _removetilde(char *dest, const char *src)
+char _dw_removetilde(char *dest, const char *src)
 {
 int z, cur=0;
 char accel = '\0';
 for(z=0;z<strlen(src);z++)
 {
 char accel[2];
 char *newtitle = malloc(strlen(title)+1);
 NSString *nstr;
-accel[0] = _removetilde(newtitle, title);
+accel[0] = _dw_removetilde(newtitle, title);
 accel[1] = 0;
 nstr = [ NSString stringWithUTF8String:newtitle ];
 free(newtitle);
 }
 }
 }
 /* Gets the notebook page from associated ID */
-DWNotebookPage *_notepage_from_id(DWNotebook *notebook, unsigned long pageid)
+DWNotebookPage *_dw_notepage_from_id(DWNotebook *notebook, unsigned long pageid)
 {
 NSArray *pages = [notebook tabViewItems];
 for(DWNotebookPage *notepage in pages)
 {
 if([notepage pageid] == pageid)
 *          pageid: ID of the page to be destroyed.
 */
 void API dw_notebook_page_destroy(HWND handle, unsigned int pageid)
 {
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 DW_LOCAL_POOL_IN;
 if(notepage != nil)
 {
 [notebook removeTabViewItem:notepage];
 *          pageid: ID of the page to be made visible.
 */
 void API dw_notebook_page_set(HWND handle, unsigned int pageid)
 {
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 if(notepage != nil)
 {
 [notebook selectTabViewItem:notepage];
 }
 *          text: Pointer to the text to set.
 */
 void API dw_notebook_page_set_text(HWND handle, ULONG pageid, const char *text)
 {
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 if(notepage != nil)
 {
 [notepage setLabel:[ NSString stringWithUTF8String:text ]];
 }
 *          page: Box handle to be packed.
 */
 void API dw_notebook_pack(HWND handle, ULONG pageid, HWND page)
 {
 DWNotebook *notebook = handle;
-DWNotebookPage *notepage = _notepage_from_id(notebook, pageid);
+DWNotebookPage *notepage = _dw_notepage_from_id(notebook, pageid);
 if(notepage != nil)
 {
 HWND tmpbox = dw_box_new(DW_VERT, 0);
 DWBox *box = tmpbox;
 *          back: Background color in DW_RGB format or a default color index.
 */
 int API dw_window_set_color(HWND handle, ULONG fore, ULONG back)
 {
 id object = handle;
-unsigned long _fore = _get_color(fore);
+unsigned long _fore = _dw_get_color(fore);
-unsigned long _back = _get_color(back);
+unsigned long _back = _dw_get_color(back);
 NSColor *fg = NULL;
 NSColor *bg = NULL;
 /* Get the NSColor for non-default colors */
 if(fore != DW_CLR_DEFAULT)
 *          width: New width in pixels.
 *          height: New height in pixels.
 */
 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
 {
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 if([object isMemberOfClass:[DWWindow class]])
 {
 DWWindow *window = object;
 SEL sssm = NSSelectorFromString(@"setStyleMask");
 }
 /* Internal function to return a pointer to an item struct
 * with information about the packing information regarding object.
 */
-Item *_box_item(id object)
+Item *_dw_box_item(id object)
 {
 /* Find the item within the box it is packed into */
 if([object isKindOfClass:[DWBox class]] || [object isKindOfClass:[DWGroupBox class]] || [object isKindOfClass:[NSControl class]])
 {
 DWBox *parent = (DWBox *)[object superview];
 NSFont *font = fontname ? _dw_font_by_name(fontname) :
 (DWDefaultFont ? DWDefaultFont : [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]);
 if(font)
 {
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 if([object window])
 {
 [object lockFocus];
 [font set];
 [object unlockFocus];
 [render setFont:font];
 }
 else
 return DW_ERROR_UNKNOWN;
 /* If we changed the text... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 * Parameters:
 *           handle: The window handle from which to obtain the font.
 */
 char * API dw_window_get_font(HWND handle)
 {
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 NSFont *font = nil;
 if([object isMemberOfClass:[DWGroupBox class]])
 {
 font = [object titleFont];
 DW_FUNCTION_ADD_PARAM1(handle)
 DW_FUNCTION_RETURN(dw_window_get_text, char *)
 DW_FUNCTION_RESTORE_PARAM1(handle, HWND)
 {
 DW_FUNCTION_INIT;
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 char *retval = NULL;
 if([ object isKindOfClass:[ NSWindow class ] ] || [ object isKindOfClass:[ NSButton class ] ])
 {
 id window = object;
 DW_FUNCTION_ADD_PARAM2(handle, text)
 DW_FUNCTION_NO_RETURN(dw_window_set_text)
 DW_FUNCTION_RESTORE_PARAM2(handle, HWND, text, char *)
 {
 DW_FUNCTION_INIT;
-id object = _text_handle(handle);
+id object = _dw_text_handle(handle);
 if([ object isKindOfClass:[ NSWindow class ] ] || [ object isKindOfClass:[ NSButton class ] ])
 [object setTitle:[ NSString stringWithUTF8String:text ]];
 else if([ object isKindOfClass:[ NSControl class ] ])
 {
 [groupbox setTitle:[NSString stringWithUTF8String:text]];
 }
 else
 return;
 /* If we changed the text... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 int newwidth, newheight;
 if(pixmap)
 {
 [object setImage:pixmap];
 }
 /* If we changed the bitmap... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 if(bitmap)
 {
 [object setImage:bitmap];
 /* If we changed the bitmap... */
-Item *item = _box_item(handle);
+Item *item = _dw_box_item(handle);
 /* Check to see if any of the sizes need to be recalculated */
 if(item && (item->origwidth == -1 || item->origheight == -1))
 {
 _dw_control_size(handle, item->origwidth == -1 ? &item->width : NULL, item->origheight == -1 ? &item->height : NULL);
 */
 int API dw_window_raise(HWND handle)
 {
 NSWindow *window = handle;
 [window orderFront:nil];
-return 0;
+return DW_ERROR_NONE;
 }
 /*
 * Makes the window bottommost.
 * Parameters:
 */
 int API dw_window_lower(HWND handle)
 {
 NSWindow *window = handle;
 [window orderBack:nil];
-return 0;
+return DW_ERROR_NONE;
 }
 /*
 * Sets the size of a given window (widget).
 * Parameters:
 if((width < 1 || height < 1) && (thisbox = (Box *)[[window contentView] box]))
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, (int)width, (int)height, 1);
+_dw_resize_box(thisbox, &depth, (int)width, (int)height, 1);
 /* Update components that need auto-sizing */
 if(width < 1) content.size.width = thisbox->minwidth;
 if(height < 1) content.size.height = thisbox->minheight;
 }
 {
 int depth = 0;
 NSRect frame;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, 0, 0, 1);
+_dw_resize_box(thisbox, &depth, 0, 0, 1);
 /* Figure out the border size */
 frame = [NSWindow frameRectForContentRect:NSMakeRect(0, 0, thisbox->minwidth, thisbox->minheight) styleMask:[object styleMask]];
 /* Return what was requested */
 if((thisbox = (Box *)[object box]))
 {
 int depth = 0;
 /* Calculate space requirements */
-_resize_box(thisbox, &depth, 0, 0, 1);
+_dw_resize_box(thisbox, &depth, 0, 0, 1);
 /* Return what was requested */
 if(width) *width = thisbox->minwidth;
 if(height) *height = thisbox->minheight;
 }
 /* Functions for managing the user data lists that are associated with
 * a given window handle.  Used in dw_window_set_data() and
 * dw_window_get_data().
 */
-UserData *_find_userdata(UserData **root, const char *varname)
+UserData *_dw_find_userdata(UserData **root, const char *varname)
 {
 UserData *tmp = *root;
 while(tmp)
 {
 tmp = tmp->next;
 }
 return NULL;
 }
-int _new_userdata(UserData **root, const char *varname, void *data)
+int _dw_new_userdata(UserData **root, const char *varname, void *data)
 {
-UserData *new = _find_userdata(root, varname);
+UserData *new = _dw_find_userdata(root, varname);
 if(new)
 {
 new->data = data;
 return TRUE;
 }
 }
 return FALSE;
 }
-int _remove_userdata(UserData **root, const char *varname, int all)
+int _dw_remove_userdata(UserData **root, const char *varname, int all)
 {
 UserData *prev = NULL, *tmp = *root;
 while(tmp)
 {
 blah = calloc(1, sizeof(WindowData));
 [object setUserdata:blah];
 }
 if(data)
-_new_userdata(&(blah->root), dataname, data);
+_dw_new_userdata(&(blah->root), dataname, data);
 else
 {
 if(dataname)
-_remove_userdata(&(blah->root), dataname, FALSE);
+_dw_remove_userdata(&(blah->root), dataname, FALSE);
 else
-_remove_userdata(&(blah->root), NULL, TRUE);
+_dw_remove_userdata(&(blah->root), NULL, TRUE);
 }
 }
 /*
 * Gets a named user data item to a window handle.
 }
 WindowData *blah = (WindowData *)[object userdata];
 if(blah && blah->root && dataname)
 {
-UserData *ud = _find_userdata(&(blah->root), dataname);
+UserData *ud = _dw_find_userdata(&(blah->root), dataname);
 if(ud)
 return ud->data;
 }
 return NULL;
 }
 #define DW_TIMER_MAX 64
-NSTimer *DWTimers[DW_TIMER_MAX];
+static NSTimer *DWTimers[DW_TIMER_MAX];
 /*
 * Add a callback to a timer event.
 * Parameters:
 *       interval: Milliseconds to delay between calls.
 if(sigfunc && !DWTimers[z])
 {
 NSTimeInterval seconds = (double)interval / 1000.0;
 NSTimer *thistimer = DWTimers[z] = [NSTimer scheduledTimerWithTimeInterval:seconds target:DWHandler selector:@selector(runTimer:) userInfo:nil repeats:YES];
-_new_signal(0, thistimer, z+1, sigfunc, NULL, data);
+_dw_new_signal(0, thistimer, z+1, sigfunc, NULL, data);
 return z+1;
 }
 return 0;
 }
 * 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 = DWRoot;
 NSTimer *thistimer;
 /* 0 is an invalid timer ID */
 if(timerid < 1 || !DWTimers[timerid-1])
 return;
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 window = DWApp;
 }
 if(window && signame && sigfunc)
 {
-if((message = _findsigmessage(signame)) != 0)
+if((message = _dw_findsigmessage(signame)) != 0)
 {
-_new_signal(message, window, (int)msgid, sigfunc, discfunc, data);
+_dw_new_signal(message, window, (int)msgid, sigfunc, discfunc, data);
 }
 }
 }
 /*
 * Parameters:
 *       window: Window handle of callback to be removed.
 */
 void API dw_signal_disconnect_by_name(HWND window, const char *signame)
 {
-SignalHandler *prev = NULL, *tmp = Root;
+SignalHandler *prev = NULL, *tmp = DWRoot;
 ULONG message;
-if(!window || !signame || (message = _findsigmessage(signame)) == 0)
+if(!window || !signame || (message = _dw_findsigmessage(signame)) == 0)
 return;
 while(tmp)
 {
 if(tmp->window == window && tmp->message == message)
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 * 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 = DWRoot;
 while(tmp)
 {
 if(tmp->window == window)
 {
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 *       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 = DWRoot;
 while(tmp)
 {
 if(tmp->window == window && tmp->data == data)
 {
 free(tmp);
 tmp = prev->next;
 }
 else
 {
-Root = tmp->next;
+DWRoot = tmp->next;
 free(tmp);
-tmp = Root;
+tmp = DWRoot;
 }
 }
 else
 {
 prev = tmp;
 tmp = tmp->next;
 }
 }
 }
-void _my_strlwr(char *buf)
+void _dw_my_strlwr(char *buf)
 {
 int z, len = (int)strlen(buf);
 for(z=0;z<len;z++)
 {
 if(!newname)
 return -1;
 sprintf(newname, "lib%s.dylib", name);
-_my_strlwr(newname);
+_dw_my_strlwr(newname);
 *handle = dlopen(newname, RTLD_NOW);
 if(*handle == NULL)
 {
 strncpy(errorbuf, dlerror(), 1024);
 struct _seminfo {
 int fd;
 int waiting;
 };
-static void _handle_sem(int *tmpsock)
+static void _dw_handle_sem(int *tmpsock)
 {
 fd_set rd;
 struct _seminfo *array = (struct _seminfo *)malloc(sizeof(struct _seminfo));
 int listenfd = tmpsock[0];
 int bytesread, connectcount = 1, maxfd, z, posted = 0;
 free(eve);
 return NULL;
 }
 /* Create a thread to handle this event semaphore */
-pthread_create(&dwthread, NULL, (void *)_handle_sem, (void *)tmpsock);
+pthread_create(&dwthread, NULL, (void *)_dw_handle_sem, (void *)tmpsock);
 eve->alive = ev;
 return eve;
 }
 /* Open an already existing named event semaphore.
 *              an open or create call.
 */
 int dw_named_event_close(HEV eve)
 {
 /* Finally close the domain socket,
-* cleanup will continue in _handle_sem.
+* cleanup will continue in _dw_handle_sem.
 */
 if(eve)
 {
 close(eve->alive);
 free(eve);
 /* If we aren't using garbage collection we need autorelease pools */
 #if !defined(GARBAGE_COLLECT)
 NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 pthread_setspecific(_dw_pool_key, pool);
 #endif
-_init_colors();
+_dw_init_colors();
 }
 /*
 * Generally an internal function called from a terminating
 * thread to cleanup the Dynamic Windows environment for the thread.
 color = pthread_getspecific(_dw_fg_color_key);
 [color release];
 color = pthread_getspecific(_dw_bg_color_key);
 [color release];
 #if !defined(GARBAGE_COLLECT)
-pool = pthread_getspecific(_dw_pool_key);
+NSAutoreleasePool *pool = pthread_getspecific(_dw_pool_key);
 [pool drain];
 #endif
 }
 /*
 /* Create object for handling timers */
 DWHandler = [[DWTimerHandler alloc] init];
 /* If we aren't using garbage collection we need autorelease pools */
 #if !defined(GARBAGE_COLLECT)
 pthread_key_create(&_dw_pool_key, NULL);
-pool = [[NSAutoreleasePool alloc] init];
+NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 pthread_setspecific(_dw_pool_key, pool);
 #endif
 pthread_key_create(&_dw_fg_color_key, NULL);
 pthread_key_create(&_dw_bg_color_key, NULL);
-_init_colors();
+_dw_init_colors();
 /* Create a default main menu, with just the application menu */
-DWMainMenu = _generate_main_menu();
+DWMainMenu = _dw_generate_main_menu();
 [DWMainMenu retain];
 [DWApp setMainMenu:DWMainMenu];
 DWObj = [[DWObject alloc] init];
 DWDefaultFont = nil;
 DWFontManager = [NSFontManager sharedFontManager];
 /* Call the application's draw function */
 p->drawfunc(print, pixmap, x, p->drawdata);
 if(p->drawfunc)
 {
 /* Internal representation is flipped... so flip again so we can print */
-_flip_image(image, rep2, size);
+_dw_flip_image(image, rep2, size);
 #ifdef DEBUG_PRINT
 /* Save it to file to see what we have */
 NSData *data = [rep2 representationUsingType: NSPNGFileType properties: nil];
 [data writeToFile: @"print.png" atomically: NO];
 #endif

Mercurial > dwindows

comparison mac/dw.m @ 2392:9fcc9ee25c4b