[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Printing InvalidPrinte
From: |
Rhys Weatherley <address@hidden> |
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Printing InvalidPrinterException.cs,1.1,1.2 Margins.cs,1.1,1.2 MarginsConverter.cs,1.1,1.2 PageSettings.cs,1.1,1.2 PrintDocument.cs,1.1,1.2 PrintEventArgs.cs,1.1,1.2 PrinterSettings.cs,1.1,1.2 PrinterUnitConvert.cs,1.2,1.3 PrintingPermission.cs,1.1,1.2PrintingPermissionAttribute.cs,1.1,1.2 |
Date: |
Mon, 09 Jun 2003 18:15:12 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing
In directory subversions:/tmp/cvs-serv25280/System.Drawing/Printing
Modified Files:
InvalidPrinterException.cs Margins.cs MarginsConverter.cs
PageSettings.cs PrintDocument.cs PrintEventArgs.cs
PrinterSettings.cs PrinterUnitConvert.cs PrintingPermission.cs
PrintingPermissionAttribute.cs
Log Message:
Various fixes to compile in non-full profiles.
Index: InvalidPrinterException.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/InvalidPrinterException.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** InvalidPrinterException.cs 7 Jun 2003 22:40:58 -0000 1.1
--- InvalidPrinterException.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 37,41 ****
this.settings = settings;
}
! #if !ECMA_COMPAT
protected InvalidPrinterException
(SerializationInfo info, StreamingContext ctxt)
--- 37,41 ----
this.settings = settings;
}
! #if CONFIG_SERIALIZATION
protected InvalidPrinterException
(SerializationInfo info, StreamingContext ctxt)
Index: Margins.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/Margins.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Margins.cs 7 Jun 2003 22:40:58 -0000 1.1
--- Margins.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 26,30 ****
--- 26,32 ----
using System.Text;
+ #if CONFIG_COMPONENT_MODEL
[TypeConverter("System.Drawing.Printing.MarginsConverter")]
+ #endif
public class Margins : ICloneable
{
Index: MarginsConverter.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/MarginsConverter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** MarginsConverter.cs 7 Jun 2003 22:40:58 -0000 1.1
--- MarginsConverter.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_COMPONENT_MODEL
+
using System.ComponentModel;
using System.Globalization;
***************
*** 93,96 ****
--- 95,100 ----
}; // class MarginsConverter
+
+ #endif // CONFIG_COMPONENT_MODEL
}; // namespace System.Drawing.Printing
Index: PageSettings.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PageSettings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PageSettings.cs 7 Jun 2003 22:40:58 -0000 1.1
--- PageSettings.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 26,30 ****
--- 26,32 ----
using System.Text;
+ #if !ECMA_COMPAT
[ComVisible(false)]
+ #endif
public class PageSettings : ICloneable
{
Index: PrintDocument.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PrintDocument.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PrintDocument.cs 7 Jun 2003 22:40:58 -0000 1.1
--- PrintDocument.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 25,29 ****
using System.ComponentModel;
! public class PrintDocument : Component
{
// Internal state.
--- 25,32 ----
using System.ComponentModel;
! public class PrintDocument
! #if CONFIG_COMPONENT_MODEL
! : Component
! #endif
{
// Internal state.
Index: PrintEventArgs.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PrintEventArgs.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PrintEventArgs.cs 7 Jun 2003 22:40:58 -0000 1.1
--- PrintEventArgs.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 25,29 ****
using System.ComponentModel;
! public class PrintEventArgs : CancelEventArgs
{
--- 25,34 ----
using System.ComponentModel;
! public class PrintEventArgs
! #if CONFIG_COMPONENT_MODEL
! : CancelEventArgs
! #else
! : EventArgs
! #endif
{
Index: PrinterSettings.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PrinterSettings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PrinterSettings.cs 7 Jun 2003 22:40:58 -0000 1.1
--- PrinterSettings.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 29,34 ****
--- 29,36 ----
using System.Collections;
+ #if !ECMA_COMPAT
[Serializable]
[ComVisible(false)]
+ #endif
public class PrinterSettings : ICloneable
{
***************
*** 360,363 ****
--- 362,367 ----
}
+ #if !ECMA_COMPAT
+
// Get the Win32-specific DEVMODE information for these printer
settings.
public IntPtr GetHdevmode()
***************
*** 389,392 ****
--- 393,398 ----
// Not used in this implementation.
}
+
+ #endif
// Convert this object into a string.
Index: PrinterUnitConvert.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PrinterUnitConvert.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** PrinterUnitConvert.cs 9 Jun 2003 21:25:37 -0000 1.2
--- PrinterUnitConvert.cs 9 Jun 2003 22:15:09 -0000 1.3
***************
*** 147,152 ****
--- 147,157 ----
(int value, PrinterUnit fromUnit, PrinterUnit
toUnit)
{
+ #if CONFIG_EXTENDED_NUMERICS
return (int)Math.Round
(Convert((double)value, fromUnit,
toUnit));
+ #else
+ return (int)
+ (Convert((double)value, fromUnit,
toUnit) + 0.5);
+ #endif
}
public static Margins Convert
Index: PrintingPermission.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PrintingPermission.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PrintingPermission.cs 7 Jun 2003 22:40:58 -0000 1.1
--- PrintingPermission.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_PERMISSIONS
+
using System.Security;
using System.Security.Permissions;
***************
*** 218,221 ****
--- 220,228 ----
return (state == PermissionState.Unrestricted);
}
+ #else
+ private bool IsUnrestricted()
+ {
+ return (state == PermissionState.Unrestricted);
+ }
#endif
***************
*** 234,237 ****
--- 241,246 ----
}; // class PrintingPermission
+
+ #endif // CONFIG_PERMISSIONS
}; // namespace System.Drawing.Printing
Index: PrintingPermissionAttribute.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Drawing/Printing/PrintingPermissionAttribute.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** PrintingPermissionAttribute.cs 7 Jun 2003 22:40:58 -0000 1.1
--- PrintingPermissionAttribute.cs 9 Jun 2003 22:15:09 -0000 1.2
***************
*** 23,26 ****
--- 23,28 ----
{
+ #if CONFIG_PERMISSIONS
+
using System;
using System.Security;
***************
*** 68,71 ****
--- 70,75 ----
}; // class PrintingPermissionAttribute
+
+ #endif // CONFIG_PERMISSIONS
}; // namespace System.Drawing.Printing
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing/Printing InvalidPrinterException.cs,1.1,1.2 Margins.cs,1.1,1.2 MarginsConverter.cs,1.1,1.2 PageSettings.cs,1.1,1.2 PrintDocument.cs,1.1,1.2 PrintEventArgs.cs,1.1,1.2 PrinterSettings.cs,1.1,1.2 PrinterUnitConvert.cs,1.2,1.3 PrintingPermission.cs,1.1,1.2PrintingPermissionAttribute.cs,1.1,1.2,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing Bitmap.cs,1.1,1.2 ColorConverter.cs,1.2,1.3 Font.cs,1.2,1.3 FontConverter.cs,1.1,1.2 Graphics.cs,1.2,1.3 Image.cs,1.1,1.2 Point.cs,1.1,1.2 PointConverter.cs,1.1,1.2 PointF.cs,1.1,1.2 Rectangle.cs,1.1,1.2 RectangleConverter.cs,1.1,1.2 RectangleF.cs,1.1,1.2 Region.cs,1.1,1.2 Size.cs,1.1,1.2 SizeConverter.cs,1.1,1.2 SizeF.cs,1.1,1.2 StringFormat.cs,1.2,1.3
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.1013,1.1014
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Drawing Bitmap.cs,1.1,1.2 ColorConverter.cs,1.2,1.3 Font.cs,1.2,1.3 FontConverter.cs,1.1,1.2 Graphics.cs,1.2,1.3 Image.cs,1.1,1.2 Point.cs,1.1,1.2 PointConverter.cs,1.1,1.2 PointF.cs,1.1,1.2 Rectangle.cs,1.1,1.2 RectangleConverter.cs,1.1,1.2 RectangleF.cs,1.1,1.2 Region.cs,1.1,1.2 Size.cs,1.1,1.2 SizeConverter.cs,1.1,1.2 SizeF.cs,1.1,1.2 StringFormat.cs,1.2,1.3
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib ChangeLog,1.1013,1.1014
- Index(es):