From 61d7f285ac3ba1e2da84e1b8323cb45b0e8fd799 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Fri, 14 Feb 2014 15:54:56 -0500 Subject: [PATCH] Renamed sysData.editable to sysData.alternate in preparation for ListBox. --- combobox.go | 2 +- sysdata.go | 2 +- sysdata_windows.go | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/combobox.go b/combobox.go index 08d4605..7bd666c 100644 --- a/combobox.go +++ b/combobox.go @@ -22,7 +22,7 @@ func NewCombobox(editable bool, items ...string) (c *Combobox) { sysData: mksysdata(c_combobox), initItems: items, } - c.sysData.editable = editable + c.sysData.alternate = editable return c } diff --git a/sysdata.go b/sysdata.go index 1ff257e..7ee8c79 100644 --- a/sysdata.go +++ b/sysdata.go @@ -10,7 +10,7 @@ type cSysData struct { ctype int event chan struct{} resize func(x int, y int, width int, height int) error - editable bool // for Combobox + alternate bool // editable for Combobox, multi-select for listbox } func (c *cSysData) make(initText string, initWidth int, initHeight int, window *sysData) error { panic(runtime.GOOS + " sysData does not define make()") diff --git a/sysdata_windows.go b/sysdata_windows.go index 86187b5..bf6f31a 100644 --- a/sysdata_windows.go +++ b/sysdata_windows.go @@ -23,7 +23,7 @@ type classData struct { style uint32 xstyle uint32 mkid bool - editStyle uint32 + altStyle uint32 appendMsg uintptr insertAfterMsg uintptr deleteMsg uintptr @@ -51,7 +51,7 @@ var classTypes = [nctypes]*classData{ name: "COMBOBOX", style: _CBS_DROPDOWNLIST | controlstyle, xstyle: 0 | controlxstyle, - editStyle: _CBS_DROPDOWN | _CBS_AUTOHSCROLL | controlstyle, + altStyle: _CBS_DROPDOWN | _CBS_AUTOHSCROLL | controlstyle, appendMsg: _CB_ADDSTRING, insertAfterMsg: _CB_INSERTSTRING, deleteMsg: _CB_DELETESTRING, @@ -104,8 +104,8 @@ func (s *sysData) make(initText string, initWidth int, initHeight int, window *s classname = n } style := uintptr(ct.style) - if s.editable { - style = uintptr(ct.editStyle) + if s.alternate { + style = uintptr(ct.altStyle) } uitask <- &uimsg{ call: _createWindowEx,