|
@@ -233,12 +233,12 @@ typedef unsigned short nk_ushort;
|
|
|
typedef NK_UINT16 nk_ushort;
|
|
typedef NK_UINT16 nk_ushort;
|
|
|
#endif
|
|
#endif
|
|
|
#ifndef NK_INT32
|
|
#ifndef NK_INT32
|
|
|
-typedef short nk_int;
|
|
|
|
|
|
|
+typedef int nk_int;
|
|
|
#else
|
|
#else
|
|
|
typedef NK_INT32 nk_int;
|
|
typedef NK_INT32 nk_int;
|
|
|
#endif
|
|
#endif
|
|
|
#ifndef NK_UINT32
|
|
#ifndef NK_UINT32
|
|
|
-typedef unsigned short nk_uint;
|
|
|
|
|
|
|
+typedef unsigned int nk_uint;
|
|
|
#else
|
|
#else
|
|
|
typedef NK_UINT32 nk_uint;
|
|
typedef NK_UINT32 nk_uint;
|
|
|
#endif
|
|
#endif
|
|
@@ -14419,6 +14419,7 @@ nk_clear(struct nk_context *ctx)
|
|
|
|
|
|
|
|
ctx->build = 0;
|
|
ctx->build = 0;
|
|
|
ctx->memory.calls = 0;
|
|
ctx->memory.calls = 0;
|
|
|
|
|
+ ctx->last_widget_state = 0;
|
|
|
#ifdef NK_INCLUDE_VERTEX_BUFFER_OUTPUT
|
|
#ifdef NK_INCLUDE_VERTEX_BUFFER_OUTPUT
|
|
|
nk_draw_list_clear(&ctx->draw_list);
|
|
nk_draw_list_clear(&ctx->draw_list);
|
|
|
#endif
|
|
#endif
|
vurtun