[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dotgnu-pnet-commits] CVS: pnetlib/System.Windows.Forms BindingManagerBa
|
From: |
Rhys Weatherley <address@hidden> |
|
Subject: |
[Dotgnu-pnet-commits] CVS: pnetlib/System.Windows.Forms BindingManagerBase.cs, 1.1, 1.2 BindingMemberInfo.cs, 1.1, 1.2 BindingsCollection.cs, 1.1, 1.2 CancelEventHandler.cs, 1.1, 1.2 Clipboard.cs, 1.1, 1.2 CommonDialog.cs, 1.1, 1.2 CurrencyManager.cs, 1.1, 1.2 ImageList.cs, 1.5, 1.6 ImageListStreamer.cs, 1.2, 1.3 StatusBar.cs, 1.4, 1.5 StatusBarPanel.cs, 1.2, 1.3 SystemInformation.cs, 1.1, 1.2 |
|
Date: |
Tue, 12 Aug 2003 21:21:43 -0400 |
Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms
In directory subversions:/tmp/cvs-serv11169/System.Windows.Forms
Modified Files:
BindingManagerBase.cs BindingMemberInfo.cs
BindingsCollection.cs CancelEventHandler.cs Clipboard.cs
CommonDialog.cs CurrencyManager.cs ImageList.cs
ImageListStreamer.cs StatusBar.cs StatusBarPanel.cs
SystemInformation.cs
Log Message:
Changes for ECMA compatibility.
Index: BindingManagerBase.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/BindingManagerBase.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BindingManagerBase.cs 2 Jul 2003 19:55:15 -0000 1.1
--- BindingManagerBase.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 66,69 ****
--- 66,70 ----
public abstract void CancelCurrentEdit();
public abstract void EndCurrentEdit();
+ #if CONFIG_COMPONENT_MODEL
public abstract PropertyDescriptorCollection GetItemProperties();
***************
*** 85,88 ****
--- 86,90 ----
return null;
}
+ #endif // CONFIG_COMPONENT_MODEL
public abstract void RemoveAt( int index );
Index: BindingMemberInfo.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/BindingMemberInfo.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BindingMemberInfo.cs 13 Jun 2003 10:22:58 -0000 1.1
--- BindingMemberInfo.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 89,95 ****
--- 89,100 ----
String other;
other =
((BindingMemberInfo)otherObject).BindingMember;
+ #if !ECMA_COMPAT
return (String.Compare
(current,
other, true,
CultureInfo.InvariantCulture) == 0);
+ #else
+ return (String.Compare
+ (current,
other, true) == 0);
+ #endif
}
else
Index: BindingsCollection.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/BindingsCollection.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** BindingsCollection.cs 2 Jul 2003 19:55:15 -0000 1.1
--- BindingsCollection.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 52,56 ****
--- 52,58 ----
}
+ #if CONFIG_COMPONENT_MODEL
public event CollectionChangeEventHandler CollectionChanged;
+ #endif
[TODO]
***************
*** 73,80 ****
--- 75,84 ----
}
+ #if CONFIG_COMPONENT_MODEL
[TODO]
protected virtual void OnCollectionChanged( CollectionChangeEventArgs
ev )
{
}
+ #endif
[TODO]
Index: CancelEventHandler.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/CancelEventHandler.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CancelEventHandler.cs 17 Jun 2003 11:55:49 -0000 1.1
--- CancelEventHandler.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 27,32 ****
#if !CONFIG_COMPONENT_MODEL
! [Serializable]
! public delegate void CancelEventHandler(Object sender, CancelEventArgs
e);
#endif
--- 27,34 ----
#if !CONFIG_COMPONENT_MODEL
! #if !ECMA_COMPAT
! [Serializable]
! #endif
! public delegate void CancelEventHandler(Object sender, CancelEventArgs e);
#endif
Index: Clipboard.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Clipboard.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** Clipboard.cs 1 Aug 2003 17:53:07 -0000 1.1
--- Clipboard.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 41,44 ****
--- 41,45 ----
public static IDataObject GetDataObject()
{
+ #if !ECMA_COMPAT
Thread ct = Thread.CurrentThread;
if (ct.ApartmentState != ApartmentState.STA)
***************
*** 46,49 ****
--- 47,51 ----
throw new ThreadStateException(/* TODO */);
}
+ #endif
return obj;
}
Index: CommonDialog.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/CommonDialog.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CommonDialog.cs 6 Jul 2003 05:57:31 -0000 1.1
--- CommonDialog.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 26,30 ****
[TODO]
! public abstract class CommonDialog : Component
{
[TODO]
--- 26,33 ----
[TODO]
! public abstract class CommonDialog
! #if CONFIG_COMPONENT_MODEL
! : Component
! #endif
{
[TODO]
Index: CurrencyManager.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/CurrencyManager.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** CurrencyManager.cs 2 Jul 2003 19:55:15 -0000 1.1
--- CurrencyManager.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 90,93 ****
--- 90,94 ----
}
+ #if CONFIG_COMPONENT_MODEL
[TODO]
public override PropertyDescriptorCollection GetItemProperties()
***************
*** 95,98 ****
--- 96,101 ----
return null;
}
+ #endif
+
[TODO]
Index: ImageList.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/ImageList.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** ImageList.cs 4 Jul 2003 05:50:00 -0000 1.5
--- ImageList.cs 13 Aug 2003 01:21:41 -0000 1.6
***************
*** 30,34 ****
[TODO]
! public sealed class ImageList : Component
{
// Variables
--- 30,37 ----
[TODO]
! public sealed class ImageList
! #if CONFIG_COMPONENT_MODEL
! : Component
! #endif
{
// Variables
***************
*** 36,40 ****
--- 39,45 ----
private ImageCollection images;
private Size imageSize = new Size(16,16);
+ #if CONFIG_SERIALIZATION
private ImageListStreamer imageStream = null;
+ #endif
private Color transparentColor = Color.Transparent;
private Delegate rhHandler = null;
***************
*** 45,49 ****
images = new ImageCollection(this);
}
! #if !CONFIG_COMPACT_FORMS
public ImageList(IContainer container) : base() { container.Add(this); }
#endif
--- 50,54 ----
images = new ImageCollection(this);
}
! #if !CONFIG_COMPACT_FORMS && CONFIG_COMPONENT_MODEL
public ImageList(IContainer container) : base() { container.Add(this); }
#endif
***************
*** 79,82 ****
--- 84,88 ----
}
#if !CONFIG_COMPACT_FORMS
+ #if CONFIG_SERIALIZATION
[TODO]
public ImageListStreamer ImageStream
***************
*** 89,92 ****
--- 95,99 ----
}
}
+ #endif
public Color TransparentColor
{
***************
*** 97,101 ****
// Methods
! protected override void Dispose(bool disposing) { /* TODO */ }
#if !CONFIG_COMPACT_FORMS
public void Draw(Graphics g, Point pt, int index)
--- 104,116 ----
// Methods
! [TODO]
! #if CONFIG_COMPONENT_MODEL
! protected override void Dispose(bool disposing)
! #else
! protected virtual void Dispose(bool disposing)
! #endif
! {
! /* TODO */
! }
#if !CONFIG_COMPACT_FORMS
public void Draw(Graphics g, Point pt, int index)
Index: ImageListStreamer.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/ImageListStreamer.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** ImageListStreamer.cs 25 Jun 2003 00:47:00 -0000 1.2
--- ImageListStreamer.cs 13 Aug 2003 01:21:41 -0000 1.3
***************
*** 24,27 ****
--- 24,29 ----
{
+ #if CONFIG_SERIALIZATION
+
using System.Runtime.Serialization;
***************
*** 37,40 ****
--- 39,44 ----
}; // class ImageListStreamer
+
+ #endif // CONFIG_SERIALIZATION
}; // namespace System.Windows.Forms
Index: StatusBar.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/StatusBar.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** StatusBar.cs 4 Aug 2003 04:45:07 -0000 1.4
--- StatusBar.cs 13 Aug 2003 01:21:41 -0000 1.5
***************
*** 195,199 ****
--- 195,201 ----
}
+ #if CONFIG_COMPONENT_MODEL
[DesignerSerializationVisibility(DesignerSerializationVisibility.Content)]
+ #endif
public StatusBarPanelCollection Panels
{
Index: StatusBarPanel.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/StatusBarPanel.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** StatusBarPanel.cs 21 Jun 2003 00:02:46 -0000 1.2
--- StatusBarPanel.cs 13 Aug 2003 01:21:41 -0000 1.3
***************
*** 29,33 ****
namespace System.Windows.Forms
{
! public class StatusBarPanel : Component, ISupportInitialize
{
private HorizontalAlignment alignment;
--- 29,36 ----
namespace System.Windows.Forms
{
! public class StatusBarPanel
! #if CONFIG_COMPONENT_MODEL
! : Component, ISupportInitialize
! #endif
{
private HorizontalAlignment alignment;
***************
*** 54,57 ****
--- 57,61 ----
}
+ #if CONFIG_COMPONENT_MODEL
~StatusBarPanel()
{
***************
*** 67,70 ****
--- 71,75 ----
base.Dispose( disposing );
}
+ #endif
public void BeginInit()
Index: SystemInformation.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/SystemInformation.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** SystemInformation.cs 13 Jun 2003 13:32:26 -0000 1.1
--- SystemInformation.cs 13 Aug 2003 01:21:41 -0000 1.2
***************
*** 82,85 ****
--- 82,86 ----
}
}
+ #if !ECMA_COMPAT
public static String ComputerName
{
***************
*** 89,92 ****
--- 90,94 ----
}
}
+ #endif
public static Size CursorSize
{
***************
*** 383,386 ****
--- 385,389 ----
}
}
+ #if !ECMA_COMPAT
public static String UserDomainName
{
***************
*** 404,407 ****
--- 407,411 ----
}
}
+ #endif
public static int VerticalScrollBarArrowHeight
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dotgnu-pnet-commits] CVS: pnetlib/System.Windows.Forms BindingManagerBase.cs, 1.1, 1.2 BindingMemberInfo.cs, 1.1, 1.2 BindingsCollection.cs, 1.1, 1.2 CancelEventHandler.cs, 1.1, 1.2 Clipboard.cs, 1.1, 1.2 CommonDialog.cs, 1.1, 1.2 CurrencyManager.cs, 1.1, 1.2 ImageList.cs, 1.5, 1.6 ImageListStreamer.cs, 1.2, 1.3 StatusBar.cs, 1.4, 1.5 StatusBarPanel.cs, 1.2, 1.3 SystemInformation.cs, 1.1, 1.2,
Rhys Weatherley <address@hidden> <=
- Prev by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Text DefaultEncoding.cs, 1.4, 1.5
- Next by Date:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Configuration.Install AssemblyInstaller.cs, 1.3, 1.4 IManagedInstaller.cs, 1.1, 1.2 InstallContext.cs, 1.2, 1.3 InstallEventArgs.cs, 1.1, 1.2 InstallEventHandler.cs, 1.1, 1.2 InstallException.cs, 1.1, 1.2 InstallUtil.cs, 1.1, 1.2 Installer.cs, 1.1, 1.2 InstallerCollection.cs, 1.1, 1.2 ManagedInstallerClass.cs, 1.2, 1.3 TransactedInstaller.cs, 1.1, 1.2 UninstallAction.cs, 1.1, 1.2
- Previous by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Text DefaultEncoding.cs, 1.4, 1.5
- Next by thread:
[Dotgnu-pnet-commits] CVS: pnetlib/System.Configuration.Install AssemblyInstaller.cs, 1.3, 1.4 IManagedInstaller.cs, 1.1, 1.2 InstallContext.cs, 1.2, 1.3 InstallEventArgs.cs, 1.1, 1.2 InstallEventHandler.cs, 1.1, 1.2 InstallException.cs, 1.1, 1.2 InstallUtil.cs, 1.1, 1.2 Installer.cs, 1.1, 1.2 InstallerCollection.cs, 1.1, 1.2 ManagedInstallerClass.cs, 1.2, 1.3 TransactedInstaller.cs, 1.1, 1.2 UninstallAction.cs, 1.1, 1.2
- Index(es):