From: Dwight Perry <dperry@research.att.com>
Date: Wed, 7 Nov 2012 20:26:29 +0000 (-0500)
Subject: Replaced test for os version
X-Git-Tag: LAST_LIBGRAPH~32^2~277
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ca52e790562d8f6b53d6024d10fc1d0c3409e49;p=graphviz

Replaced test for os version
---

diff --git a/macosx/GVAttributeInspectorController.m b/macosx/GVAttributeInspectorController.m
index 6f0d4df8a..767888292 100644
--- a/macosx/GVAttributeInspectorController.m
+++ b/macosx/GVAttributeInspectorController.m
@@ -167,9 +167,7 @@
 	[[NSNotificationCenter defaultCenter] removeObserver:self name:NSWindowDidBecomeMainNotification object:nil];
 	[_allSchemas release];
 	[_allAttributes release];
-	
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVAttributeSchema.m b/macosx/GVAttributeSchema.m
index b99c094e9..c83c98f0b 100644
--- a/macosx/GVAttributeSchema.m
+++ b/macosx/GVAttributeSchema.m
@@ -98,8 +98,7 @@ static NSComboBoxCell *_enumCell = nil;
 - (void)dealloc
 {
 	[_element release];
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVDocument.m b/macosx/GVDocument.m
index f38afbfbc..1d3f051a1 100644
--- a/macosx/GVDocument.m
+++ b/macosx/GVDocument.m
@@ -110,8 +110,7 @@
 
 	[_exporter release];
 	[_graph release];
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVExportViewController.m b/macosx/GVExportViewController.m
index 893821bcd..468309b7f 100644
--- a/macosx/GVExportViewController.m
+++ b/macosx/GVExportViewController.m
@@ -143,8 +143,7 @@ NSMutableArray *_formatRenders = nil;
 	[_filename release];
 	[_formatRender release];
 	[_render release];
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVFileNotificationCenter.m b/macosx/GVFileNotificationCenter.m
index bf303f61f..789627f3a 100644
--- a/macosx/GVFileNotificationCenter.m
+++ b/macosx/GVFileNotificationCenter.m
@@ -64,8 +64,7 @@ static GVFileNotificationCenter *_defaultCenter = nil;
 - (void)dealloc
 {
 	[_path release];
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVGraph.m b/macosx/GVGraph.m
index b5bdd3888..67a6dd4fa 100644
--- a/macosx/GVGraph.m
+++ b/macosx/GVGraph.m
@@ -214,9 +214,7 @@ extern char *gvplugin_list(GVC_t * gvc, api_t api, const char *str);
 	[_graphAttributes release];
 	[_defaultNodeAttributes release];
 	[_defaultEdgeAttributes release];
-	
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVGraphArguments.m b/macosx/GVGraphArguments.m
index f2327ee39..9aa5af186 100644
--- a/macosx/GVGraphArguments.m
+++ b/macosx/GVGraphArguments.m
@@ -56,8 +56,7 @@
 - (void)dealloc
 {
 	[_arguments release];
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
+	[super dealloc];
 	}
 }
 
diff --git a/macosx/GVWindowController.m b/macosx/GVWindowController.m
index 75e2bfd83..502204e86 100644
--- a/macosx/GVWindowController.m
+++ b/macosx/GVWindowController.m
@@ -107,10 +107,15 @@
 }
 - (void)dealloc
 {
-	[[NSNotificationCenter defaultCenter] removeObserver:self name:@"GVGraphDocumentDidChange" object:[self document]];
-	if ( NSAppKitVersionNumber <= NSAppKitVersionNumber10_6 ) {
-	    [super dealloc];
-        }
+    char darwinStr[256];
+    size_t size = sizeof(darwinStr);
+    [[NSNotificationCenter defaultCenter] removeObserver:self name:@"GVGraphDocumentDidChange" object:[self document]];
+    sysctlbyname("kern.osrelease", darwinStr, &size, NULL, 0);
+    NSString *darwinVer = [NSString stringWithCString:darwinStr encoding:NSASCIIStringEncoding]; 
+    NSString *baseVer = @"11";
+    if ([darwinVer compare:baseVer] < 0)
+         [super dealloc];
 }
 
+
 @end