summaryrefslogtreecommitdiff
path: root/redo/window.go
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-07-19 09:44:32 -0400
committerPietro Gagliardi <[email protected]>2014-07-19 09:44:32 -0400
commit48c5055eb960d6db3d3b997bdc859670f473a277 (patch)
treeebde497dc011e9c1a8dca63710e59fb9e2b75c69 /redo/window.go
parent47c0f573a986622a1968cf324fb1c5c5881a63a5 (diff)
Started dropping the whole request/response system because it fell apart... time to make a ui.Do(func(){ ... })
Diffstat (limited to 'redo/window.go')
-rw-r--r--redo/window.go37
1 files changed, 14 insertions, 23 deletions
diff --git a/redo/window.go b/redo/window.go
index 2dc6a6e..2494406 100644
--- a/redo/window.go
+++ b/redo/window.go
@@ -6,41 +6,32 @@ package ui
// Windows in package ui can only contain one control; the Stack and Grid layout Controls allow you to pack multiple Controls in a Window.
// Note that a Window is not itself a Control.
type Window interface {
- // SetControl creates a Request to the Window's child Control.
- SetControl(c Control) *Request
+ // SetControl sets the Window's child Control.
+ SetControl(c Control)
- // Title and SetTitle create Requests to get and set the Window's title, respectively.
- Title() *Request
- SetTitle(title string) *Request
+ // Title and SetTitle get and set the Window's title, respectively.
+ Title() string
+ SetTitle(title string)
- // Show and Hide create Requests to bring the Window on-screen and off-screen, respectively.
- Show() *Request
- Hide() *Request
+ // Show and Hide bring the Window on-screen and off-screen, respectively.
+ Show()
+ Hide()
- // Close creates a Request to close the Window.
+ // Close closes the Window.
// Any Controls within the Window are destroyed, and the Window itself is also destroyed.
// Attempting to use a Window after it has been closed results in undefined behavior.
// Close unconditionally closes the Window; it neither raises OnClosing nor checks for a return from OnClosing.
// TODO make sure the above happens on GTK+ and Mac OS X; it does on Windows
- Close() *Request
+ Close()
- // OnClosing creates a Request to register an event handler that is triggered when the user clicks the Window's close button.
+ // OnClosing registers an event handler that is triggered when the user clicks the Window's close button.
// On systems where whole applications own windows, OnClosing is also triggered when the user asks to close the application.
// If this handler returns true, the Window is closed as defined by Close above.
// If this handler returns false, the Window is not closed.
- OnClosing(func(c Doer) bool) *Request
+ OnClosing(func() bool)
}
-// NewWindow returns a Request to create a new Window with the given title text and size.
-func NewWindow(title string, width int, height int) *Request {
+// NewWindow creates a new Window with the given title text and size.
+func NewWindow(title string, width int, height int) Window {
return newWindow(title, width, height)
}
-
-// GetNewWindow is like NewWindow but sends the Request along the given Doer and returns the resultant Window.
-// Example:
-// w := ui.GetNewWindow(ui.Do, "Main Window")
-func GetNewWindow(c Doer, title string, width int, height int) Window {
- req := newWindow(title, width, height)
- c <- req
- return (<-req.resp).(Window)
-}