Merge pull request conformal#55 from twstrike/wrap-all-over

Use wrapObject all over
andre-hub · Dec 16, 2015 · 2a6d2e8 · 2a6d2e8
2 parents 7929189 + 74a9a47
commit 2a6d2e8
Show file tree

Hide file tree

Showing 11 changed files with 108 additions and 108 deletions.
diff --git a/gtk/accel.go b/gtk/accel.go
@@ -87,7 +87,7 @@ func (v *AccelGroup) native() *C.GtkAccelGroup {
 
 func marshalAccelGroup(p uintptr) (interface{}, error) {
 	c := C.g_value_get_object((*C.GValue)(unsafe.Pointer(p)))
-	obj := &glib.Object{glib.ToGObject(unsafe.Pointer(c))}
+	obj := wrapObject(unsafe.Pointer(c))
 	return wrapAccelGroup(obj), nil
 }
 
@@ -213,7 +213,7 @@ func (v *AccelMap) native() *C.GtkAccelMap {
 
 func marshalAccelMap(p uintptr) (interface{}, error) {
 	c := C.g_value_get_object((*C.GValue)(unsafe.Pointer(p)))
-	obj := &glib.Object{glib.ToGObject(unsafe.Pointer(c))}
+	obj := wrapObject(unsafe.Pointer(c))
 	return wrapAccelMap(obj), nil
 }