dwindows: mac/dw.m comparison

comparison mac/dw.m @ 751:eba6ab48c952

Runtime Snow Leopard checks where possible and visual fix for Leopard status text.

author	bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date	Thu, 17 Mar 2011 03:31:01 +0000
parents	9e147366147b
children	cf447811d322

comparison

equal deleted inserted replaced

-:e6a9f1c7b0d7
+:eba6ab48c952
 HMTX DWRunMutex;
 HMTX DWThreadMutex;
 HMTX DWThreadMutex2;
 DWTID DWThread = (DWTID)-1;
 DWTID _dw_mutex_locked = (DWTID)-1;
+long DWOSMajor, DWOSMinor, DWOSBuild;
 /* Used for doing bitblts from the main thread */
 typedef struct _bitbltinfo
 {
 id src;
 			}
 			else if([handle isMemberOfClass:[DWSplitBar class]] && size.width > 20 && size.height > 20)
 			{
 DWSplitBar *split = (DWSplitBar *)handle;
 				float percent = [split percent];
 if(percent > 0)
 {
 dw_splitbar_set(handle, percent);
 [split setPercent:0];
 }
 }
 }
 NSMenu *_generate_main_menu()
 {
-	NSString *applicationName = nil;
+NSString *applicationName = nil;
-	/* This only works on 10.6 so we have a backup method */
+/* This only works on 10.6 so we have a backup method */
 #ifdef BUILDING_FOR_SNOW_LEOPARD
-	applicationName = [[NSRunningApplication currentApplication] localizedName];
+applicationName = [[NSRunningApplication currentApplication] localizedName];
 #endif
-	if(applicationName == nil)
+if(applicationName == nil)
-	{
+{
-		applicationName = [[NSProcessInfo processInfo] processName];
+applicationName = [[NSProcessInfo processInfo] processName];
-	}
+}
 	/* Create the main menu */
 	NSMenu * mainMenu = [[[NSMenu alloc] initWithTitle:@"MainMenu"] autorelease];
 	NSMenuItem * mitem = [mainMenu addItemWithTitle:@"Apple" action:NULL keyEquivalent:@""];
 */
 void dw_clipboard_set_text( char *str, int len)
 {
 	NSPasteboard *pasteboard = [NSPasteboard generalPasteboard];
-#ifdef BUILDING_FOR_SNOW_LEOPARD
+/* Only in Snow Leopard */
-	[pasteboard clearContents];
+if(DWOSMinor > 5)
-#endif
+{
+[pasteboard clearContents];
+}
 	[pasteboard setString:[ NSString stringWithUTF8String:str ] forType:NSStringPboardType];
 }
 *       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_status_text_new(char *text, ULONG cid)
 {
-	NSTextField *textfield = dw_text_new(text, cid);
+NSTextField *textfield = dw_text_new(text, cid);
-	[textfield setBordered:YES];
+[textfield setBordered:YES];
-	[textfield setBezeled:YES];
+if(DWOSMinor > 5)
-	[textfield setBezelStyle:NSTextFieldSquareBezel];
+	{
-[textfield setBackgroundColor:[NSColor colorWithDeviceRed:1 green:1 blue:1 alpha: 0]];
+[textfield setBezeled:YES];
+[textfield setBezelStyle:NSTextFieldSquareBezel];
+}
+[textfield setBackgroundColor:[NSColor clearColor]];
 [textfield setDrawsBackground:NO];
-	return textfield;
+return textfield;
 }
 /*
 * Create a new static text window (widget) to be packed.
 * Parameters:
 DWView *view = [[DWView alloc] init];
 [window setContentView:view];
 [window setDelegate:view];
-#ifdef BUILDING_FOR_SNOW_LEOPARD
-[window setAllowsConcurrentViewDrawing:NO];
-#endif
 [view release];
 /* If it isn't a toplevel window... */
 if(hwndOwner)
 {
 */
 void API dw_window_set_style(HWND handle, ULONG style, ULONG mask)
 {
 	id object = handle;
-	if([object isMemberOfClass:[NSWindow class]])
+if(DWOSMinor > 5 && [object isMemberOfClass:[NSWindow class]])
-	{
+{
-#ifdef BUILDING_FOR_SNOW_LEOPARD
+NSWindow *window = object;
-		NSWindow *window = object;
+int currentstyle = (int)[window styleMask];
-		int currentstyle = (int)[window styleMask];
+int tmp;
-		int tmp;
-		tmp = currentstyle | (int)mask;
+tmp = currentstyle | (int)mask;
-		tmp ^= mask;
+tmp ^= mask;
-		tmp |= style;
+tmp |= style;
-		[window setStyleMask:tmp];
+[window setStyleMask:tmp];
-#endif
+}
-	}
 else if([object isKindOfClass:[NSTextField class]])
 {
 NSTextField *tf = object;
 /* TODO: See if we need to switch to a bitmask */
 *       env: Pointer to a DWEnv struct.
 */
 void dw_environment_query(DWEnv *env)
 {
 	struct utsname name;
-	char tempbuf[100];
-	int len, z;
 	uname(&name);
 	strcpy(env->osName, "MacOS");
-	strcpy(tempbuf, name.release);
-	env->MajorBuild = env->MinorBuild = 0;
-	len = (int)strlen(tempbuf);
 	strcpy(env->buildDate, __DATE__);
 	strcpy(env->buildTime, __TIME__);
 	env->DWMajorVersion = DW_MAJOR_VERSION;
 	env->DWMinorVersion = DW_MINOR_VERSION;
 	env->DWSubVersion = DW_SUB_VERSION;
-	for(z=1;z<len;z++)
+env->MajorVersion = DWOSMajor;
-	{
+env->MinorVersion = DWOSMinor;
-		if(tempbuf[z] == '.')
+env->MajorBuild = DWOSBuild;
-		{
-			int ver = atoi(tempbuf);
-			tempbuf[z] = '\0';
-			if(ver > 4)
-			{
-				env->MajorVersion = 10;
-				env->MinorVersion = ver - 4;
-				env->MajorBuild = atoi(&tempbuf[z+1]);
-			}
-			else
-			{
-				env->MajorVersion = ver;
-				env->MinorVersion = atoi(&tempbuf[z+1]);
-			}
-			return;
-		}
-	}
-	env->MajorVersion = atoi(tempbuf);
-	env->MinorVersion = 0;
 }
 /*
 * Emits a beep.
 * Parameters:
 *           newthread: True if this is the only thread.
 *                      False if there is already a message loop running.
 */
 int API dw_init(int newthread, int argc, char *argv[])
 {
+/* Get the operating system version */
+Gestalt(gestaltSystemVersionMajor, &DWOSMajor);
+Gestalt(gestaltSystemVersionMinor, &DWOSMinor);
+Gestalt(gestaltSystemVersionBugFix, &DWOSBuild);
 /* Create the application object */
 DWApp = [NSApplication sharedApplication];
 /* Create object for handling timers */
 DWHandler = [[DWTimerHandler alloc] init];
 /* If we aren't using garbage collection we need autorelease pools */

Mercurial > dwindows

comparison mac/dw.m @ 751:eba6ab48c952