sean-m
/
nuklear
mirror of https://github.com/vurtun/nuklear.git
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #668 from nsawa/Fix_VC_warning_cannot_convert_parameter 

Fix: VC++ warning cannot convert parameter.
pull/685/head
Micha Mettke 2018-04-15 10:38:37 +02:00 committed by GitHub
parent d5f32ee6f9 9c6896c1ed
commit b91a815c82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nuklear.h
View File

@ -18480,7 +18480,7 @@ nk_tree_element_base(struct nk_context *ctx, enum nk_tree_type type,
state = nk_add_value(ctx, win, tree_hash, 0);
*state = initial_state;
} return nk_tree_element_image_push_hashed_base(ctx, type, img, title,
nk_strlen(title), state, selected);
nk_strlen(title), (enum nk_collapse_states*)state, selected);
}
NK_API int
nk_tree_element_push_hashed(struct nk_context *ctx, enum nk_tree_type type,
@ -20513,7 +20513,7 @@ nk_do_selectable(nk_flags *state, struct nk_command_buffer *out,
/* draw selectable */
if (style->draw_begin) style->draw_begin(out, style->userdata);
nk_draw_selectable(out, *state, style, *value, &bounds, 0,0,0, str, len, align, font);
nk_draw_selectable(out, *state, style, *value, &bounds, 0,0,NK_SYMBOL_NONE, str, len, align, font);
if (style->draw_end) style->draw_end(out, style->userdata);
return old_value != *value;
}
@ -20560,7 +20560,7 @@ nk_do_selectable_image(nk_flags *state, struct nk_command_buffer *out,
/* draw selectable */
if (style->draw_begin) style->draw_begin(out, style->userdata);
nk_draw_selectable(out, *state, style, *value, &bounds, &icon, img, 0, str, len, align, font);
nk_draw_selectable(out, *state, style, *value, &bounds, &icon, img, NK_SYMBOL_NONE, str, len, align, font);
if (style->draw_end) style->draw_end(out, style->userdata);
return old_value != *value;
}

4
src/nuklear_selectable.c
View File

@ -87,7 +87,7 @@ nk_do_selectable(nk_flags *state, struct nk_command_buffer *out,
/* draw selectable */
if (style->draw_begin) style->draw_begin(out, style->userdata);
nk_draw_selectable(out, *state, style, *value, &bounds, 0,0,0, str, len, align, font);
nk_draw_selectable(out, *state, style, *value, &bounds, 0,0,NK_SYMBOL_NONE, str, len, align, font);
if (style->draw_end) style->draw_end(out, style->userdata);
return old_value != *value;
}
@ -134,7 +134,7 @@ nk_do_selectable_image(nk_flags *state, struct nk_command_buffer *out,
/* draw selectable */
if (style->draw_begin) style->draw_begin(out, style->userdata);
nk_draw_selectable(out, *state, style, *value, &bounds, &icon, img, 0, str, len, align, font);
nk_draw_selectable(out, *state, style, *value, &bounds, &icon, img, NK_SYMBOL_NONE, str, len, align, font);
if (style->draw_end) style->draw_end(out, style->userdata);
return old_value != *value;
}

2
src/nuklear_tree.c
View File

@ -317,7 +317,7 @@ nk_tree_element_base(struct nk_context *ctx, enum nk_tree_type type,
state = nk_add_value(ctx, win, tree_hash, 0);
*state = initial_state;
} return nk_tree_element_image_push_hashed_base(ctx, type, img, title,
nk_strlen(title), state, selected);
nk_strlen(title), (enum nk_collapse_states*)state, selected);
}
NK_API int
nk_tree_element_push_hashed(struct nk_context *ctx, enum nk_tree_type type,