Mercurial Mercurial > hg > stx-libview / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
WinWorkstation.st
changeset 4230 6e80dbe10f18
parent 4181 91439783248a
child 4232 405a559c0d63 
--- a/WinWorkstation.st	Mon Sep 13 10:39:02 2004 +0200
+++ b/WinWorkstation.st	Mon Sep 13 10:46:09 2004 +0200
@@ -7180,19 +7180,19 @@
 !
 
 createWindowFor:aView type:typeSymbol
-		 origin:origin
-		 extent:extent
-		 minExtent:minExt
-		 maxExtent:maxExt
-		 borderWidth:bWidth
-		 subViewOf:wsuperView
-		 style:wStyle
-		 inputOnly:winputOnly
-		 label:wlabel
-		 owner:wowner
-		 icon:wicon
-		 iconMask:wiconMask
-		 iconView:wiconView
+                 origin:origin
+                 extent:extent
+                 minExtent:minExt
+                 maxExtent:maxExt
+                 borderWidth:bWidth
+                 subViewOf:wsuperView
+                 style:wStyle
+                 inputOnly:winputOnly
+                 label:wlabel
+                 owner:wowner
+                 icon:wicon
+                 iconMask:wiconMask
+                 iconView:wiconView
 
 
     |xpos ypos wwidth wheight minWidth minHeight maxWidth maxHeight
@@ -7204,43 +7204,43 @@
     "/  preferredVisual preferredDepth  viewGravity wcursorId
 
     displayId isNil ifTrue:[
-	self primitiveFailed.
-	^ nil
+        self primitiveFailed.
+        ^ nil
     ].
 
     origin notNil ifTrue:[
-	xpos := origin x.
-	ypos := origin y.
+        xpos := origin x.
+        ypos := origin y.
     ] ifFalse:[
-	xpos := ypos := 0.
+        xpos := ypos := 0.
     ].
     extent notNil ifTrue:[
-	wwidth := extent x.
-	wheight := extent y.
+        wwidth := extent x.
+        wheight := extent y.
     ] ifFalse:[
-	wwidth := 100.
-	wheight := 40.
+        wwidth := 100.
+        wheight := 40.
     ].
     minExt notNil ifTrue:[
-	minWidth := minExt x.
-	minHeight := minExt y
+        minWidth := minExt x.
+        minHeight := minExt y
     ].
     maxExt notNil ifTrue:[
-	maxWidth := maxExt x.
-	maxHeight := maxExt y
+        maxWidth := maxExt x.
+        maxHeight := maxExt y
     ].
 
     wsuperView notNil ifTrue:[
-	wsuperViewId := wsuperView id
+        wsuperViewId := wsuperView id
     ].
 
     wicon notNil ifTrue:[
-	wiconId := wicon id.
-	wiconHeight := wicon height.
-	wiconWidth  := wicon width.
-	wiconMask notNil ifTrue:[
-	    wiconMaskId := wiconMask id
-	]
+        wiconId := wicon id.
+        wiconHeight := wicon height.
+        wiconWidth  := wicon width.
+        wiconMask notNil ifTrue:[
+            wiconMaskId := wiconMask id
+        ]
     ].
 "/    wiconView notNil ifTrue:[
 "/        wiconViewId := wiconView id
@@ -7248,15 +7248,16 @@
     weventMask := aView eventMask.
 
     NativeWindows ifTrue:[
-	windowType := aView nativeWindowType.
-	windowType notNil ifTrue:[
-	    "/ must be a symbol and is used
-	    "/ as a key into the nativeClass translation map.
-
-	    windowClass := NativeWindowClassTable at:windowType ifAbsent:windowType.
-	    "/ 'windowType: ' errorPrint. windowType errorPrintCR.
-	    "/ 'windowClass: ' errorPrint. windowClass errorPrintCR.
-	].
+        windowType := aView nativeWindowType.
+        windowType notNil ifTrue:[
+            "/ must be a symbol and is used
+            "/ as a key into the nativeClass translation map.
+
+            windowClass := NativeWindowClassTable at:windowType ifAbsent:windowType.
+            aView beNativeWidget.
+            'windowType: ' errorPrint. windowType errorPrintCR.
+            'windowClass: ' errorPrint. windowClass errorPrintCR.
+        ].
     ].
 
     moreArgs := Array new:20.
@@ -7281,17 +7282,17 @@
 
     [
       windowId := self
-		  primCreateWindowFor:aView
-		  type:typeSymbol
-		  borderWidth:bWidth
-		  subViewOf:wsuperView
-		  style:wStyle
-		  inputOnly:winputOnly
-		  label:wlabel
-		  owner:wowner
-		  icon:wicon
-		  iconMask:wiconMask
-		  moreArgs:moreArgs.
+                  primCreateWindowFor:aView
+                  type:typeSymbol
+                  borderWidth:bWidth
+                  subViewOf:wsuperView
+                  style:wStyle
+                  inputOnly:winputOnly
+                  label:wlabel
+                  owner:wowner
+                  icon:wicon
+                  iconMask:wiconMask
+                  moreArgs:moreArgs.
       aView setId:windowId.
     ] valueUninterruptably.
 
@@ -9899,20 +9900,6 @@
     "Modified: / 28.4.1999 / 15:07:09 / cg"
 !
 
-nativeWidgetCommand:commandId view:aView
-    "forward a command event for some view.
-     (Button, CheckBox etc.)"
-
-    |sensor|
-
-    aView isNil ifTrue:[
-	"/ event arrived, after I destroyed it myself
-	^ self
-    ].
-    sensor := aView sensor.
-    sensor nativeWidgetCommand:commandId view:aView
-!
-
 configureX:x y:y width:w height:h view:aView
     "forward a configure for some view"
 
@@ -9949,6 +9936,20 @@
     "Modified: / 19.5.1999 / 23:37:17 / cg"
 !
 
+nativeWidgetCommand:commandId view:aView
+    "forward a command event for some view.
+     (Button, CheckBox etc.)"
+
+    |sensor|
+
+    aView isNil ifTrue:[
+	"/ event arrived, after I destroyed it myself
+	^ self
+    ].
+    sensor := aView sensor.
+    sensor nativeWidgetCommand:commandId view:aView
+!
+
 queryDropFiles:files view:view
     "called if files are droped from window
     "
@@ -9956,7 +9957,6 @@
     files do:[:f| Transcript showCR:('  ', f printString) ].
 !
 
-
 queryEndSession
     "system is about to be shut down.
      This is a speciality of windows.
@@ -15945,7 +15945,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.269 2004-06-04 05:17:33 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.270 2004-09-13 08:45:54 cg Exp $'
 ! !
 
 WinWorkstation initialize!
hg/stx-libview