Replaced test for os version

diff --git a/macosx/GVAttributeInspectorController.m b/macosx/GVAttributeInspectorController.m
index 6f0d4df8ac701a3ae8a51d46c7fcaf36fa6e6dbf..767888292bc42e14beffc9dd6b444d2470837724 100644 (file)
--- 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 b99c094e958a18db8dbd71e7244933caa9dd251d..c83c98f0b33ed3bd2cd4deaff9d437cf617f2ea7 100644 (file)
--- 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 f38afbfbc47fffd9be56574b0f4a285bb916a246..1d3f051a14b385536f7670d2753db92dd31bf239 100644 (file)
--- 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 893821bcd4c2b25aca5a1085edcb771171f7b4fe..468309b7f12ddcd01118a447541a21c720aae8e6 100644 (file)
--- 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 bf303f61fe9336d83ea9459575d6ce1ab4382c8d..789627f3ad78a366a75b145a3902371dce55de04 100644 (file)
--- 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 b5bdd3888678e57bc18de4c1bc9028d1bd8c6f3d..67a6dd4fab11d606eef2871c3af0d6635d63ff37 100644 (file)
--- 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 f2327ee39b194088c00f79bc9ded1f2ad2849fa3..9aa5af186afad188cf3d695d6bad6e286f288b47 100644 (file)
--- 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 75e2bfd8364da0234f13a7ee2fc72a66a95f6125..502204e862b1260762506a50b3750addd0c1bdf7 100644 (file)
--- 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