Merge branch 'master' into navigation

# Conflicts:
#	imgui.h
This commit is contained in:
omar
2017-12-26 15:37:31 +01:00
5 changed files with 33 additions and 15 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.53 WIP
// dear imgui, v1.53
// (main code and documentation)
// ** EXPERIMENTAL GAMEPAD/KEYBOARD NAVIGATION BRANCH
@ -10619,7 +10619,7 @@ void ImGui::ListBoxFooter()
EndGroup();
}
bool ImGui::ListBox(const char* label, int* current_item, const char* const* items, int items_count, int height_items)
bool ImGui::ListBox(const char* label, int* current_item, const char* const items[], int items_count, int height_items)
{
const bool value_changed = ListBox(label, current_item, Items_ArrayGetter, (void*)items, items_count, height_items);
return value_changed;