summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Gagliardi <[email protected]>2014-03-09 21:56:17 -0400
committerPietro Gagliardi <[email protected]>2014-03-09 21:56:17 -0400
commitf72d6c990064f9ea651dd3fb80bf0b20a805f0b6 (patch)
tree2e0c70b2d9315848e0786203b308e699455924ac
parent3ed9c0b75d30cb427082478f445f4d869a9540fd (diff)
Removed now-unused error returns from sysData.show() and sysData.hide().
-rw-r--r--sysdata.go4
-rw-r--r--sysdata_darwin.go6
-rw-r--r--sysdata_unix.go6
-rw-r--r--sysdata_windows.go12
-rw-r--r--todo.md1
5 files changed, 12 insertions, 17 deletions
diff --git a/sysdata.go b/sysdata.go
index 56313e3..ce352bb 100644
--- a/sysdata.go
+++ b/sysdata.go
@@ -25,10 +25,10 @@ func (c *cSysData) make(initText string, window *sysData) error {
func (c *cSysData) firstShow() error {
panic(runtime.GOOS + " sysData does not define firstShow()")
}
-func (c *cSysData) show() error {
+func (c *cSysData) show() {
panic(runtime.GOOS + " sysData does not define show()")
}
-func (c *cSysData) hide() error {
+func (c *cSysData) hide() {
panic(runtime.GOOS + " sysData does not define hide()")
}
func (c *cSysData) setText(text string) error {
diff --git a/sysdata_darwin.go b/sysdata_darwin.go
index 057b333..e58ad9c 100644
--- a/sysdata_darwin.go
+++ b/sysdata_darwin.go
@@ -320,7 +320,7 @@ func (s *sysData) firstShow() error {
return nil
}
-func (s *sysData) show() error {
+func (s *sysData) show() {
ret := make(chan struct{})
defer close(ret)
uitask <- func() {
@@ -328,10 +328,9 @@ func (s *sysData) show() error {
ret <- struct{}{}
}
<-ret
- return nil
}
-func (s *sysData) hide() error {
+func (s *sysData) hide() {
ret := make(chan struct{})
defer close(ret)
uitask <- func() {
@@ -339,7 +338,6 @@ func (s *sysData) hide() error {
ret <- struct{}{}
}
<-ret
- return nil
}
func (s *sysData) setText(text string) error {
diff --git a/sysdata_unix.go b/sysdata_unix.go
index 143a64c..aabe13e 100644
--- a/sysdata_unix.go
+++ b/sysdata_unix.go
@@ -162,7 +162,7 @@ func (s *sysData) firstShow() error {
return nil
}
-func (s *sysData) show() error {
+func (s *sysData) show() {
ret := make(chan struct{})
defer close(ret)
uitask <- func() {
@@ -170,10 +170,9 @@ func (s *sysData) show() error {
ret <- struct{}{}
}
<-ret
- return nil
}
-func (s *sysData) hide() error {
+func (s *sysData) hide() {
ret := make(chan struct{})
defer close(ret)
uitask <- func() {
@@ -181,7 +180,6 @@ func (s *sysData) hide() error {
ret <- struct{}{}
}
<-ret
- return nil
}
func (s *sysData) setText(text string) error {
diff --git a/sysdata_windows.go b/sysdata_windows.go
index 1619374..a0935c9 100644
--- a/sysdata_windows.go
+++ b/sysdata_windows.go
@@ -213,7 +213,7 @@ func (s *sysData) firstShow() error {
return nil
}
-func (s *sysData) show() (err error) {
+func (s *sysData) show() {
ret := make(chan uiret)
defer close(ret)
uitask <- &uimsg{
@@ -225,20 +225,20 @@ func (s *sysData) show() (err error) {
ret: ret,
}
<-ret
- return nil
}
-func (s *sysData) hide() (err error) {
+func (s *sysData) hide() {
ret := make(chan uiret)
defer close(ret)
- // TODO figure out how to handle error
uitask <- &uimsg{
call: _showWindow,
- p: []uintptr{uintptr(s.hwnd), _SW_HIDE},
+ p: []uintptr{
+ uintptr(s.hwnd),
+ uintptr(_SW_HIDE),
+ },
ret: ret,
}
<-ret
- return nil
}
func (s *sysData) setText(text string) error {
diff --git a/todo.md b/todo.md
index d05c975..eff41d2 100644
--- a/todo.md
+++ b/todo.md
@@ -3,7 +3,6 @@ so I don't forget:
- Control.Show()/Control.Hide()
- Groupbox
- see if we really need to track errors on a lot of places that report errors
- - Window.Show()/Window.Hide() report errors due to UpdateWindow(), which can fail, but that is only called when the window is first opened: split that functionality out
- it appears GTK+ and Cocoa both either don't provide a convenient way to grab errors or you're not supposed to; I assume you're supposed to just assume everything works... but on Windows we check errors for functions that return errors, and there's no guarantee that only certian errors will be returned...
- character-limited entry fields, numeric entry fields, multiline entry fields
- possible rename of LineEdit?