kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-10-09 11:21:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

thanks to typedef instead of define we work directly with ImWchar

Browse Source
This commit is contained in:
Victor Bombi
2020-03-25 12:47:40 +01:00
parent ab3699df27
commit 056c340d25
6 changed files with 39 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
cimgui.cpp
View File

@@ -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); ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
} }
#ifndef IMGUI_USE_WCHAR32 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create()
{ {
return IM_NEW(ImVector<ImWchar16>) (); return IM_NEW(ImVector<ImWchar>) ();
} }
CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self) CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
{ {
IM_DELETE(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<ImWchar16>(); IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
} }
CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p) CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p)
{ {
p->~ImVector<ImWchar16>(); p->~ImVector<ImWchar>();
}
#else
CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create()
{
return IM_NEW(ImVector<ImWchar32>) ();
} }
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<ImWchar32>();
}
CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p)
{
p->~ImVector<ImWchar32>();
}
#endif
#ifdef IMGUI_HAS_DOCK #ifdef IMGUI_HAS_DOCK

17
cimgui.h
View File

@@ -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 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); 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 ImVector_ImWchar* ImVector_ImWchar_create();
CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self); CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self);
CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p); CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p); CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* 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
#endif //CIMGUI_INCLUDED #endif //CIMGUI_INCLUDED

34
generator/cimgui_template.cpp
View File

@@ -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); ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
} }
#ifndef IMGUI_USE_WCHAR32 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create()
{ {
return IM_NEW(ImVector<ImWchar16>) (); return IM_NEW(ImVector<ImWchar>) ();
} }
CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self) CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
{ {
IM_DELETE(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<ImWchar16>(); IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
} }
CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p) CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p)
{ {
p->~ImVector<ImWchar16>(); p->~ImVector<ImWchar>();
}
#else
CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create()
{
return IM_NEW(ImVector<ImWchar32>) ();
} }
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<ImWchar32>();
}
CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p)
{
p->~ImVector<ImWchar32>();
}
#endif
#ifdef IMGUI_HAS_DOCK #ifdef IMGUI_HAS_DOCK

17
generator/cimgui_template.h
View File

@@ -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 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); 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 ImVector_ImWchar* ImVector_ImWchar_create();
CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self); CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self);
CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p); CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p); CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* 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
#endif //CIMGUI_INCLUDED #endif //CIMGUI_INCLUDED

34
generator/output/cimgui.cpp
View File

@@ -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); ImGui::ColorConvertHSVtoRGB(h,s,v,*out_r,*out_g,*out_b);
} }
#ifndef IMGUI_USE_WCHAR32 CIMGUI_API ImVector_ImWchar* ImVector_ImWchar_create()
CIMGUI_API ImVector_ImWchar16* ImVector_ImWchar16_create()
{ {
return IM_NEW(ImVector<ImWchar16>) (); return IM_NEW(ImVector<ImWchar>) ();
} }
CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self) CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self)
{ {
IM_DELETE(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<ImWchar16>(); IM_PLACEMENT_NEW(p) ImVector<ImWchar>();
} }
CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p) CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* p)
{ {
p->~ImVector<ImWchar16>(); p->~ImVector<ImWchar>();
}
#else
CIMGUI_API ImVector_ImWchar32* ImVector_ImWchar32_create()
{
return IM_NEW(ImVector<ImWchar32>) ();
} }
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<ImWchar32>();
}
CIMGUI_API void ImVector_ImWchar32_UnInit(ImVector_ImWchar32* p)
{
p->~ImVector<ImWchar32>();
}
#endif
#ifdef IMGUI_HAS_DOCK #ifdef IMGUI_HAS_DOCK

17
generator/output/cimgui.h
View File

@@ -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 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); 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 ImVector_ImWchar* ImVector_ImWchar_create();
CIMGUI_API void ImVector_ImWchar16_destroy(ImVector_ImWchar16* self); CIMGUI_API void ImVector_ImWchar_destroy(ImVector_ImWchar* self);
CIMGUI_API void ImVector_ImWchar16_Init(ImVector_ImWchar16* p); CIMGUI_API void ImVector_ImWchar_Init(ImVector_ImWchar* p);
CIMGUI_API void ImVector_ImWchar16_UnInit(ImVector_ImWchar16* p); CIMGUI_API void ImVector_ImWchar_UnInit(ImVector_ImWchar* 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
#endif //CIMGUI_INCLUDED #endif //CIMGUI_INCLUDED