From 9bf22e0a248b24f2a4e0942b021b6ccabf3902ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Fri, 2 Oct 2015 21:10:18 -0700
Subject: [PATCH] Cleanup.

---
 3rdparty/ocornut-imgui/imgui_wm.cpp     |  9 ++++++++-
 3rdparty/ocornut-imgui/imgui_wm.h       |  4 +---
 examples/common/imgui/ocornut_imgui.cpp | 14 ++------------
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/3rdparty/ocornut-imgui/imgui_wm.cpp b/3rdparty/ocornut-imgui/imgui_wm.cpp
index 51599e81c..5627fe804 100644
--- a/3rdparty/ocornut-imgui/imgui_wm.cpp
+++ b/3rdparty/ocornut-imgui/imgui_wm.cpp
@@ -1333,6 +1333,12 @@ namespace ImGuiWM
         }
     }
 
+    static ImVec2 GetCursorPos()
+    {
+        ImGuiIO& io = ImGui::GetIO();
+        return io.MousePos;
+    }
+
     void WindowManager::StartDragWindow(Window* pWindow)
     {
         if (NULL == m_pDraggedWindow)
@@ -1391,7 +1397,8 @@ namespace ImGuiWM
             }
 
             //if (!((ImGuiState*)m_pDragPlatformWindow->m_pState)->IO.MouseDown[0])
-            if (!IsLeftClickDown())
+            ImGuiIO& io = ImGui::GetIO();
+            if (!io.MouseDown[0])
             {
                 if (NULL != pBestContainer)
                 {
diff --git a/3rdparty/ocornut-imgui/imgui_wm.h b/3rdparty/ocornut-imgui/imgui_wm.h
index b7337f7a3..e0d2abbf6 100644
--- a/3rdparty/ocornut-imgui/imgui_wm.h
+++ b/3rdparty/ocornut-imgui/imgui_wm.h
@@ -264,8 +264,6 @@ namespace ImGuiWM
     protected:
         virtual PlatformWindow*  CreatePlatformWindow(bool bMain,PlatformWindow* pParent,bool bDragWindow) = 0;
         virtual void InternalRun() = 0;
-        virtual ImVec2 GetCursorPos() = 0;
-        virtual bool IsLeftClickDown() = 0;
 
         void AddWindow(Window* pWindow);
         void RemoveWindow(Window* pWindow);
@@ -293,7 +291,7 @@ namespace ImGuiWM
         void StartDragWindow(Window* pWindow);
         void StopDragWindow();
         void UpdateDragWindow();
-        Container*  GetBestDocking(PlatformWindow* pPlatformWindow,const ImVec2 oCursorPos,EDockOrientation& oOutOrientation,ImVec2& oOutAreaPos,ImVec2& oOutAreaSize);
+        Container*GetBestDocking(PlatformWindow* pPlatformWindow,const ImVec2 oCursorPos,EDockOrientation& oOutOrientation,ImVec2& oOutAreaPos,ImVec2& oOutAreaSize);
 
         Config m_oConfig;
         PlatformWindow* m_pMainPlatformWindow;
diff --git a/examples/common/imgui/ocornut_imgui.cpp b/examples/common/imgui/ocornut_imgui.cpp
index a5b3de44d..44028573a 100644
--- a/examples/common/imgui/ocornut_imgui.cpp
+++ b/examples/common/imgui/ocornut_imgui.cpp
@@ -143,18 +143,6 @@ protected:
 		PreUpdate();
 		Update();
 	}
-
-	virtual ImVec2 GetCursorPos() BX_OVERRIDE
-	{
-		ImGuiIO& io = ImGui::GetIO();
-		return io.MousePos;
-	}
-
-	virtual bool IsLeftClickDown() BX_OVERRIDE
-	{
-		ImGuiIO& io = ImGui::GetIO();
-		return io.MouseDown[0];
-	}
 };
 
 struct OcornutImguiContext
@@ -362,10 +350,12 @@ struct OcornutImguiContext
 			Window* w0 = new Window("test");
 			Window* w1 = new Window("abcd");
 			Window* w2 = new Window("xyzw");
+			Window* w3 = new Window("0123");
 
 			m_wm->Dock(w0);
 			m_wm->DockWith(w1, w0, ImGuiWM::E_DOCK_ORIENTATION_RIGHT);
 			m_wm->DockWith(w2, w1, ImGuiWM::E_DOCK_ORIENTATION_BOTTOM);
+			m_wm->DockWith(w3, w0, ImGuiWM::E_DOCK_ORIENTATION_BOTTOM);
 		}
 #endif // 0
 	}