diff --git a/cimgui.cpp b/cimgui.cpp index 2914ca6..b135470 100644 --- a/cimgui.cpp +++ b/cimgui.cpp @@ -4255,45 +4255,25 @@ CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,floa ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b); } -#ifndef IMGUI_USE_WCHAR32 -CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create() +CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create() { - return IM_NEW(ImVector) (); + return IM_NEW(ImVector) (); } -CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self) +CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self) { IM_DELETE(self); } -CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p) +CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p) { - IM_PLACEMENT_NEW(p) ImVector(); + IM_PLACEMENT_NEW(p) ImVector(); } -CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p) +CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p) { - p->~ImVector(); -} -#else -CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create() -{ - return IM_NEW(ImVector) (); + p->~ImVector(); } -CIMGUI_API void ImVector_ImWchar32_destroy(ImVector_ImWchar32* self) -{ - IM_DELETE(self); -} - -CIMGUI_API void ImVector_ImWchar32_Init(ImVector_ImWchar32* p) -{ - IM_PLACEMENT_NEW(p) ImVector(); -} -CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p) -{ - p->~ImVector(); -} -#endif #ifdef IMGUI_HAS_DOCK diff --git a/cimgui.h b/cimgui.h index 1f19117..b9b33ee 100644 --- a/cimgui.h +++ b/cimgui.h @@ -2806,17 +2806,12 @@ CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v); CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b); -#ifndef IMGUI_USE_WCHAR32 -CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create(); -CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self); -CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p); -CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p); -#else -CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create(); -CIMGUI_API void ImVector_ImWchar32_destroy(ImVector_ImWchar32* self); -CIMGUI_API void ImVector_ImWchar32_Init(ImVector_ImWchar32* p); -CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p); -#endif + +CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create(); +CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self); +CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p); +CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p); + #endif //CIMGUI_INCLUDED diff --git a/generator/cimgui_template.cpp b/generator/cimgui_template.cpp index 8a119c6..08af45c 100644 --- a/generator/cimgui_template.cpp +++ b/generator/cimgui_template.cpp @@ -40,45 +40,25 @@ CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,floa ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b); } -#ifndef IMGUI_USE_WCHAR32 -CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create() +CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create() { - return IM_NEW(ImVector) (); + return IM_NEW(ImVector) (); } -CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self) +CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self) { IM_DELETE(self); } -CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p) +CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p) { - IM_PLACEMENT_NEW(p) ImVector(); + IM_PLACEMENT_NEW(p) ImVector(); } -CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p) +CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p) { - p->~ImVector(); -} -#else -CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create() -{ - return IM_NEW(ImVector) (); + p->~ImVector(); } -CIMGUI_API void ImVector_ImWchar32_destroy(ImVector_ImWchar32* self) -{ - IM_DELETE(self); -} - -CIMGUI_API void ImVector_ImWchar32_Init(ImVector_ImWchar32* p) -{ - IM_PLACEMENT_NEW(p) ImVector(); -} -CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p) -{ - p->~ImVector(); -} -#endif #ifdef IMGUI_HAS_DOCK diff --git a/generator/cimgui_template.h b/generator/cimgui_template.h index 0161139..8b47f61 100644 --- a/generator/cimgui_template.h +++ b/generator/cimgui_template.h @@ -82,17 +82,12 @@ CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v); CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b); -#ifndef IMGUI_USE_WCHAR32 -CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create(); -CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self); -CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p); -CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p); -#else -CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create(); -CIMGUI_API void ImVector_ImWchar32_destroy(ImVector_ImWchar32* self); -CIMGUI_API void ImVector_ImWchar32_Init(ImVector_ImWchar32* p); -CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p); -#endif + +CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create(); +CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self); +CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p); +CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p); + #endif //CIMGUI_INCLUDED diff --git a/generator/output/cimgui.cpp b/generator/output/cimgui.cpp index 2914ca6..b135470 100644 --- a/generator/output/cimgui.cpp +++ b/generator/output/cimgui.cpp @@ -4255,45 +4255,25 @@ CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,floa ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b); } -#ifndef IMGUI_USE_WCHAR32 -CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create() +CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create() { - return IM_NEW(ImVector) (); + return IM_NEW(ImVector) (); } -CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self) +CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self) { IM_DELETE(self); } -CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p) +CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p) { - IM_PLACEMENT_NEW(p) ImVector(); + IM_PLACEMENT_NEW(p) ImVector(); } -CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p) +CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p) { - p->~ImVector(); -} -#else -CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create() -{ - return IM_NEW(ImVector) (); + p->~ImVector(); } -CIMGUI_API void ImVector_ImWchar32_destroy(ImVector_ImWchar32* self) -{ - IM_DELETE(self); -} - -CIMGUI_API void ImVector_ImWchar32_Init(ImVector_ImWchar32* p) -{ - IM_PLACEMENT_NEW(p) ImVector(); -} -CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p) -{ - p->~ImVector(); -} -#endif #ifdef IMGUI_HAS_DOCK diff --git a/generator/output/cimgui.h b/generator/output/cimgui.h index 1f19117..b9b33ee 100644 --- a/generator/output/cimgui.h +++ b/generator/output/cimgui.h @@ -2806,17 +2806,12 @@ CIMGUI_API float igGET_FLT_MAX(); CIMGUI_API void igColorConvertRGBtoHSV(float r,float g,float b,float *out_h,float *out_s,float *out_v); CIMGUI_API void igColorConvertHSVtoRGB(float h,float s,float v,float *out_r,float *out_g,float *out_b); -#ifndef IMGUI_USE_WCHAR32 -CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create(); -CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self); -CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p); -CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p); -#else -CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create(); -CIMGUI_API void ImVector_ImWchar32_destroy(ImVector_ImWchar32* self); -CIMGUI_API void ImVector_ImWchar32_Init(ImVector_ImWchar32* p); -CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p); -#endif + +CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create(); +CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self); +CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p); +CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p); + #endif //CIMGUI_INCLUDED