From 530e746daa6427bfe84f0b45135f9cf7faa62545 Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Thu, 2 Oct 2014 11:56:40 +0100
Subject: [PATCH] Renamed IMGUI_INCLUDE_IMGUI_USER_CPP to
 IMGUI_INCLUDE_IMGUI_USER_INL (more IDE friendly)

---
 imconfig.h |  6 +++---
 imgui.cpp  | 14 ++++++++------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/imconfig.h b/imconfig.h
index a88e422e9..18a64b2b9 100644
--- a/imconfig.h
+++ b/imconfig.h
@@ -17,8 +17,8 @@
 //---- Don't implement default clipboard handlers for Windows (so as not to link with OpenClipboard() and others Win32 functions)
 //#define IMGUI_DISABLE_WIN32_DEFAULT_CLIPBOARD_FUNCS
 
-//---- Include imgui_user.cpp at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
-//#define IMGUI_INCLUDE_IMGUI_USER_CPP
+//---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
+//#define IMGUI_INCLUDE_IMGUI_USER_INL
 
 //---- Define implicit cast operators to convert back<>forth from your math types and ImVec2/ImVec4.
 /*
@@ -32,7 +32,7 @@
 */
 
 //---- Freely implement extra functions within the ImGui:: namespace.
-//---- Declare helpers or widgets implemented in imgui_user.cpp or elsewhere, so end-user doesn't need to include multiple files.
+//---- Declare helpers or widgets implemented in imgui_user.inl or elsewhere, so end-user doesn't need to include multiple files.
 //---- e.g. you can create variants of the ImGui::Value() helper for your low-level math types.
 /*
 namespace ImGui
diff --git a/imgui.cpp b/imgui.cpp
index 7c05d8fc6..3232c7e26 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -138,6 +138,7 @@
  API BREAKING CHANGES
  ====================
 
+  - 2014/10/02 (1.14) renamed IMGUI_INCLUDE_IMGUI_USER_CPP to IMGUI_INCLUDE_IMGUI_USER_INL and imgui_user.cpp to imgui_user.inl (more IDE friendly)
   - 2014/09/25 (1.13) removed 'text_end' parameter from IO.SetClipboardTextFn (the string is now always zero-terminated for simplicity)
   - 2014/09/24 (1.12) renamed SetFontScale() to SetWindowFontScale()
   - 2014/09/24 (1.12) moved IM_MALLOC/IM_REALLOC/IM_FREE preprocessor defines to IO.MemAllocFn/IO.MemReallocFn/IO.MemFreeFn
@@ -148,10 +149,10 @@
  ISSUES & TODO-LIST
  ==================
 
- - misc: merge ImVec4 / ImGuiAabb, they are essentially duplicate containers
+ - misc: merge or clarify ImVec4 / ImGuiAabb, they are essentially duplicate containers
  - window: autofit is losing its purpose when user relies on any dynamic layout (window width multiplier, column). maybe just discard autofit?
- - window: support horizontal scroll
- - window: fix resize grip scaling along with Rounding style setting
+ - window: add horizontal scroll
+ - window: fix resize grip rendering scaling along with Rounding style setting
  - widgets: switching from "widget-label" to "label-widget" would make it more convenient to integrate widgets in trees
  - widgets: clip text? hover clipped text shows it in a tooltip or in-place overlay
  - main: make IsHovered() more consistent for various type of widgets, widgets with multiple components, etc. also effectively IsHovered() region sometimes differs from hot region, e.g tree nodes
@@ -187,6 +188,7 @@
  - shortcuts: add a shortcut api, e.g. parse "&Save" and/or "Save (CTRL+S)", pass in to widgets or provide simple ways to use (button=activate, input=focus)
  ! keyboard: tooltip & combo boxes are messing up / not honoring keyboard tabbing
  - keyboard: full keyboard navigation and focus.
+ - input: reowrk IO to be able to pass actual events to fix temporal aliasing issues.
  - input: support trackpad style scrolling & slider edit.
  - tooltip: move to fit within screen (e.g. when mouse cursor is right of the screen).
  - misc: not thread-safe
@@ -6662,9 +6664,9 @@ void GetDefaultFontData(const void** fnt_data, unsigned int* fnt_size, const voi
 
 //-----------------------------------------------------------------------------
 
-//---- Include imgui_user.cpp at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
-#ifdef IMGUI_INCLUDE_IMGUI_USER_CPP
-#include "imgui_user.cpp"
+//---- Include imgui_user.inl at the end of imgui.cpp so you can include code that extends ImGui using its private data/functions.
+#ifdef IMGUI_INCLUDE_IMGUI_USER_INL
+#include "imgui_user.inl"
 #endif
 
 //-----------------------------------------------------------------------------