From 3e1066a504dd727c99258104f31c5db6cedfe770 Mon Sep 17 00:00:00 2001 From: eriawan Date: Sat, 18 Apr 2020 00:58:59 +0700 Subject: [PATCH 1/2] add DefaultPropertyAttribute and DefaultEventAttribute to PrintDocument class and add references to System.ComponentModel.TypeConverter --- .../System.Drawing.Common/ref/System.Drawing.Common.csproj | 2 ++ .../System.Drawing.Common/src/System.Drawing.Common.csproj | 1 + .../src/System/Drawing/Printing/PrintDocument.Windows.cs | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj index 34d6599a3369ab..d41e02dd07e452 100644 --- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.csproj @@ -12,6 +12,7 @@ + @@ -22,6 +23,7 @@ + diff --git a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj index 0291615e11c0bd..2ebd360b273284 100644 --- a/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj +++ b/src/libraries/System.Drawing.Common/src/System.Drawing.Common.csproj @@ -366,6 +366,7 @@ + diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs index 47d0ef80efd70c..abe8853fca3406 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Windows.cs @@ -9,7 +9,7 @@ namespace System.Drawing.Printing /// /// Defines a reusable object that sends output to the printer. /// - [SRDescription(nameof(SR.PrintDocumentDesc))] + [DefaultProperty("DocumentName"), DefaultEvent("PrintPage"), SRDescription(nameof(SR.PrintDocumentDesc))] public class PrintDocument : Component { private string _documentName = "document"; From 670ea8edd5d01d14af2fb0c30b157ab72d01cbc8 Mon Sep 17 00:00:00 2001 From: eriawan Date: Sat, 18 Apr 2020 23:13:30 +0700 Subject: [PATCH 2/2] add the DefaultPropertyAttribute and DefaultEventAttribute to PrintDocument in the ref Add DefaultEventAttribute and DefaultPropertyAttribute to PrintDocument in PrintDoument.Unix.cs --- .../System.Drawing.Common/ref/System.Drawing.Common.cs | 2 ++ .../src/System/Drawing/Printing/PrintDocument.Unix.cs | 1 + 2 files changed, 3 insertions(+) diff --git a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs index b3d2f096545f46..0bda1dd3607c9f 100644 --- a/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs +++ b/src/libraries/System.Drawing.Common/ref/System.Drawing.Common.cs @@ -2719,6 +2719,8 @@ public virtual void OnEndPrint(System.Drawing.Printing.PrintDocument document, S public virtual System.Drawing.Graphics? OnStartPage(System.Drawing.Printing.PrintDocument document, System.Drawing.Printing.PrintPageEventArgs e) { throw null; } public virtual void OnStartPrint(System.Drawing.Printing.PrintDocument document, System.Drawing.Printing.PrintEventArgs e) { } } + [System.ComponentModel.DefaultPropertyAttribute("DocumentName")] + [System.ComponentModel.DefaultEventAttribute("PrintPage")] public partial class PrintDocument : System.ComponentModel.Component { public PrintDocument() { } diff --git a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs index 90f79eb627c7d1..e26c79ce36344e 100644 --- a/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs +++ b/src/libraries/System.Drawing.Common/src/System/Drawing/Printing/PrintDocument.Unix.cs @@ -40,6 +40,7 @@ namespace System.Drawing.Printing { + [DefaultProperty("DocumentName"), DefaultEvent("PrintPage")] public class PrintDocument : System.ComponentModel.Component { private PageSettings defaultpagesettings;