Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -168,7 +168,7 @@ namespace System.Web.UI.Design.MobileControls.Util
}
}
// Copied from ndp\fx\src\Designer\[....]\System\[....]\Design\RTLAwareMessageBox.cs
// Copied from ndp\fx\src\Designer\Microsoft\System\Microsoft\Design\RTLAwareMessageBox.cs
[Obsolete("The System.Web.Mobile.dll assembly has been deprecated and should no longer be used. For information about how to develop ASP.NET mobile applications, see http://go.microsoft.com/fwlink/?LinkId=157231.")]
internal sealed class RTLAwareMessageBox {

View File

@ -6,7 +6,7 @@
// MSHTMLHost.cs
//
// 12/17/98: Created: [....]
// 12/17/98: Created: Microsoft
//
namespace System.Web.UI.Design.MobileControls.Util {
@ -210,7 +210,7 @@ namespace System.Web.UI.Design.MobileControls.Util {
}
public virtual void OnUIDeactivate(int fUndoable) {
// NOTE, [....], 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
// NOTE, Microsoft, 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
// fixes trident hosting in Win2000.
}
@ -245,7 +245,7 @@ namespace System.Web.UI.Design.MobileControls.Util {
}
public virtual void SetActiveObject(NativeMethods.IOleInPlaceActiveObject pActiveObject, string pszObjName) {
// NOTE, [....], 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
// NOTE, Microsoft, 7/99: Don't return E_NOTIMPL. Somehow doing nothing and returning S_OK
// fixes trident hosting in Win2000.
// throw new COMException(String.Empty, NativeMethods.E_NOTIMPL);
}