From 96380132036f14b65b5f4f98ee5274d57c26167f Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sun, 31 Jan 2021 13:57:06 +0100 Subject: [PATCH] gg: fix macos C function definitions --- CHANGELOG.md | 6 ++++-- vlib/clipboard/clipboard_darwin.c.v | 2 +- vlib/gg/gg_darwin.c.v | 8 ++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 508c04a48b..fcc1ae7eaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,8 +22,10 @@ - Advanced vdoc search on mobile layout. - string's `left()`/`right` were removed in favor of slicing syntax: `str[..pos]`. - gg: native graphics mode on macOS/iOS (using Cocoa Drawing API). -- Full path to consts must be specified everywhere. This allows shadowing consts safely and -makes it easy to distinguish them from local variables. +- Full path to consts must be specified everywhere. This makes it easy to distinguish them +from local variables. +- `__offsetof` for low level needs (works like `offsetof` in C). +- vfmt now preserves empty lines, like gofmt. ## V 0.2.1 *30 Dec 2020* diff --git a/vlib/clipboard/clipboard_darwin.c.v b/vlib/clipboard/clipboard_darwin.c.v index dc98a0b587..168c2378ae 100644 --- a/vlib/clipboard/clipboard_darwin.c.v +++ b/vlib/clipboard/clipboard_darwin.c.v @@ -15,7 +15,7 @@ fn C.darwin_new_pasteboard() voidptr fn C.darwin_get_pasteboard_text(voidptr) byteptr -fn C.darwin_set_pasteboard_text(string) bool +fn C.darwin_set_pasteboard_text(voidptr, string) bool fn new_clipboard() &Clipboard { cb := &Clipboard{ diff --git a/vlib/gg/gg_darwin.c.v b/vlib/gg/gg_darwin.c.v index 9bcdcb9229..fe99b5d71d 100644 --- a/vlib/gg/gg_darwin.c.v +++ b/vlib/gg/gg_darwin.c.v @@ -3,18 +3,18 @@ module gg #include "@VROOT/vlib/gg/gg_darwin.m" fn C.gg_get_screen_size() Size -fn C.darwin_draw_string(x int, y int, s string) +fn C.darwin_draw_string(x int, y int, s string, cfg voidptr) fn C.darwin_text_width(s string) int fn C.darwin_window_refresh() -fn C.darwin_draw_rect(f32, f32, f32, f32) +fn C.darwin_draw_rect(f32, f32, f32, f32, voidptr) -fn C.darwin_create_image() Image +fn C.darwin_create_image(path string) Image fn C.darwin_draw_image(f32, f32, f32, f32, &Image) -fn C.darwin_draw_circle(f32, f32, f32) +fn C.darwin_draw_circle(f32, f32, f32, voidptr) //, gx.Color c)