Merge remote-tracking branch 'origin' into 2016-07-navigation

examples/directx11_example/imgui_impl_dx11.cpp

@@ -584,7 +584,8 @@ void ImGui_ImplDX11_NewFrame()
     }
 
     // Hide OS mouse cursor if ImGui is drawing it
-    SetCursor(io.MouseDrawCursor ? NULL : LoadCursor(NULL, IDC_ARROW));
+    if (io.MouseDrawCursor)
+        SetCursor(NULL);
 
     // Start the frame
     ImGui::NewFrame();