Updated version to 1.60 WIP to emphasis on the addition of required calls CreateContext/DestroyContext + merged the massive Navigation branch (#1565, #787)

This commit is contained in:
omar
2018-02-06 20:20:34 +01:00
parent f0364aa359
commit 7c16d52f72
5 changed files with 14 additions and 18 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.54 WIP
// dear imgui, v1.60 WIP
// (headers)
// See imgui.cpp file for documentation.
@ -21,8 +21,7 @@
#include <stddef.h> // ptrdiff_t, NULL
#include <string.h> // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
#define IMGUI_VERSION "1.54 WIP"
#define IMGUI_HAS_NAV // navigation branch
#define IMGUI_VERSION "1.60 WIP"
// Define attributes of all API symbols declarations, e.g. for DLL under Windows.
#ifndef IMGUI_API
@ -1060,7 +1059,7 @@ struct ImGuiIO
#ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
namespace ImGui
{
// OBSOLETED in 1.54 (from Dec 2017)
// OBSOLETED in 1.60 (from Dec 2017)
static inline bool IsAnyWindowFocused() { return IsWindowFocused(ImGuiFocusedFlags_AnyWindow); }
static inline bool IsAnyWindowHovered() { return IsWindowHovered(ImGuiHoveredFlags_AnyWindow); }
static inline ImVec2 CalcItemRectClosestPoint(const ImVec2& pos, bool on_edge = false, float outward = 0.f) { (void)on_edge; (void)outward; IM_ASSERT(0); return pos; }