From e9c849884a312581551a659d2b096a4b257168de Mon Sep 17 00:00:00 2001
From: omar <omarcornut@gmail.com>
Date: Fri, 24 Aug 2018 15:42:31 +0200
Subject: [PATCH] Viewport: Fixed warnings due to bad merge.

---
 imgui.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/imgui.cpp b/imgui.cpp
index 5f37f112..9ec4f6fa 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -905,9 +905,7 @@ static ImVec2           CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* wind
 static void             AddDrawListToDrawData(ImVector<ImDrawList*>* out_list, ImDrawList* draw_list);
 static void             AddWindowToSortedBuffer(ImVector<ImGuiWindow*>* out_sorted_windows, ImGuiWindow* window);
 
-static ImRect           GetViewportRect();
-
-static bool             InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiTextEditCallback callback, void* user_data);
+static bool             InputTextFilterCharacter(unsigned int* p_char, ImGuiInputTextFlags flags, ImGuiInputTextCallback callback, void* user_data);
 static int              InputTextCalcTextLenAndLineCount(const char* text_begin, const char** out_text_end);
 static ImVec2           InputTextCalcTextSizeW(const ImWchar* text_begin, const ImWchar* text_end, const ImWchar** remaining = NULL, ImVec2* out_offset = NULL, bool stop_on_new_line = false);