From 9945968ac5a1fabf2178acb28fe13bde9f1d5245 Mon Sep 17 00:00:00 2001 From: Victor Bombi Date: Wed, 7 Apr 2021 10:57:22 +0200 Subject: [PATCH 1/2] test: add igDebugCheckVersionAndDataLayout_Str --- test/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/test/main.c b/test/main.c index c97c470..28dd331 100644 --- a/test/main.c +++ b/test/main.c @@ -8,6 +8,7 @@ #define igCheckbox igCheckbox_Str #define igColorEdit3 igColorEdit3_Str #define igButton igButton_Str +#define igDebugCheckVersionAndDataLayout igDebugCheckVersionAndDataLayout_Str #endif int main(void) From 76d3b9f8b68adea6c2a260b4f137f8f5991c57e6 Mon Sep 17 00:00:00 2001 From: Victor Bombi Date: Wed, 7 Apr 2021 12:24:16 +0200 Subject: [PATCH 2/2] cpp2ffi: correct defaults for const char* version of ImStrv --- generator/cpp2ffi.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/generator/cpp2ffi.lua b/generator/cpp2ffi.lua index 1072d2c..5f56a18 100644 --- a/generator/cpp2ffi.lua +++ b/generator/cpp2ffi.lua @@ -812,6 +812,10 @@ local function ADDIMSTR_S(FP) --defaults table defT2.defaults = {} for k,v in pairs(defT.defaults) do + if v:match"ImStrv" then + v = v:gsub("ImStrv%(([^%)]-)%)","%1") + v = v == "" and "NULL" or v + end defT2.defaults[k] = v end defT2.args = defT2.args:gsub("ImStrv","const char*")