Jiga228/glfw
0
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2026-09-23 00:59:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Nuklear to 1.33.0

Browse Source
This commit is contained in:
Camilla Löwy
2017-02-23 17:49:39 +01:00
parent 3817b4e1c5
commit 106a617fa8
4 changed files with 311 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deps/nuklear_glfw_gl2.h
Vendored
+3 -5
View File
@@ -1,5 +1,5 @@
/*
* Nuklear - v1.17 - public domain
* Nuklear - v1.32.0 - public domain
* no warrenty implied; use at your own risk.
* authored from 2015-2016 by Micha Mettke
*/
@@ -15,8 +15,6 @@
#include <GLFW/glfw3.h>
#include <string.h>
enum nk_glfw_init_state{
NK_GLFW3_DEFAULT = 0,
NK_GLFW3_INSTALL_CALLBACKS
@@ -221,7 +219,7 @@ nk_glfw3_clipbard_copy(nk_handle usr, const char *text, int len)
if (!len) return;
str = (char*)malloc((size_t)len+1);
if (!str) return;
memcpy(str, text, (size_t)len);
NK_MEMCPY(str, text, (size_t)len);
str[len] = '\0';
glfwSetClipboardString(glfw.win, str);
free(str);
@@ -346,7 +344,7 @@ void nk_glfw3_shutdown(void)
nk_free(&glfw.ctx);
glDeleteTextures(1, &dev->font_tex);
nk_buffer_free(&dev->cmds);
memset(&glfw, 0, sizeof(glfw));
NK_MEMSET(&glfw, 0, sizeof(glfw));
}
#endif