--- a/GraphicsMedium.st Fri Sep 26 11:43:55 2014 +0200
+++ b/GraphicsMedium.st Fri Sep 26 11:48:32 2014 +0200
@@ -9,8 +9,6 @@
other person. No title to or ownership of the software is
hereby transferred.
"
-'From Smalltalk/X, Version:6.2.4.0 on 27-06-2014 at 11:07:42' !
-
"{ Package: 'stx:libview' }"
Object subclass:#GraphicsMedium
@@ -2141,7 +2139,7 @@
"/ (if you change anything under Unix, make it X-platform specific.
"/ (there seem to be drawing incompatibilities between Win- and XWorkstation)
- isWin32 := self device platformName = 'WIN32'.
+ isWin32 := self device isWindowsPlatform.
right := left + width-1.
bottom := top + height-1.
@@ -2150,11 +2148,11 @@
hC := hCorn.
self scale = 1 ifTrue:[
- wHalf := wC // 2.
- hHalf := hC // 2.
+ wHalf := wC // 2.
+ hHalf := hC // 2.
] ifFalse:[
- wHalf := wC / 2.
- hHalf := hC / 2.
+ wHalf := wC / 2.
+ hHalf := hC / 2.
].
"top left arc"
@@ -2165,9 +2163,9 @@
"bottom right arc"
(isWin32 and:[self scale = 1]) ifTrue:[
- self displayArcX:(right - wC+1) y:(bottom - hC+1) width:wC height:hC from:270 angle:90.
+ self displayArcX:(right - wC+1) y:(bottom - hC+1) width:wC height:hC from:270 angle:90.
] ifFalse:[
- self displayArcX:(right - wC) y:(bottom - hC) width:wC height:hC from:270 angle:90.
+ self displayArcX:(right - wC) y:(bottom - hC) width:wC height:hC from:270 angle:90.
].
"bottom left arc"
@@ -2181,7 +2179,7 @@
"bottom line"
self displayLineFromX:(left + wHalf-1) y:bottom
- toX:(right - wHalf ) y:bottom.
+ toX:(right - wHalf ) y:bottom.
"right line"
self displayLineFromX:right y:(top + hHalf) toX:right y:(bottom - hHalf).
@@ -2993,7 +2991,7 @@
wHalf := wC / 2.
hHalf := hC / 2.
- self device platformName = #WIN32 ifTrue:[
+ self device isWindowsPlatform ifTrue:[
"/ bug workaround
"top left arc"
self fillArcX:left y:top width:wC height:hC from:90 angle:90.
@@ -3323,7 +3321,6 @@
!GraphicsMedium class methodsFor:'documentation'!
version_CVS
- ^ '$Header: /cvs/stx/stx/libview/GraphicsMedium.st,v 1.22.2.3 2014-09-26 09:43:55 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/GraphicsMedium.st,v 1.22.2.4 2014-09-26 09:48:32 stefan Exp $'
! !
-