fixed: preproc. leftovers

AppKit/CPImageView.j

@@ -25,6 +25,7 @@
 @import "CPControl.j"
 @import "CPImage.j"
 @import "CPShadowView.j"
+@import "CPDOMDisplayServer.j"
 
 @global CPImagesPboardType
 @global appkit_tag_dom_elements
@@ -89,9 +90,10 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
     if (self)
     {
-#if PLATFORM(DOM)
-        [self _createDOMImageElement];
-#endif
+        if (CPDOMAvailable)
+        {
+            [self _createDOMImageElement];
+        }
     }
 
     return self;
@@ -99,7 +101,9 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
 - (void)_createDOMImageElement
 {
-#if PLATFORM(DOM)
+    if (!CPDOMAvailable)
+        return;
+
     var image = [self objectValue],
         isCSSBasedImage = [image isCSSBased],
         isIMGImageElement = _DOMImageElement && (_DOMImageElement.nodeName == "IMG");
@@ -140,7 +144,6 @@ var CPImageViewEmptyPlaceholderImage = nil;
     AppKitTagDOMElement(self, _DOMImageElement);
 
     CPDOMDisplayServerAppendChild(_DOMElement, _DOMImageElement);
-#endif
 }
 
 /*!
@@ -173,17 +176,18 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
     var newImage = [self objectValue];
 
-#if PLATFORM(DOM)
-    [self _createDOMImageElement];
+    if (CPDOMAvailable)
+    {
+        [self _createDOMImageElement];
 
-    if ([newImage isCSSBased])
-        _cssStyleNode = [newImage applyCSSImageForView:self
-                                          onDOMElement:_DOMImageElement
-                                             styleNode:_cssStyleNode
-                                         previousState:@ref(_cssStylePreviousState)];
-    else
-        _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
-#endif
+        if ([newImage isCSSBased])
+            _cssStyleNode = [newImage applyCSSImageForView:self
+                                              onDOMElement:_DOMImageElement
+                                                 styleNode:_cssStyleNode
+                                             previousState:@ref(_cssStylePreviousState)];
+        else
+            _DOMImageElement.src = newImage ? [newImage filename] : [CPImageViewEmptyPlaceholderImage filename];
+    }
 
     var size = [newImage size];
 
@@ -191,10 +195,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
     {
         [defaultCenter addObserver:self selector:@selector(imageDidLoad:) name:CPImageDidLoadNotification object:newImage];
 
-#if PLATFORM(DOM)
-        _DOMImageElement.width = 0;
-        _DOMImageElement.height = 0;
-#endif
+        if (CPDOMAvailable)
+        {
+            _DOMImageElement.width = 0;
+            _DOMImageElement.height = 0;
+        }
 
         [_shadowView setHidden:YES];
     }
@@ -289,12 +294,10 @@ var CPImageViewEmptyPlaceholderImage = nil;
 {
     [super setImageScaling:anImageScaling];
 
-#if PLATFORM(DOM)
-    if ([self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
+    if (CPDOMAvailable && [self currentValueForThemeAttribute:@"image-scaling"] === CPImageScaleAxesIndependently)
     {
         CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, 0.0, 0.0);
     }
-#endif
 
     [self setNeedsLayout];
     [self setNeedsDisplay:YES];
@@ -312,16 +315,18 @@ var CPImageViewEmptyPlaceholderImage = nil;
 {
     if (![self image])
     {
-#if PLATFORM(DOM)
-        _DOMImageElement.style.visibility = "hidden";
-#endif
+        if (CPDOMAvailable)
+        {
+            _DOMImageElement.style.visibility = "hidden";
+        }
         [_shadowView setHidden:YES];
     }
     else
     {
-#if PLATFORM(DOM)
-        _DOMImageElement.style.visibility = "visible";
-#endif
+        if (CPDOMAvailable)
+        {
+            _DOMImageElement.style.visibility = "visible";
+        }
         [_shadowView setHidden:NO];
     }
 }
@@ -356,10 +361,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
 
     if (imageScaling === CPImageScaleAxesIndependently)
     {
-        #if PLATFORM(DOM)
+        if (CPDOMAvailable)
+        {
             _DOMImageElement.width = ROUND(width);
             _DOMImageElement.height = ROUND(height);
-        #endif
+        }
     }
     else
     {
@@ -397,10 +403,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
                 break;
         }
 
-        #if PLATFORM(DOM)
+        if (CPDOMAvailable)
+        {
             _DOMImageElement.width = ROUND(width);
             _DOMImageElement.height = ROUND(height);
-        #endif
+        }
 
         var x,
             y;
@@ -443,13 +450,13 @@ var CPImageViewEmptyPlaceholderImage = nil;
                 break;
         }
 
-#if PLATFORM(DOM)
-        CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
-#endif
+        if (CPDOMAvailable)
+        {
+            CPDOMDisplayServerSetStyleLeftTop(_DOMImageElement, NULL, x, y);
+        }
     }
 
-#if PLATFORM(DOM)
-    if ([image isCSSBased] && [image _shouldBeResized])
+    if (CPDOMAvailable && [image isCSSBased] && [image _shouldBeResized])
     {
         [image _setDisplaySize:CGSizeMake(ROUND(width), ROUND(height))];
 
@@ -459,12 +466,11 @@ var CPImageViewEmptyPlaceholderImage = nil;
                                       previousState:@ref(_cssStylePreviousState)];
     }
 
-    if ([image isCSSBased])
+    if (CPDOMAvailable && [image isCSSBased])
     {
         _DOMImageElement.style.width = _DOMImageElement.width + 'px';
         _DOMImageElement.style.height = _DOMImageElement.height + 'px';
     }
-#endif
 
     _imageRect = CGRectMake(x, y, width, height);
 
@@ -586,9 +592,10 @@ var CPImageViewImageKey          = @"CPImageViewImageKey",
 
     if (self)
     {
-#if PLATFORM(DOM)
-        [self _createDOMImageElement];
-#endif
+        if (CPDOMAvailable)
+        {
+            [self _createDOMImageElement];
+        }
 
         [self setHasShadow:[aCoder decodeBoolForKey:CPImageViewHasShadowKey]];
         [self setImageAlignment:[aCoder decodeIntForKey:CPImageViewImageAlignmentKey]];