From f34d7ea1993a5c46cdefc175c8e4fd17dcfdaf4d Mon Sep 17 00:00:00 2001 From: ocornut Date: Fri, 29 Jul 2016 11:23:04 +0200 Subject: [PATCH] Fixed bad merge --- imgui.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 2ad9b2e8..41642697 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -823,12 +823,6 @@ ImGuiIO::ImGuiIO() FontAllowUserScaling = false; DisplayFramebufferScale = ImVec2(1.0f, 1.0f); DisplayVisibleMin = DisplayVisibleMax = ImVec2(0.0f, 0.0f); -#ifdef __APPLE__ - WordMovementUsesAltKey = true; // OS X style: Text editing cursor movement using Alt instead of Ctrl - ShortcutsUseSuperKey = true; // OS X style: Shortcuts using Cmd/Super instead of Ctrl - DoubleClickSelectsWord = true; // OS X style: Double click selects by word instead of selecting whole text - MultiSelectUsesSuperKey = true; // OS X style: Multi-selection in lists uses Cmd/Super instead of Ctrl -#endif // User functions RenderDrawListsFn = NULL;