Resolved some more TODOs... though resolving the rest in this file is going to be fun...

This commit is contained in:
Pietro Gagliardi 2014-02-15 13:16:17 -05:00
parent 1be9c1a105
commit dce24dae3f
1 changed files with 3 additions and 4 deletions

View File

@ -101,7 +101,6 @@ func (s *sysData) delChild(id _HMENU) {
delete(s.children, id) delete(s.children, id)
} }
// TODO adorn error messages with what stage failed?
func (s *sysData) make(initText string, window *sysData) (err error) { func (s *sysData) make(initText string, window *sysData) (err error) {
ret := make(chan uiret) ret := make(chan uiret)
defer close(ret) defer close(ret)
@ -115,7 +114,7 @@ func (s *sysData) make(initText string, window *sysData) (err error) {
} else { // need a new class } else { // need a new class
n, err := registerStdWndClass(s) n, err := registerStdWndClass(s)
if err != nil { if err != nil {
return err return fmt.Errorf("error creating window class for new window: %v", err)
} }
classname = n classname = n
} }
@ -146,7 +145,7 @@ func (s *sysData) make(initText string, window *sysData) (err error) {
if window != nil { if window != nil {
window.delChild(cid) window.delChild(cid)
} }
return r.err return fmt.Errorf("error actually creating window/control: %v", r.err)
} }
s.hwnd = _HWND(r.ret) s.hwnd = _HWND(r.ret)
return nil return nil
@ -353,7 +352,7 @@ func (s *sysData) selectedIndex() (int, error) {
ret: ret, ret: ret,
} }
r := <-ret r := <-ret
if r.ret == uintptr(classTypes[s.ctype].selectedIndexErr) { if r.ret == uintptr(classTypes[s.ctype].selectedIndexErr) { // no selection
return -1, nil return -1, nil
} }
return int(r.ret), nil return int(r.ret), nil