interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed fromgchar()/togchar() to fromgstr()/togstr() in the GTK+ code; the new names are more precise (though they don't operate on GStrings; that's not an issue here though).

This commit is contained in:
Pietro Gagliardi 2014-04-26 22:55:43 -04:00
parent 77297672dd
commit 6978961661
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gtkcalls_unix.go
View File

@ -43,11 +43,11 @@ func gtk_widget_hide(widget *C.GtkWidget) {
func gtk_window_set_title(window *C.GtkWidget, title string) { func gtk_window_set_title(window *C.GtkWidget, title string) {
ctitle := C.CString(title) ctitle := C.CString(title)
defer C.free(unsafe.Pointer(ctitle)) defer C.free(unsafe.Pointer(ctitle))
C.gtk_window_set_title(togtkwindow(window), togchar(ctitle)) C.gtk_window_set_title(togtkwindow(window), togstr(ctitle))
} }
func gtk_window_get_title(window *C.GtkWidget) string { func gtk_window_get_title(window *C.GtkWidget) string {
return fromgchar(C.gtk_window_get_title(togtkwindow(window))) return fromgstr(C.gtk_window_get_title(togtkwindow(window)))
} }
func gtk_window_resize(window *C.GtkWidget, width int, height int) { func gtk_window_resize(window *C.GtkWidget, width int, height int) {
@ -77,7 +77,7 @@ func makeTransparent(layout *C.GtkWidget) {
added := C.gtk_css_provider_load_from_data(provider, added := C.gtk_css_provider_load_from_data(provider,
(*C.gchar)(unsafe.Pointer(&gtkLayoutCSS[0])), C.gssize(len(gtkLayoutCSS)), &err) (*C.gchar)(unsafe.Pointer(&gtkLayoutCSS[0])), C.gssize(len(gtkLayoutCSS)), &err)
if added == C.FALSE { if added == C.FALSE {
message := fromgchar(err.message) message := fromgstr(err.message)
panic(fmt.Errorf("error loading transparent background CSS for GtkLayout: %s", message)) panic(fmt.Errorf("error loading transparent background CSS for GtkLayout: %s", message))
} }
C.gtk_style_context_add_provider(C.gtk_widget_get_style_context(layout), C.gtk_style_context_add_provider(C.gtk_widget_get_style_context(layout),
@ -124,11 +124,11 @@ func gtk_button_new() *C.GtkWidget {
func gtk_button_set_label(button *C.GtkWidget, label string) { func gtk_button_set_label(button *C.GtkWidget, label string) {
clabel := C.CString(label) clabel := C.CString(label)
defer C.free(unsafe.Pointer(clabel)) defer C.free(unsafe.Pointer(clabel))
C.gtk_button_set_label(togtkbutton(button), togchar(clabel)) C.gtk_button_set_label(togtkbutton(button), togstr(clabel))
} }
func gtk_button_get_label(button *C.GtkWidget) string { func gtk_button_get_label(button *C.GtkWidget) string {
return fromgchar(C.gtk_button_get_label(togtkbutton(button))) return fromgstr(C.gtk_button_get_label(togtkbutton(button)))
} }
func gtk_check_button_new() *C.GtkWidget { func gtk_check_button_new() *C.GtkWidget {
@ -148,19 +148,19 @@ func gtk_combo_box_text_new_with_entry() *C.GtkWidget {
} }
func gtk_combo_box_text_get_active_text(widget *C.GtkWidget) string { func gtk_combo_box_text_get_active_text(widget *C.GtkWidget) string {
return fromgchar(C.gtk_combo_box_text_get_active_text(togtkcombobox(widget))) return fromgstr(C.gtk_combo_box_text_get_active_text(togtkcombobox(widget)))
} }
func gtk_combo_box_text_append_text(widget *C.GtkWidget, text string) { func gtk_combo_box_text_append_text(widget *C.GtkWidget, text string) {
ctext := C.CString(text) ctext := C.CString(text)
defer C.free(unsafe.Pointer(ctext)) defer C.free(unsafe.Pointer(ctext))
C.gtk_combo_box_text_append_text(togtkcombobox(widget), togchar(ctext)) C.gtk_combo_box_text_append_text(togtkcombobox(widget), togstr(ctext))
} }
func gtk_combo_box_text_insert_text(widget *C.GtkWidget, index int, text string) { func gtk_combo_box_text_insert_text(widget *C.GtkWidget, index int, text string) {
ctext := C.CString(text) ctext := C.CString(text)
defer C.free(unsafe.Pointer(ctext)) defer C.free(unsafe.Pointer(ctext))
C.gtk_combo_box_text_insert_text(togtkcombobox(widget), C.gint(index), togchar(ctext)) C.gtk_combo_box_text_insert_text(togtkcombobox(widget), C.gint(index), togstr(ctext))
} }
func gtk_combo_box_get_active(widget *C.GtkWidget) int { func gtk_combo_box_get_active(widget *C.GtkWidget) int {
@ -192,11 +192,11 @@ func gtkPasswordEntryNew() *C.GtkWidget {
func gtk_entry_set_text(widget *C.GtkWidget, text string) { func gtk_entry_set_text(widget *C.GtkWidget, text string) {
ctext := C.CString(text) ctext := C.CString(text)
defer C.free(unsafe.Pointer(ctext)) defer C.free(unsafe.Pointer(ctext))
C.gtk_entry_set_text(togtkentry(widget), togchar(ctext)) C.gtk_entry_set_text(togtkentry(widget), togstr(ctext))
} }
func gtk_entry_get_text(widget *C.GtkWidget) string { func gtk_entry_get_text(widget *C.GtkWidget) string {
return fromgchar(C.gtk_entry_get_text(togtkentry(widget))) return fromgstr(C.gtk_entry_get_text(togtkentry(widget)))
} }
var _emptystring = [1]C.gchar{0} var _emptystring = [1]C.gchar{0}
@ -214,11 +214,11 @@ func gtk_label_new() *C.GtkWidget {
func gtk_label_set_text(widget *C.GtkWidget, text string) { func gtk_label_set_text(widget *C.GtkWidget, text string) {
ctext := C.CString(text) ctext := C.CString(text)
defer C.free(unsafe.Pointer(ctext)) defer C.free(unsafe.Pointer(ctext))
C.gtk_label_set_text(togtklabel(widget), togchar(ctext)) C.gtk_label_set_text(togtklabel(widget), togstr(ctext))
} }
func gtk_label_get_text(widget *C.GtkWidget) string { func gtk_label_get_text(widget *C.GtkWidget) string {
return fromgchar(C.gtk_label_get_text(togtklabel(widget))) return fromgstr(C.gtk_label_get_text(togtklabel(widget)))
} }
func gtk_widget_get_preferred_size(widget *C.GtkWidget) (minWidth int, minHeight int, natWidth int, natHeight int) { func gtk_widget_get_preferred_size(widget *C.GtkWidget) (minWidth int, minHeight int, natWidth int, natHeight int) {

4
gtkcasts_unix.go
View File

@ -28,12 +28,12 @@ func togbool(b bool) C.gboolean {
return C.FALSE return C.FALSE
} }
func fromgchar(what *C.gchar) string { func fromgstr(what *C.gchar) string {
cstr := (*C.char)(unsafe.Pointer(what)) cstr := (*C.char)(unsafe.Pointer(what))
return C.GoString(cstr) return C.GoString(cstr)
} }
func togchar(what *C.char) *C.gchar { func togstr(what *C.char) *C.gchar {
return (*C.gchar)(unsafe.Pointer(what)) return (*C.gchar)(unsafe.Pointer(what))
} }

4
listbox_unix.go
View File

@ -113,7 +113,7 @@ func gListboxText(widget *C.GtkWidget) string {
return "" return ""
} }
C.gtkTreeModelGet(model, &iter, &gs) C.gtkTreeModelGet(model, &iter, &gs)
return fromgchar(gs) return fromgstr(gs)
} }
func gListboxAppend(widget *C.GtkWidget, what string) { func gListboxAppend(widget *C.GtkWidget, what string) {
@ -181,7 +181,7 @@ func gListboxSelMultiTexts(widget *C.GtkWidget) (texts []string) {
return return
} }
C.gtkTreeModelGet(model, &iter, &gs) C.gtkTreeModelGet(model, &iter, &gs)
texts[i] = fromgchar(gs) texts[i] = fromgstr(gs)
rows = rows.next rows = rows.next
} }
return texts return texts