Un-intmax_t'd everything.
This commit is contained in:
parent
acdea005c0
commit
f0fb0f4f7e
|
@ -74,7 +74,7 @@ func NewScrollingArea(handler AreaHandler, width int, height int) *Area {
|
|||
a.scrolling = true
|
||||
a.ah = registerAreaHandler(handler)
|
||||
|
||||
a.a = C.uiNewScrollingArea(a.ah, C.intmax_t(width), C.intmax_t(height))
|
||||
a.a = C.uiNewScrollingArea(a.ah, C.int(width), C.int(height))
|
||||
a.c = (*C.uiControl)(unsafe.Pointer(a.a))
|
||||
|
||||
areas[a.a] = a
|
||||
|
@ -133,7 +133,7 @@ func (a *Area) SetSize(width int, height int) {
|
|||
if !a.scrolling {
|
||||
panic("attempt to call SetSize on non-scrolling Area")
|
||||
}
|
||||
C.uiAreaSetSize(a.a, C.intmax_t(width), C.intmax_t(height))
|
||||
C.uiAreaSetSize(a.a, C.int(width), C.int(height))
|
||||
}
|
||||
|
||||
// QueueRedrawAll queues the entire Area for redraw.
|
||||
|
|
|
@ -593,7 +593,7 @@ func (f *FontFamilies) NumFamilies() int {
|
|||
|
||||
// Family returns the name of the nth family in the list.
|
||||
func (f *FontFamilies) Family(n int) string {
|
||||
cname := C.uiDrawFontFamiliesFamily(f.ff, C.uintmax_t(n))
|
||||
cname := C.uiDrawFontFamiliesFamily(f.ff, C.int(n))
|
||||
name := C.GoString(cname)
|
||||
C.uiFreeText(cname)
|
||||
return name
|
||||
|
|
3
box.go
3
box.go
|
@ -67,8 +67,7 @@ func (b *Box) Append(child Control, stretchy bool) {
|
|||
// Delete deletes the nth control of the Box.
|
||||
func (b *Box) Delete(n int) {
|
||||
b.children = append(b.children[:n], b.children[n + 1:]...)
|
||||
// TODO why is this uintmax_t instead of intmax_t
|
||||
C.uiBoxDelete(b.b, C.uintmax_t(n))
|
||||
C.uiBoxDelete(b.b, C.int(n))
|
||||
}
|
||||
|
||||
// Padded returns whether there is space between each control
|
||||
|
|
|
@ -38,7 +38,7 @@ func (s *Slider) Value() int {
|
|||
|
||||
// SetValue sets the Slider's current value to value.
|
||||
func (s *Slider) SetValue(value int) {
|
||||
C.uiSliderSetValue(s.s, C.intmax_t(value))
|
||||
C.uiSliderSetValue(s.s, C.int(value))
|
||||
}
|
||||
|
||||
// OnChanged registers f to be run when the user changes the value
|
||||
|
|
|
@ -38,7 +38,7 @@ func (s *Spinbox) Value() int {
|
|||
|
||||
// SetValue sets the Spinbox's current value to value.
|
||||
func (s *Spinbox) SetValue(value int) {
|
||||
C.uiSpinboxSetValue(s.s, C.intmax_t(value))
|
||||
C.uiSpinboxSetValue(s.s, C.int(value))
|
||||
}
|
||||
|
||||
// OnChanged registers f to be run when the user changes the value
|
||||
|
|
6
tab.go
6
tab.go
|
@ -65,7 +65,7 @@ func (t *Tab) InsertAt(name string, n int, child Control) {
|
|||
// Delete deletes the nth page of the Tab.
|
||||
func (t *Tab) Delete(n int) {
|
||||
t.children = append(t.children[:n], t.children[n + 1:]...)
|
||||
C.uiTabDelete(t.t, C.uintmax_t(n))
|
||||
C.uiTabDelete(t.t, C.int(n))
|
||||
}
|
||||
|
||||
// NumPages returns the number of pages in the Tab.
|
||||
|
@ -76,12 +76,12 @@ func (t *Tab) NumPages() int {
|
|||
// Margined returns whether page n (starting at 0) of the Tab
|
||||
// has margins around its child.
|
||||
func (t *Tab) Margined(n int) bool {
|
||||
return tobool(C.uiTabMargined(t.t, C.uintmax_t(n)))
|
||||
return tobool(C.uiTabMargined(t.t, C.int(n)))
|
||||
}
|
||||
|
||||
// SetMargined controls whether page n (starting at 0) of the Tab
|
||||
// has margins around its child. The size of the margins are
|
||||
// determined by the OS and its best practices.
|
||||
func (t *Tab) SetMargined(n int, margined bool) {
|
||||
C.uiTabSetMargined(t.t, C.uintmax_t(n), frombool(margined))
|
||||
C.uiTabSetMargined(t.t, C.int(n), frombool(margined))
|
||||
}
|
||||
|
|
|
@ -26,7 +26,6 @@ func NewWindow(title string, width int, height int, hasMenubar bool) *Window {
|
|||
w := new(Window)
|
||||
|
||||
ctitle := C.CString(title)
|
||||
// TODO wait why did I make these ints and not intmax_ts?
|
||||
w.w = C.uiNewWindow(ctitle, C.int(width), C.int(height), frombool(hasMenubar))
|
||||
freestr(ctitle)
|
||||
|
||||
|
|
Loading…
Reference in New Issue