Merge branch 'master' into navigation

# Conflicts:
#	imgui_internal.h

imgui_internal.h

@@ -628,8 +628,9 @@ enum ImGuiItemFlags_
 {
     ImGuiItemFlags_AllowKeyboardFocus           = 1 << 0,  // true
     ImGuiItemFlags_ButtonRepeat                 = 1 << 1,  // false    // Button() will return true multiple times based on io.KeyRepeatDelay and io.KeyRepeatRate settings.
-    ImGuiItemFlags_AllowNavDefaultFocus     = 1 << 1,  // true
+    //ImGuiItemFlags_Disabled                   = 1 << 2,  // false    // All widgets appears are disabled
-    ImGuiItemFlags_SelectableDontClosePopup = 1 << 3,  // false    // MenuItem/Selectable() automatically closes current Popup window
+    ImGuiItemFlags_AllowNavDefaultFocus         = 1 << 3,  // true
+    ImGuiItemFlags_SelectableDontClosePopup     = 1 << 4,  // false    // MenuItem/Selectable() automatically closes current Popup window
     ImGuiItemFlags_Default_                     = ImGuiItemFlags_AllowKeyboardFocus|ImGuiItemFlags_AllowNavDefaultFocus
 };