Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorca
Fri, 17 Sep 2004 11:12:34 +0200
changeset 4262 129e10b82f57
parent 4261 0eed7aee7d20
child 4263 d9dbe59481dd
*** empty log message ***
SimpleView.st file | annotate | diff | comparison | revisions
WinWorkstation.st file | annotate | diff | comparison | revisions 
--- a/SimpleView.st	Thu Sep 16 17:26:20 2004 +0200
+++ b/SimpleView.st	Fri Sep 17 11:12:34 2004 +0200
@@ -2997,6 +2997,10 @@
     flagBits := flagBits bitOr:FlagNativeWidget
 !
 
+beNonNativeWidget
+    flagBits := flagBits bitClear:FlagNativeWidget
+!
+
 isNativeWidget
     ^ flagBits bitTest:FlagNativeWidget
 !
@@ -9530,7 +9534,7 @@
 !SimpleView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.510 2004-09-13 08:46:09 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/SimpleView.st,v 1.511 2004-09-17 09:12:34 ca Exp $'
 ! !
 
 SimpleView initialize!
--- a/WinWorkstation.st	Thu Sep 16 17:26:20 2004 +0200
+++ b/WinWorkstation.st	Fri Sep 17 11:12:34 2004 +0200
@@ -7304,19 +7304,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
@@ -7328,43 +7328,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
@@ -7372,18 +7372,22 @@
     weventMask := aView eventMask.
 
     NativeWidgets ifTrue:[
-	windowType := aView nativeWindowType.
-	windowType notNil ifTrue:[
-	    "/ must be a symbol and is used
-	    "/ as a key into the nativeClass translation map.
-
-	    windowClass := NativeWidgetClassTable at:windowType ifAbsent:windowType.
-	    aView beNativeWidget.
-	    self class debugNative ifTrue:[
-		'WinWorkstation [info]: windowType: ' infoPrint. windowType infoPrint.
-		' windowClass: ' infoPrint. windowClass infoPrintCR.
-	    ].
-	].
+        windowType := aView nativeWindowType.
+        windowType notNil ifTrue:[
+            "/ must be a symbol and is used
+            "/ as a key into the nativeClass translation map.
+
+            windowClass := NativeWidgetClassTable at:windowType ifAbsent:windowType.
+            self class debugNative ifTrue:[
+                'WinWorkstation [info]: windowType: ' infoPrint. windowType infoPrint.
+                ' windowClass: ' infoPrint. windowClass infoPrintCR.
+            ].
+        ].
+    ].
+    windowClass notNil ifTrue:[
+        aView beNativeWidget.
+    ] ifFalse:[
+        aView beNonNativeWidget.
     ].
 
     moreArgs := Array new:20.
@@ -7408,17 +7412,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.
 
@@ -16338,7 +16342,7 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.286 2004-09-16 15:26:20 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.287 2004-09-17 09:12:13 ca Exp $'
 ! !
 
 WinWorkstation initialize!
hg/stx-libview