Merge jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 26 Jan 2016 09:50:04 +0000
branchjv
changeset 7111 96d1e688928a
parent 7110 02e3ca86cf38 (current diff)
parent 7107 47aff5c3560b (diff)
child 7112 fdac35b4dda1
Merge
Form.st
SimpleView.st
--- a/Form.st	Sat Jan 23 07:28:04 2016 +0000
+++ b/Form.st	Tue Jan 26 09:50:04 2016 +0000
@@ -508,7 +508,7 @@
      Please do no longer use this, since it will not work
      correctly in multi-display applications (creates the form on the
      default Display).
-     Use #fromFile:on: and pass the devive as argument."
+     Use #fromFile:on: and pass the device as argument."
 
     <resource:#obsolete>
 
@@ -527,7 +527,7 @@
      Please do no longer use this, since it will not work
      correctly in multi-display applications (creates the form on the
      default Display).
-     Use #fromFile:resolution:on: and pass the devive as argument."
+     Use #fromFile:resolution:on: and pass the device as argument."
 
     <resource:#obsolete>
 
@@ -1232,7 +1232,6 @@
 	aStream reset.
 	^MIMEDocument contentType: MIMEDocument contentTypeGif content: aStream
 ! !
-
 !Form methodsFor:'converting'!
 
 asForm
--- a/SimpleView.st	Sat Jan 23 07:28:04 2016 +0000
+++ b/SimpleView.st	Tue Jan 26 09:50:04 2016 +0000
@@ -11478,6 +11478,18 @@
     "Modified: / 22-03-2011 / 13:33:13 / cg"
 !
 
+openModelessAtPointer
+    "create and schedule a new windowgroup for me and open the view.
+     The view will be handled by its own process, effectively running in
+     parallel (i.e. control is returned to the sender immediately)."
+
+    self openModelessAt:(self graphicsDevice pointerPosition)
+
+    "
+     (Button label:'hello') openModelessAtPointer
+    "
+!
+
 waitUntilVisible
     "wait until the receiver visible.
      In normal applications, you do not need to wait till a view is
--- a/XEmbedContainerView.st	Sat Jan 23 07:28:04 2016 +0000
+++ b/XEmbedContainerView.st	Tue Jan 26 09:50:04 2016 +0000
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
 	      All Rights Reserved
@@ -11,6 +13,8 @@
 "
 "{ Package: 'stx:libview' }"
 
+"{ NameSpace: Smalltalk }"
+
 SimpleView subclass:#XEmbedContainerView
 	instanceVariableNames:'clientViewId clientView workarounds'
 	classVariableNames:'XEMBED_EMBEDDED_NOTIFY XEMBED_WINDOW_ACTIVATE
@@ -126,9 +130,7 @@
     
     |xembed topView|
 
-    topView := StandardSystemView
-                new;
-                extent:(640 @ 480).
+    topView := StandardSystemView extent:(640 @ 480).
     xembed := self in:topView.
     xembed origin:(0.0 @ 0.0) corner:(1.0 @ 1.0).
     
@@ -441,7 +443,7 @@
 !XEmbedContainerView class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/XEmbedContainerView.st,v 1.6 2014-03-19 10:04:17 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_SVN