From 0eb2d6d6eddf03d59de3daeb8512b1d012f9e6a3 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 27 Feb 2019 21:40:49 +0000 Subject: [PATCH 1/2] Remove additional definitions of UNUSED/MIN/MAX/LEN --- demo/allegro5/main.c | 5 ----- demo/sdl_opengles2/main.c | 5 ----- demo/x11_rawfb/main.c | 5 ----- demo/x11_rawfb/nuklear_rawfb.h | 25 +++++++++---------------- example/canvas.c | 7 +------ example/extended.c | 9 ++------- example/file_browser.c | 7 +------ example/skinning.c | 9 ++------- 8 files changed, 15 insertions(+), 57 deletions(-) diff --git a/demo/allegro5/main.c b/demo/allegro5/main.c index 624e7c98..ff869071 100644 --- a/demo/allegro5/main.c +++ b/demo/allegro5/main.c @@ -25,11 +25,6 @@ #include "nuklear_allegro5.h" -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - /* =============================================================== * * EXAMPLE diff --git a/demo/sdl_opengles2/main.c b/demo/sdl_opengles2/main.c index 16a271ad..1b74d8e2 100644 --- a/demo/sdl_opengles2/main.c +++ b/demo/sdl_opengles2/main.c @@ -28,11 +28,6 @@ #define MAX_VERTEX_MEMORY 512 * 1024 #define MAX_ELEMENT_MEMORY 128 * 1024 -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - /* =============================================================== * * EXAMPLE diff --git a/demo/x11_rawfb/main.c b/demo/x11_rawfb/main.c index c70b0246..589cc7a6 100644 --- a/demo/x11_rawfb/main.c +++ b/demo/x11_rawfb/main.c @@ -55,11 +55,6 @@ #define WINDOW_WIDTH 800 #define WINDOW_HEIGHT 600 -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - typedef struct XWindow XWindow; struct XWindow { Display *dpy; diff --git a/demo/x11_rawfb/nuklear_rawfb.h b/demo/x11_rawfb/nuklear_rawfb.h index e5187808..891168a8 100644 --- a/demo/x11_rawfb/nuklear_rawfb.h +++ b/demo/x11_rawfb/nuklear_rawfb.h @@ -62,13 +62,6 @@ struct rawfb_context { struct nk_font_atlas atlas; }; -#ifndef MIN -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef MAX -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#endif - static unsigned int nk_color_from_byte(const nk_byte *c) { @@ -190,10 +183,10 @@ nk_rawfb_scissor(struct rawfb_context *rawfb, const float w, const float h) { - rawfb->scissors.x = MIN(MAX(x, 0), rawfb->fb.w); - rawfb->scissors.y = MIN(MAX(y, 0), rawfb->fb.h); - rawfb->scissors.w = MIN(MAX(w + x, 0), rawfb->fb.w); - rawfb->scissors.h = MIN(MAX(h + y, 0), rawfb->fb.h); + rawfb->scissors.x = NK_CLAMP(0, x, rawfb->fb.w); + rawfb->scissors.y = NK_CLAMP(0, y, rawfb->fb.h); + rawfb->scissors.w = NK_CLAMP(0, w + x, rawfb->fb.w); + rawfb->scissors.h = NK_CLAMP(0, h + y, rawfb->fb.h); } static void @@ -218,10 +211,10 @@ nk_rawfb_stroke_line(const struct rawfb_context *rawfb, x1 = x0; x0 = tmp; } - x1 = MIN(rawfb->scissors.w - 1, x1); - x0 = MIN(rawfb->scissors.w - 1, x0); - x1 = MAX(rawfb->scissors.x, x1); - x0 = MAX(rawfb->scissors.x, x0); + x1 = NK_MIN(rawfb->scissors.w - 1, x1); + x0 = NK_MIN(rawfb->scissors.w - 1, x0); + x1 = NK_MAX(rawfb->scissors.x, x1); + x0 = NK_MAX(rawfb->scissors.x, x0); nk_rawfb_line_horizontal(rawfb, x0, y0, x1, col); return; } @@ -670,7 +663,7 @@ nk_rawfb_stroke_curve(const struct rawfb_context *rawfb, float t_step; struct nk_vec2i last = p1; - segments = MAX(num_segments, 1); + segments = NK_MAX(num_segments, 1); t_step = 1.0f/(float)segments; for (i_step = 1; i_step <= segments; ++i_step) { float t = t_step * (float)i_step; diff --git a/example/canvas.c b/example/canvas.c index 2afc587d..83988ccd 100644 --- a/example/canvas.c +++ b/example/canvas.c @@ -33,11 +33,6 @@ #define MAX_VERTEX_MEMORY 512 * 1024 #define MAX_ELEMENT_MEMORY 128 * 1024 -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - #define NK_SHADER_VERSION "#version 150\n" /* =============================================================== @@ -307,7 +302,7 @@ static void error_callback(int e, const char *d){printf("Error %d: %s\n", e, d); static void text_input(GLFWwindow *win, unsigned int codepoint) {nk_input_unicode((struct nk_context*)glfwGetWindowUserPointer(win), codepoint);} static void scroll_input(GLFWwindow *win, double _, double yoff) -{UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} +{NK_UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} static void pump_input(struct nk_context *ctx, GLFWwindow *win) diff --git a/example/extended.c b/example/extended.c index 003adf33..96c2eb43 100644 --- a/example/extended.c +++ b/example/extended.c @@ -32,11 +32,6 @@ #define MAX_VERTEX_MEMORY 512 * 1024 #define MAX_ELEMENT_MEMORY 128 * 1024 -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - #ifdef __APPLE__ #define NK_SHADER_VERSION "#version 150\n" #else @@ -111,7 +106,7 @@ ui_piemenu(struct nk_context *ctx, struct nk_vec2 pos, float radius, nk_fill_circle(out, bounds, nk_rgb(50,50,50)); { /* circle buttons */ - float step = (2 * 3.141592654f) / (float)(MAX(1,item_count)); + float step = (2 * 3.141592654f) / (float)(NK_MAX(1,item_count)); float a_min = 0; float a_max = step; struct nk_vec2 center = nk_vec2(bounds.x + bounds.w / 2.0f, bounds.y + bounds.h / 2.0f); @@ -734,7 +729,7 @@ static void error_callback(int e, const char *d){printf("Error %d: %s\n", e, d); static void text_input(GLFWwindow *win, unsigned int codepoint) {nk_input_unicode((struct nk_context*)glfwGetWindowUserPointer(win), codepoint);} static void scroll_input(GLFWwindow *win, double _, double yoff) -{UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} +{NK_UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} int main(int argc, char *argv[]) { diff --git a/example/file_browser.c b/example/file_browser.c index 1945ff55..ebe03a57 100644 --- a/example/file_browser.c +++ b/example/file_browser.c @@ -34,11 +34,6 @@ #define MAX_VERTEX_MEMORY 512 * 1024 #define MAX_ELEMENT_MEMORY 128 * 1024 -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - #ifdef __APPLE__ #define NK_SHADER_VERSION "#version 150\n" #else @@ -765,7 +760,7 @@ static void error_callback(int e, const char *d){printf("Error %d: %s\n", e, d); static void text_input(GLFWwindow *win, unsigned int codepoint) {nk_input_unicode((struct nk_context*)glfwGetWindowUserPointer(win), codepoint);} static void scroll_input(GLFWwindow *win, double _, double yoff) -{UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} +{NK_UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} int main(int argc, char *argv[]) { diff --git a/example/skinning.c b/example/skinning.c index 4020aecd..87b81174 100644 --- a/example/skinning.c +++ b/example/skinning.c @@ -32,11 +32,6 @@ #define MAX_VERTEX_MEMORY 512 * 1024 #define MAX_ELEMENT_MEMORY 128 * 1024 -#define UNUSED(a) (void)a -#define MIN(a,b) ((a) < (b) ? (a) : (b)) -#define MAX(a,b) ((a) < (b) ? (b) : (a)) -#define LEN(a) (sizeof(a)/sizeof(a)[0]) - #ifdef __APPLE__ #define NK_SHADER_VERSION "#version 150\n" #else @@ -334,7 +329,7 @@ static void error_callback(int e, const char *d){printf("Error %d: %s\n", e, d); static void text_input(GLFWwindow *win, unsigned int codepoint) {nk_input_unicode((struct nk_context*)glfwGetWindowUserPointer(win), codepoint);} static void scroll_input(GLFWwindow *win, double _, double yoff) -{UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} +{NK_UNUSED(_);nk_input_scroll((struct nk_context*)glfwGetWindowUserPointer(win), nk_vec2(0, (float)yoff));} int main(int argc, char *argv[]) { @@ -768,7 +763,7 @@ int main(int argc, char *argv[]) nk_layout_row_dynamic(&ctx, 25, 1); nk_edit_string(&ctx, NK_EDIT_FIELD, field_buffer, &field_len, 64, nk_filter_default); nk_property_float(&ctx, "#X:", -1024.0f, &pos, 1024.0f, 1, 1); - current_weapon = nk_combo(&ctx, weapons, LEN(weapons), current_weapon, 25, nk_vec2(nk_widget_width(&ctx),200)); + current_weapon = nk_combo(&ctx, weapons, NK_LEN(weapons), current_weapon, 25, nk_vec2(nk_widget_width(&ctx),200)); nk_layout_row_dynamic(&ctx, 100, 1); if (nk_chart_begin_colored(&ctx, NK_CHART_LINES, nk_rgb(255,0,0), nk_rgb(150,0,0), 32, 0.0f, 1.0f)) { From 987dac31e50e95cecff8206e13db8567721fc934 Mon Sep 17 00:00:00 2001 From: Cameron Cawley Date: Wed, 27 Feb 2019 22:02:25 +0000 Subject: [PATCH 2/2] Make additional use of the NK_UNUSED macro --- demo/allegro5/nuklear_allegro5.h | 4 ++-- demo/d3d11/nuklear_d3d11.h | 4 ++-- demo/d3d9/nuklear_d3d9.h | 4 ++-- demo/gdi/nuklear_gdi.h | 2 +- demo/gdip/nuklear_gdip.h | 6 +++--- demo/glfw_opengl2/nuklear_glfw_gl2.h | 9 +++++---- demo/glfw_opengl3/nuklear_glfw_gl3.h | 9 +++++---- demo/glfw_opengl4/nuklear_glfw_gl4.h | 9 +++++---- demo/sdl_opengl2/nuklear_sdl_gl2.h | 4 ++-- demo/sdl_opengl3/nuklear_sdl_gl3.h | 4 ++-- demo/sdl_opengles2/nuklear_sdl_gles2.h | 4 ++-- demo/sfml_opengl2/nuklear_sfml_gl2.h | 5 +++-- demo/sfml_opengl3/nuklear_sfml_gl3.h | 4 ++-- nuklear.h | 6 +++--- src/nuklear_popup.c | 4 ++-- 15 files changed, 41 insertions(+), 37 deletions(-) diff --git a/demo/allegro5/nuklear_allegro5.h b/demo/allegro5/nuklear_allegro5.h index f3966005..e2648218 100644 --- a/demo/allegro5/nuklear_allegro5.h +++ b/demo/allegro5/nuklear_allegro5.h @@ -403,7 +403,7 @@ nk_allegro5_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { char *text = al_get_clipboard_text(allegro5.dsp); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); al_free(text); } @@ -411,7 +411,7 @@ NK_INTERN void nk_allegro5_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/d3d11/nuklear_d3d11.h b/demo/d3d11/nuklear_d3d11.h index f82f75ad..b78afbe3 100644 --- a/demo/d3d11/nuklear_d3d11.h +++ b/demo/d3d11/nuklear_d3d11.h @@ -360,7 +360,7 @@ nk_d3d11_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) static void nk_d3d11_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { - (void)usr; + NK_UNUSED(usr); if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) { HGLOBAL mem = GetClipboardData(CF_UNICODETEXT); @@ -394,7 +394,7 @@ nk_d3d11_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) static void nk_d3d11_clipboard_copy(nk_handle usr, const char *text, int len) { - (void)usr; + NK_UNUSED(usr); if (OpenClipboard(NULL)) { int wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0); diff --git a/demo/d3d9/nuklear_d3d9.h b/demo/d3d9/nuklear_d3d9.h index fd8d1760..065c2d8e 100644 --- a/demo/d3d9/nuklear_d3d9.h +++ b/demo/d3d9/nuklear_d3d9.h @@ -425,7 +425,7 @@ nk_d3d9_handle_event(HWND wnd, UINT msg, WPARAM wparam, LPARAM lparam) static void nk_d3d9_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { - (void)usr; + NK_UNUSED(usr); if (!IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) { return; } @@ -465,7 +465,7 @@ nk_d3d9_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) static void nk_d3d9_clipboard_copy(nk_handle usr, const char *text, int len) { - (void)usr; + NK_UNUSED(usr); if (!OpenClipboard(NULL)) { return; } diff --git a/demo/gdi/nuklear_gdi.h b/demo/gdi/nuklear_gdi.h index 940249f2..781477aa 100644 --- a/demo/gdi/nuklear_gdi.h +++ b/demo/gdi/nuklear_gdi.h @@ -520,7 +520,7 @@ nk_gdifont_del(GdiFont *font) static void nk_gdi_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { - (void)usr; + NK_UNUSED(usr); if (IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) { HGLOBAL mem = GetClipboardData(CF_UNICODETEXT); diff --git a/demo/gdip/nuklear_gdip.h b/demo/gdip/nuklear_gdip.h index 3a0a2f04..5871e9c5 100644 --- a/demo/gdip/nuklear_gdip.h +++ b/demo/gdip/nuklear_gdip.h @@ -722,7 +722,7 @@ nk_gdipfont_get_text_width(nk_handle handle, float height, const char *text, int if (!font || !text) return 0; - (void)height; + NK_UNUSED(height); wsize = MultiByteToWideChar(CP_UTF8, 0, text, len, NULL, 0); wstr = (WCHAR*)_alloca(wsize * sizeof(wchar_t)); MultiByteToWideChar(CP_UTF8, 0, text, len, wstr, wsize); @@ -747,7 +747,7 @@ nk_gdip_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) LPCWSTR wstr; int utf8size; char* utf8; - (void)usr; + NK_UNUSED(usr); if (!IsClipboardFormatAvailable(CF_UNICODETEXT) && OpenClipboard(NULL)) return; @@ -797,7 +797,7 @@ nk_gdip_clipboard_copy(nk_handle usr, const char *text, int len) HGLOBAL mem; wchar_t* wstr; int wsize; - (void)usr; + NK_UNUSED(usr); if (!OpenClipboard(NULL)) return; diff --git a/demo/glfw_opengl2/nuklear_glfw_gl2.h b/demo/glfw_opengl2/nuklear_glfw_gl2.h index de0d8461..66342c95 100644 --- a/demo/glfw_opengl2/nuklear_glfw_gl2.h +++ b/demo/glfw_opengl2/nuklear_glfw_gl2.h @@ -200,7 +200,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA) NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) { - (void)win; + NK_UNUSED(win); if (glfw.text_len < NK_GLFW_TEXT_MAX) glfw.text[glfw.text_len++] = codepoint; } @@ -208,7 +208,8 @@ nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) NK_API void nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff) { - (void)win; (void)xoff; + NK_UNUSED(win); + NK_UNUSED(xoff); glfw.scroll.x += (float)xoff; glfw.scroll.y += (float)yoff; } @@ -234,14 +235,14 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { const char *text = glfwGetClipboardString(glfw.win); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); } NK_INTERN void nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/glfw_opengl3/nuklear_glfw_gl3.h b/demo/glfw_opengl3/nuklear_glfw_gl3.h index c8c69160..17c215a3 100644 --- a/demo/glfw_opengl3/nuklear_glfw_gl3.h +++ b/demo/glfw_opengl3/nuklear_glfw_gl3.h @@ -309,7 +309,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA, int max_vertex_buffer, int max_element NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) { - (void)win; + NK_UNUSED(win); if (glfw.text_len < NK_GLFW_TEXT_MAX) glfw.text[glfw.text_len++] = codepoint; } @@ -317,7 +317,8 @@ nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) NK_API void nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff) { - (void)win; (void)xoff; + NK_UNUSED(win); + NK_UNUSED(xoff); glfw.scroll.x += (float)xoff; glfw.scroll.y += (float)yoff; } @@ -343,14 +344,14 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { const char *text = glfwGetClipboardString(glfw.win); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); } NK_INTERN void nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/glfw_opengl4/nuklear_glfw_gl4.h b/demo/glfw_opengl4/nuklear_glfw_gl4.h index 34b61ac4..f7234301 100644 --- a/demo/glfw_opengl4/nuklear_glfw_gl4.h +++ b/demo/glfw_opengl4/nuklear_glfw_gl4.h @@ -459,7 +459,7 @@ nk_glfw3_render(enum nk_anti_aliasing AA) NK_API void nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) { - (void)win; + NK_UNUSED(win); if (glfw.text_len < NK_GLFW_TEXT_MAX) glfw.text[glfw.text_len++] = codepoint; } @@ -467,7 +467,8 @@ nk_glfw3_char_callback(GLFWwindow *win, unsigned int codepoint) NK_API void nk_gflw3_scroll_callback(GLFWwindow *win, double xoff, double yoff) { - (void)win; (void)xoff; + NK_UNUSED(win); + NK_UNUSED(xoff); glfw.scroll.x += (float)xoff; glfw.scroll.y += (float)yoff; } @@ -493,14 +494,14 @@ nk_glfw3_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { const char *text = glfwGetClipboardString(glfw.win); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); } NK_INTERN void nk_glfw3_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/sdl_opengl2/nuklear_sdl_gl2.h b/demo/sdl_opengl2/nuklear_sdl_gl2.h index f46c9527..92a3ac63 100644 --- a/demo/sdl_opengl2/nuklear_sdl_gl2.h +++ b/demo/sdl_opengl2/nuklear_sdl_gl2.h @@ -182,14 +182,14 @@ nk_sdl_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { const char *text = SDL_GetClipboardText(); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); } static void nk_sdl_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/sdl_opengl3/nuklear_sdl_gl3.h b/demo/sdl_opengl3/nuklear_sdl_gl3.h index cac9ea7f..002c784b 100644 --- a/demo/sdl_opengl3/nuklear_sdl_gl3.h +++ b/demo/sdl_opengl3/nuklear_sdl_gl3.h @@ -290,14 +290,14 @@ nk_sdl_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { const char *text = SDL_GetClipboardText(); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); } static void nk_sdl_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/sdl_opengles2/nuklear_sdl_gles2.h b/demo/sdl_opengles2/nuklear_sdl_gles2.h index 6e3018ed..4aa8fdf0 100644 --- a/demo/sdl_opengles2/nuklear_sdl_gles2.h +++ b/demo/sdl_opengles2/nuklear_sdl_gles2.h @@ -291,14 +291,14 @@ nk_sdl_clipboard_paste(nk_handle usr, struct nk_text_edit *edit) { const char *text = SDL_GetClipboardText(); if (text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + NK_UNUSED(usr); } static void nk_sdl_clipboard_copy(nk_handle usr, const char *text, int len) { char *str = 0; - (void)usr; + NK_UNUSED(usr); if (!len) return; str = (char*)malloc((size_t)len+1); if (!str) return; diff --git a/demo/sfml_opengl2/nuklear_sfml_gl2.h b/demo/sfml_opengl2/nuklear_sfml_gl2.h index 9649ec06..93e4218b 100644 --- a/demo/sfml_opengl2/nuklear_sfml_gl2.h +++ b/demo/sfml_opengl2/nuklear_sfml_gl2.h @@ -187,7 +187,8 @@ nk_sfml_clipboard_paste(nk_handle usr, struct nk_text_edit* edit) if(text) nk_textedit_paste(edit, text, nk_strlen(text)); - (void)usr; + + NK_UNUSED(usr); #endif } @@ -196,7 +197,7 @@ nk_sfml_clipboard_copy(nk_handle usr, const char* text, int len) { #if 0 char* str = 0; - (void)usr; + NK_UNUSED(usr); if(!len) return; str = (char*)malloc((size_t)len+1); if(!str) return; diff --git a/demo/sfml_opengl3/nuklear_sfml_gl3.h b/demo/sfml_opengl3/nuklear_sfml_gl3.h index 40b390e4..9c258044 100644 --- a/demo/sfml_opengl3/nuklear_sfml_gl3.h +++ b/demo/sfml_opengl3/nuklear_sfml_gl3.h @@ -293,7 +293,7 @@ nk_sfml_clipboard_paste(nk_handle usr, struct nk_text_edit* edit) { #if 0 /* Not Implemented in SFML */ - (void)usr; + NK_UNUSED(usr); sf::Clipboard clipboard(sfml.window); const char* text = clipboard.getText(); if(text) nk_textedit_paste(edit, text, nk_strlen(text)); @@ -304,7 +304,7 @@ nk_sfml_clipboard_copy(nk_handle usr, const char* text, int len) { #if 0 char* str = 0; - (void)usr; + NK_UNUSED(usr); if(!len) return; str = (char*)malloc((size_t)len+1); if(!str) return; diff --git a/nuklear.h b/nuklear.h index 5b2ef614..cf576f30 100644 --- a/nuklear.h +++ b/nuklear.h @@ -1514,7 +1514,7 @@ NK_API void nk_end(struct nk_context *ctx); /// Finds and returns a window from passed name /// /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~c -/// void nk_end(struct nk_context *ctx); +/// struct nk_window *nk_window_find(struct nk_context *ctx, const char *name); /// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /// /// Parameter | Description @@ -16726,7 +16726,7 @@ nk_popup_begin(struct nk_context *ctx, enum nk_popup_type type, win = ctx->current; panel = win->layout; NK_ASSERT(!(panel->type & NK_PANEL_SET_POPUP) && "popups are not allowed to have popups"); - (void)panel; + NK_UNUSED(panel); title_len = (int)nk_strlen(title); title_hash = nk_murmur_hash(title, (int)title_len, NK_PANEL_POPUP); @@ -16820,7 +16820,7 @@ nk_nonblock_begin(struct nk_context *ctx, win = ctx->current; panel = win->layout; NK_ASSERT(!(panel->type & NK_PANEL_SET_POPUP)); - (void)panel; + NK_UNUSED(panel); popup = win->popup.win; if (!popup) { /* create window for nonblocking popup */ diff --git a/src/nuklear_popup.c b/src/nuklear_popup.c index 203bd7f6..7682c4d0 100644 --- a/src/nuklear_popup.c +++ b/src/nuklear_popup.c @@ -28,7 +28,7 @@ nk_popup_begin(struct nk_context *ctx, enum nk_popup_type type, win = ctx->current; panel = win->layout; NK_ASSERT(!(panel->type & NK_PANEL_SET_POPUP) && "popups are not allowed to have popups"); - (void)panel; + NK_UNUSED(panel); title_len = (int)nk_strlen(title); title_hash = nk_murmur_hash(title, (int)title_len, NK_PANEL_POPUP); @@ -122,7 +122,7 @@ nk_nonblock_begin(struct nk_context *ctx, win = ctx->current; panel = win->layout; NK_ASSERT(!(panel->type & NK_PANEL_SET_POPUP)); - (void)panel; + NK_UNUSED(panel); popup = win->popup.win; if (!popup) { /* create window for nonblocking popup */