Author: pbartok
Date: 2005-05-11 00:42:35 -0400 (Wed, 11 May 2005)
New Revision: 44371
Added:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SecurityIDType.cs
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AccessibleObject.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
Log:
2005-05-10 Peter Bartok <[EMAIL PROTECTED]>
* AccessibleObject.cs:
- Removed MonoTODO attribute on help, method is correct
- Fixed Bounds property
* AxHost.cs: Moved MonoTODO
* ButtonBase.cs: Now setting AccessibleObject properties
* RadioButton.cs: Setting proper AccessibleObject role
* CheckBox.cs: Setting proper AccessibleObject role
* ControlBindingsCollection.cs: Added properties, methods and attributes
* DataFormats.cs: Fixed awkward internal API, and changed to enable
userdefined DataFormats.Format items as well
* ListControl.cs: Removed data_member from the public eye
* OpenFileDialog.cs:
- Made class sealed
- Added missing attributes
* SaveFileDialog.cs: Added missing attributes
* ImageListStreamer.cs: Fixed code that caused warnings
* LinkLabel.cs: Removed unreachable code
* TreeView.cs: Fixed code that caused warnings
* PropertyGridView.cs: Fixed code that caused warnings
* GridColumnStylesCollection.cs: Added missing attributes
* GridTableStylesCollection: Added missing attribute
* PropertyManager: Added .ctor
* SecurityIDType: Added
* DataObject.cs: Implemented class
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AccessibleObject.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AccessibleObject.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AccessibleObject.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -68,7 +68,7 @@
#region Public Instance Properties
public virtual Rectangle Bounds {
get {
- return Rectangle.Empty;
+ return owner.Bounds;
}
}
@@ -188,7 +188,6 @@
return null;
}
- [MonoTODO("Integrate help into accessibility system")]
public virtual int GetHelpTopic(out string FileName) {
FileName = null;
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/AxHost.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -35,6 +35,7 @@
namespace System.Windows.Forms {
+ [MonoTODO("Possibly implement this for Win32; find a way for Linux and
Mac")]
[DefaultEvent("Enter")]
[Designer("System.Windows.Forms.Design.AxHostDesigner, " +
Consts.AssemblySystem_Design)]
[DesignTimeVisible(false)]
@@ -51,12 +52,10 @@
#region AxHost.AxComponentEditor Class
public class AxComponentEditor :
System.Windows.Forms.Design.WindowsFormsComponentEditor {
- [MonoTODO]
public AxComponentEditor() {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public override bool
EditComponent(ITypeDescriptorContext context, object obj, IWin32Window parent) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
@@ -83,17 +82,14 @@
#region AxHost.ConnectionPointCookie
[ComVisible(false)]
public class ConnectionPointCookie {
- [MonoTODO]
public ConnectionPointCookie(object source,
object sink, Type eventInterface) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public void Disconnect() {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
~ConnectionPointCookie() {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
@@ -102,12 +98,10 @@
#region AxHost.InvalidActiveXStateException Class
public class InvalidActiveXStateException : Exception {
- [MonoTODO]
public InvalidActiveXStateException(string
name, ActiveXInvokeKind kind) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public override string ToString() {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
@@ -118,12 +112,10 @@
[Serializable]
[TypeConverter("System.ComponentModel.TypeConverter,
System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public class State : ISerializable {
- [MonoTODO]
public State(Stream ms, int storageType, bool
manualUpdate, string licKey) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
void
ISerializable.GetObjectData(SerializationInfo si,StreamingContext context) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
@@ -133,12 +125,10 @@
#region AxHost.TypeLibraryTimeStampAttribute Class
[AttributeUsage(AttributeTargets.Assembly,
Inherited=false)]
public sealed class TypeLibraryTimeStampAttribute :
Attribute {
- [MonoTODO]
public TypeLibraryTimeStampAttribute(string
timestamp) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public DateTime Value {
get {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
@@ -149,27 +139,22 @@
#region AxHost.StateConverter Class
public class StateConverter :
System.ComponentModel.TypeConverter {
- [MonoTODO]
public StateConverter() {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public override bool
CanConvertFrom(ITypeDescriptorContext context, Type sourceType) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public override bool
CanConvertTo(ITypeDescriptorContext context, Type destinationType) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public override object
ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo
culture, object value) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
- [MonoTODO]
public override object
ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo
culture, object value, Type destinationType) {
throw new
NotImplementedException("COM/ActiveX support is not implemented");
}
@@ -190,7 +175,6 @@
#region Public Instance Properties
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override Color BackColor {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -203,7 +187,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override Image BackgroundImage {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -216,7 +199,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public ContainerControl ContainingControl {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -229,7 +211,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override ContextMenu ContextMenu {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -242,7 +223,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override Cursor Cursor {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -256,7 +236,6 @@
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public bool EditMode {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -265,7 +244,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public new virtual bool Enabled {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -278,7 +256,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override Font Font {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -291,7 +268,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override Color ForeColor {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -305,7 +281,6 @@
[Browsable(false)]
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public bool HasAboutBox {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -315,7 +290,6 @@
[Browsable(false)]
[DefaultValue(null)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
[RefreshProperties(RefreshProperties.All)]
public AxHost.State OcxState {
get {
@@ -329,7 +303,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
[Localizable(true)]
public new virtual bool RightToLeft {
get {
@@ -341,7 +314,6 @@
}
}
- [MonoTODO]
public override ISite Site {
set {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -350,7 +322,6 @@
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
public override string Text {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -363,14 +334,12 @@
#endregion // Protected Constructors
#region Protected Instance Properties
- [MonoTODO]
protected override CreateParams CreateParams {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
}
}
- [MonoTODO]
protected override Size DefaultSize {
get {
throw new NotImplementedException("COM/ActiveX
support is not implemented");
@@ -379,81 +348,68 @@
#endregion // Protected Instance Properties
#region Protected Static Methods
- [MonoTODO]
[CLSCompliant(false)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static Color GetColorFromOleColor(uint color){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static Font GetFontFromIFont(object font){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static Font GetFontFromIFontDisp(object font){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static object GetIFontDispFromFont(Font font){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static object GetIFontFromFont(Font font){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static object GetIPictureDispFromPicture(Image image){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static object GetIPictureFromCursor(Cursor cursor){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static object GetIPictureFromPicture(Image image){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static double GetOADateFromTime(DateTime time){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[CLSCompliant(false)]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static uint GetOleColorFromColor(Color color){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static Image GetPictureFromIPicture(object picture){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static Image GetPictureFromIPictureDisp(object
picture){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
[EditorBrowsable(EditorBrowsableState.Advanced)]
protected static DateTime GetTimeFromOADate(double date){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
@@ -462,221 +418,181 @@
#region Public Instance Methods
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public void BeginInit() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
public void DoVerb(int verb){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public virtual void EndInit() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public object GetOcx() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
public bool HasPropertyPages() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public void InvokeEditMode(){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
public void MakeDirty(){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
public override bool PreProcessMessage(ref Message msg) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
public void ShowAboutBox() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
public void ShowPropertyPages() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
public void ShowPropertyPages(Control control) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
#endregion // Public Instance Methods
#region Protected Instance Methods
- [MonoTODO]
protected virtual void AttachInterfaces() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void CreateHandle() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected virtual void CreateSink(){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void DestroyHandle() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected virtual void DetachSink(){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void Dispose(bool disposing) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override bool IsInputChar(char charCode) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void OnBackColorChanged(EventArgs e) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void OnFontChanged(EventArgs e) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void OnForeColorChanged(EventArgs e) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void OnHandleCreated(EventArgs e) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected virtual void OnInPlaceActive() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected override void OnLostFocus(EventArgs e) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override bool ProcessDialogKey(Keys keyData) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override bool ProcessMnemonic(char charCode) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected bool PropsValid(){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseDown(short button, short shift, int
x, int y){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseDown(short button, short shift,
float x, float y){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseDown(object o1, object o2, object
o3, object o4){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseMove(short button, short shift, int
x, int y){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseMove(short button, short shift,
float x, float y){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseMove(object o1, object o2, object
o3, object o4){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseUp(short button, short shift, int x,
int y){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseUp(short button, short shift, float
x, float y){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
protected void RaiseOnMouseUp(object o1, object o2, object o3,
object o4){
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected void SetAboutBoxDelegate(AxHost.AboutBoxDelegate d) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void SetBoundsCore(int x, int y, int width,
int height, BoundsSpecified specified) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void SetVisibleCore(bool value) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
- [MonoTODO]
protected override void WndProc(ref Message m) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
@@ -684,7 +600,6 @@
#region Private Instance Methods
[EditorBrowsable(EditorBrowsableState.Never)]
- [MonoTODO]
private bool ShouldSerializeContainingControl() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
@@ -847,73 +762,61 @@
#region Interfaces
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
AttributeCollection ICustomTypeDescriptor.GetAttributes() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
string ICustomTypeDescriptor.GetClassName() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
string ICustomTypeDescriptor.GetComponentName() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
TypeConverter ICustomTypeDescriptor.GetConverter() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
EventDescriptor ICustomTypeDescriptor.GetDefaultEvent() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
object ICustomTypeDescriptor.GetEditor(Type editorBaseType) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
EventDescriptorCollection ICustomTypeDescriptor.GetEvents() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
EventDescriptorCollection
ICustomTypeDescriptor.GetEvents(Attribute[] attributes) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
PropertyDescriptorCollection
ICustomTypeDescriptor.GetProperties() {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
PropertyDescriptorCollection
ICustomTypeDescriptor.GetProperties(Attribute[] attributes) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
[EditorBrowsable(EditorBrowsableState.Advanced)]
- [MonoTODO]
object
ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd) {
throw new NotImplementedException("COM/ActiveX support
is not implemented");
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ButtonBase.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -338,11 +338,11 @@
#endregion // Public Instance Properties
#region Protected Instance Methods
- [MonoTODO("Finish setting properties of the AccessibleObject")]
protected override AccessibleObject
CreateAccessibilityInstance() {
AccessibleObject ao;
- ao=base.CreateAccessibilityInstance();
- ao.description="Button";
+ ao = base.CreateAccessibilityInstance();
+ ao.description = "Button";
+ ao.role = AccessibleRole.PushButton;
return ao;
}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2005-05-11 04:42:35 UTC (rev 44371)
@@ -1,3 +1,30 @@
+2005-05-10 Peter Bartok <[EMAIL PROTECTED]>
+
+ * AccessibleObject.cs:
+ - Removed MonoTODO attribute on help, method is correct
+ - Fixed Bounds property
+ * AxHost.cs: Moved MonoTODO
+ * ButtonBase.cs: Now setting AccessibleObject properties
+ * RadioButton.cs: Setting proper AccessibleObject role
+ * CheckBox.cs: Setting proper AccessibleObject role
+ * ControlBindingsCollection.cs: Added properties, methods and attributes
+ * DataFormats.cs: Fixed awkward internal API, and changed to enable
+ userdefined DataFormats.Format items as well
+ * ListControl.cs: Removed data_member from the public eye
+ * OpenFileDialog.cs:
+ - Made class sealed
+ - Added missing attributes
+ * SaveFileDialog.cs: Added missing attributes
+ * ImageListStreamer.cs: Fixed code that caused warnings
+ * LinkLabel.cs: Removed unreachable code
+ * TreeView.cs: Fixed code that caused warnings
+ * PropertyGridView.cs: Fixed code that caused warnings
+ * GridColumnStylesCollection.cs: Added missing attributes
+ * GridTableStylesCollection: Added missing attribute
+ * PropertyManager: Added .ctor
+ * SecurityIDType: Added
+ * DataObject.cs: Implemented class
+
2005-05-11 Jordi Mas i Hernandez <[EMAIL PROTECTED]>
* RadioButton.cs: call base method to allow to fire OnClick event
@@ -5,6 +32,7 @@
* CheckedListBox.cs: call base method before returning
* TrackBar.cs: call base method before returning
+
2005-05-10 Peter Bartok <[EMAIL PROTECTED]>
* XplatUIX11.cs: Fix for #74902, check pending timers when peeking
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/CheckBox.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -258,7 +258,12 @@
#region Protected Instance Methods
protected override AccessibleObject
CreateAccessibilityInstance() {
- return base.CreateAccessibilityInstance ();
+ AccessibleObject ao;
+
+ ao = base.CreateAccessibilityInstance ();
+ ao.role = AccessibleRole.CheckButton;
+
+ return ao;
}
protected virtual void OnAppearanceChanged(EventArgs e) {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -26,19 +26,44 @@
using System;
using System.Collections;
using System.ComponentModel;
+using System.Reflection;
namespace System.Windows.Forms {
-
+ [DefaultEvent("CollectionChanged")]
+ [Editor("System.Drawing.Design.UITypeEditor, System.Drawing,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a",
typeof(System.Drawing.Design.UITypeEditor))]
+ [TypeConverter("System.Windows.Forms.Design.ControlBindingsConverter,
System.Design, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a")]
public class ControlBindingsCollection : BindingsCollection {
-
+ #region Fields
private Control control;
+ #endregion // Fields
- internal ControlBindingsCollection (Control control)
- {
+ #region Constructors
+ internal ControlBindingsCollection (Control control) {
this.control = control;
}
+ #endregion // Constructors
+ #region Public Instance Properties
+ public Control Control {
+ get {
+ return control;
+ }
+ }
+
+ public Binding this[string propertyName] {
+ get {
+ foreach (Binding b in base.List) {
+ if (b.PropertyName == propertyName) {
+ return b;
+ }
+ }
+ return null;
+ }
+ }
+ #endregion // Public Instance Properties
+
+ #region Public Instance Methods
public new void Add (Binding binding)
{
AddCore (binding);
@@ -52,6 +77,28 @@
return res;
}
+ public void Clear() {
+ base.Clear();
+ }
+
+ public void Remove(Binding binding) {
+ if (binding == null) {
+ throw new NullReferenceException("The binding
is null");
+ }
+
+ base.Remove(binding);
+ }
+
+ public void RemoveAt(int index) {
+ if (index < 0 || index > base.List.Count) {
+ throw new ArgumentOutOfRangeException("index");
+ }
+
+ base.RemoveAt(index);
+ }
+ #endregion // Public Instance Methods
+
+ #region Protected Instance Methods
protected override void AddCore (Binding binding)
{
if (binding == null)
@@ -63,6 +110,19 @@
binding.SetControl (control);
base.AddCore (binding);
}
+
+ protected override void ClearCore() {
+ base.ClearCore ();
+ }
+
+ protected override void RemoveCore(Binding dataBinding) {
+ if (dataBinding == null) {
+ throw new ArgumentNullException ("dataBinding");
+ }
+
+ base.RemoveCore (dataBinding);
+ }
+ #endregion // Protected Instance Methods
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataFormats.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -35,19 +35,32 @@
#region DataFormats.Format Subclass
public class Format {
#region Local Variables
- private string name;
- private int id;
- private Format next;
+ private static Format formats;
+ private string name;
+ private int id;
+ private Format next;
#endregion Local Variables
#region Public Constructors
public Format(string name, int ID) {
+ Format f;
+
this.name = name;
this.id = ID;
- }
- internal Format(string name, int ID, Format after) :
this(name, ID) {
- after.next = this;
+ lock (typeof(DataFormats.Format)) {
+ if (formats == null) {
+ formats = this;
+ } else {
+ // Insert into the list of
known/defined formats
+ f = formats;
+
+ while (f.next != null) {
+ f = f.next;
+ }
+ f.next = this;
+ }
+ }
}
#endregion // Public Constructors
@@ -66,14 +79,44 @@
#endregion // Public Instance Properties
#region Private Methods
- internal static Format Find(Format f, int id) {
+ internal static Format Add(string name) {
+ Format f;
+
+ f = Find(name);
+ if (f == null) {
+ IntPtr cliphandle;
+
+ cliphandle = XplatUI.ClipboardOpen();
+ f = new Format(name,
XplatUI.ClipboardGetID(cliphandle, name));
+ XplatUI.ClipboardClose(cliphandle);
+ }
+ return f;
+ }
+
+ internal static Format Add(int id) {
+ Format f;
+
+ f = Find(id);
+ if (f == null) {
+ f = new Format("Format"+id.ToString(),
id);
+ }
+ return f;
+ }
+
+ internal static Format Find(int id) {
+ Format f;
+
+ f = formats;
while ((f != null) && (f.Id != id)) {
f = f.next;
}
return f;
}
- internal static Format Find(Format f, string name) {
+ internal static Format Find(string name) {
+ Format f;
+
+ f = formats;
while ((f != null) && (!f.Name.Equals(name))) {
f = f.next;
}
@@ -86,7 +129,6 @@
#region Local Variables
private static bool initialized = false;
- private static Format formats;
#endregion // Local Variables
#region Constructors
@@ -124,15 +166,17 @@
Initialize();
}
- return Format.Find(formats, ID);
+ return Format.Find(ID);
}
public static Format GetFormat(string format) {
+ Format f;
+
if (!initialized) {
Initialize();
}
- return Format.Find(formats, format);
+ return Format.Add(format);
}
#endregion // Public Static Methods
@@ -140,33 +184,31 @@
private static void Initialize() {
lock (typeof(DataFormats.Format)) {
if (!initialized) {
- Format f;
IntPtr cliphandle;
+ new Format(Text, 1);
+ new Format(Bitmap, 2);
+ new Format(MetafilePict, 3);
+ new Format(SymbolicLink, 4);
+ new Format(Dif, 5);
+ new Format(Tiff, 6);
+ new Format(OemText, 7);
+ new Format(Dib, 8);
+ new Format(Palette, 9);
+ new Format(PenData, 10);
+ new Format(Riff, 11);
+ new Format(WaveAudio, 12);
+ new Format(UnicodeText, 13);
+ new Format(EnhancedMetafile, 14);
+ new Format(FileDrop, 15);
+ new Format(Locale, 16);
+
cliphandle = XplatUI.ClipboardOpen();
- formats = new DataFormats.Format(Text,
1);
- f = new Format(Bitmap, 2, formats);
- f = new Format(MetafilePict, 3, f);
- f = new Format(SymbolicLink, 4, f);
- f = new Format(Dif, 5, f);
- f = new Format(Tiff, 6, f);
- f = new Format(OemText, 7, f);
- f = new Format(Dib, 8, f);
- f = new Format(Palette, 9, f);
- f = new Format(PenData, 10, f);
- f = new Format(Riff, 11, f);
- f = new Format(WaveAudio, 12, f);
- f = new Format(UnicodeText, 13, f);
- f = new Format(EnhancedMetafile, 14, f);
- f = new Format(FileDrop, 15, f);
- f = new Format(Locale, 16, f);
-
- f = new Format(CommaSeparatedValue,
XplatUI.ClipboardGetID(cliphandle, CommaSeparatedValue), f);
- f = new Format(Html,
XplatUI.ClipboardGetID(cliphandle, Html), f);
- f = new Format(Rtf,
XplatUI.ClipboardGetID(cliphandle, Rtf), f);
- f = new Format(Serializable,
XplatUI.ClipboardGetID(cliphandle, Serializable), f);
- f = new Format(StringFormat,
XplatUI.ClipboardGetID(cliphandle, StringFormat), f);
-
+ new Format(CommaSeparatedValue,
XplatUI.ClipboardGetID(cliphandle, CommaSeparatedValue));
+ new Format(Html,
XplatUI.ClipboardGetID(cliphandle, Html));
+ new Format(Rtf,
XplatUI.ClipboardGetID(cliphandle, Rtf));
+ new Format(Serializable,
XplatUI.ClipboardGetID(cliphandle, Serializable));
+ new Format(StringFormat,
XplatUI.ClipboardGetID(cliphandle, StringFormat));
XplatUI.ClipboardClose(cliphandle);
}
Added: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/DataObject.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -0,0 +1,278 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+//
+// Authors:
+// Peter Bartok ([EMAIL PROTECTED])
+//
+//
+
+// COMPLETE
+
+using System;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace System.Windows.Forms {
+ [ClassInterface(ClassInterfaceType.None)]
+ public class DataObject : IDataObject {
+ #region DataObject.Entry Class
+ private class Entry {
+ #region Local Variables
+ private static Entry entries;
+ private string type;
+ private object data;
+ private bool autoconvert;
+ private Entry next;
+ #endregion // Local Variables
+
+ #region Constructors
+ internal Entry(string type, object data, bool
autoconvert) {
+ Entry e;
+
+ this.type = type;
+ this.data = data;
+ this.autoconvert = autoconvert;
+
+ lock (typeof(DataObject.Entry)) {
+ if (entries == null) {
+ entries = this;
+ } else {
+ // Insert into the list of
known/defined formats
+ e = entries;
+
+ while (e.next != null) {
+ e = e.next;
+ }
+ e.next = this;
+ }
+ }
+ }
+ #endregion // Constructors
+
+ #region Properties
+ public static int Count {
+ get {
+ int result;
+ Entry e;
+
+ result = 0;
+ e = entries;
+
+ while (e != null) {
+ result++;
+ e = e.next;
+ }
+
+ return result;
+ }
+ }
+
+ public object Data {
+ get {
+ return data;
+ }
+ }
+ #endregion // Properties
+
+ #region Methods
+ public static Entry Find(string type) {
+ Entry e;
+
+ e = entries;
+ while (e != null) {
+ if (e.type.Equals(type)) {
+ return e;
+ }
+ e = e.next;
+ }
+
+ return null;
+ }
+
+ public static Entry FindConvertible(string type) {
+ Entry e;
+
+ e = Find(type);
+ if (e != null) {
+ return e;
+ }
+
+ e = entries;
+ while (e != null) {
+ if (type == DataFormats.Text) {
+ if (e.type ==
DataFormats.UnicodeText) {
+ return e;
+ }
+ } else if (type ==
DataFormats.UnicodeText) {
+ if (e.type == DataFormats.Text)
{
+ return e;
+ }
+ } else if (type ==
DataFormats.StringFormat) {
+ if (e.type == DataFormats.Text)
{
+ return e;
+ } else if (e.type ==
DataFormats.UnicodeText) {
+ return e;
+ }
+ }
+ e = e.next;
+ }
+
+ return null;
+ }
+
+ public static string[] Entries(bool convertible) {
+ Entry e;
+ ArrayList list;
+ string[] result;
+
+ // Initially store into something that we can
grow easily
+ list = new ArrayList(Entry.Count);
+ e = entries;
+
+ while (e != null) {
+ list.Add(e.type);
+ e = e.next;
+ }
+
+ if (convertible) {
+ // Add the convertibles
+ if ((Entry.Find(DataFormats.Text) !=
null) && (Entry.Find(DataFormats.UnicodeText) == null)) {
+
list.Add(DataFormats.UnicodeText);
+ }
+
+ if ((Entry.Find(DataFormats.Text) ==
null) && (Entry.Find(DataFormats.UnicodeText) != null)) {
+ list.Add(DataFormats.Text);
+ }
+
+ if (((Entry.Find(DataFormats.Text) !=
null) || (Entry.Find(DataFormats.UnicodeText) != null)) &&
(Entry.Find(DataFormats.StringFormat) == null)) {
+
list.Add(DataFormats.StringFormat);
+ }
+ }
+
+ // Copy the results into a string array
+ result = new string[list.Count];
+ for (int i = 0; i < list.Count; i++) {
+ result[i] = (string)list[i];
+ }
+
+ return result;
+ }
+ #endregion // Methods
+ }
+ #endregion // DataObject.Entry class
+
+ #region Local Variables
+ #endregion // Local Variables
+
+ #region Public Constructors
+ public DataObject() {
+ }
+
+ public DataObject(object data) {
+ SetData(data);
+ }
+
+ public DataObject(string format, object data) {
+ SetData(format, data);
+ }
+ #endregion // Public Constructors
+
+ #region Public Instance Properties
+ public virtual object GetData(string format) {
+ return GetData(format, true);
+ }
+
+ public virtual object GetData(string format, bool autoConvert) {
+ if (autoConvert) {
+ return Entry.FindConvertible(format).Data;
+ } else {
+ return Entry.Find(format).Data;
+ }
+ }
+
+ public virtual object GetData(Type format) {
+ return GetData(format.FullName, true);
+ }
+
+ public virtual bool GetDataPresent(string format) {
+ return GetDataPresent(format, true);
+ }
+
+ public virtual bool GetDataPresent(string format, bool
autoConvert) {
+ if (autoConvert) {
+ return Entry.FindConvertible(format) != null;
+ } else {
+ return Entry.Find(format) != null;
+ }
+ }
+
+ public virtual bool GetDataPresent(Type format) {
+ return GetDataPresent(format.FullName, true);
+ }
+
+ public virtual string[] GetFormats() {
+ return GetFormats(true);
+ }
+
+ public virtual string[] GetFormats(bool autoConvert) {
+ return Entry.Entries(autoConvert);
+ }
+
+ public virtual void SetData(object data) {
+ SetData(data.GetType(), data);
+ }
+
+ public virtual void SetData(string format, bool autoConvert,
object data) {
+ new DataObject.Entry(format, data, autoConvert);
+ }
+
+ public virtual void SetData(string format, object data) {
+ SetData(format, true, data);
+ }
+
+ public virtual void SetData(Type format, object data) {
+ SetData(EnsureFormat(format), true, data);
+ }
+ #endregion // Public Instance Properties
+
+ #region Public Instance Methods
+ #endregion // Public Instance Methods
+
+ #region Private Methods
+ internal string EnsureFormat(string name) {
+ DataFormats.Format f;
+
+ f = DataFormats.Format.Find(name);
+ if (f == null) {
+ // Register the format
+ f = DataFormats.Format.Add(name);
+ }
+
+ return f.Name;
+ }
+
+ internal string EnsureFormat(Type type) {
+ return EnsureFormat(type.FullName);
+ }
+
+ #endregion // Private Methods
+ }
+}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -29,6 +29,8 @@
namespace System.Windows.Forms
{
+ [Editor("System.Windows.Forms.Design.DataGridColumnCollectionEditor, "
+ Consts.AssemblySystem_Design, typeof(System.Drawing.Design.UITypeEditor))]
+ [ListBindable(false)]
public class GridColumnStylesCollection : BaseCollection, IList
{
private ArrayList items;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -29,6 +29,7 @@
namespace System.Windows.Forms
{
+ [ListBindable(false)]
public class GridTableStylesCollection : BaseCollection, IList
{
private ArrayList items;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -77,20 +77,20 @@
MemoryStream stream = new MemoryStream (decompressed);
BinaryReader reader = new BinaryReader (stream);
- IntPtr hbmMask = IntPtr.Zero;
- IntPtr hbmColor= IntPtr.Zero;
+ // IntPtr hbmMask = IntPtr.Zero;
+ // IntPtr hbmColor= IntPtr.Zero;
try {
// read image list header
- ushort usMagic = reader.ReadUInt16 ();
- ushort usVersion = reader.ReadUInt16 ();
+ reader.ReadUInt16 (); // usMagic
+ reader.ReadUInt16 (); // usVersion
ushort cCurImage = reader.ReadUInt16 ();
- ushort cMaxImage = reader.ReadUInt16 ();
- ushort cGrow = reader.ReadUInt16 ();
+ reader.ReadUInt16 (); // cMaxImage
+ reader.ReadUInt16 (); // cGrow
ushort cx = reader.ReadUInt16 ();
ushort cy = reader.ReadUInt16 ();
uint bkcolor = reader.ReadUInt32 ();
- ushort flags = reader.ReadUInt16 ();
+ reader.ReadUInt16 (); // flags
short [] ovls = new short [4];
for (i = 0; i < ovls.Length; i++)
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/LinkLabel.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -567,7 +567,6 @@
} else {
return link_font;
}
- break;
}
case LinkBehavior.HoverUnderline:
{
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ListControl.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -39,7 +39,7 @@
private object data_source;
private BindingMemberInfo value_member;
private string display_member;
- protected CurrencyManager data_manager;
+ private CurrencyManager data_manager;
protected ListControl ()
{
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -17,7 +17,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-// Copyright (c) 2004 Novell, Inc. (http://www.novell.com)
+// Copyright (c) 2004-2005 Novell, Inc. (http://www.novell.com)
//
// Authors:
//
@@ -27,12 +27,14 @@
// NOT COMPLETE - work in progress
using System;
+using System.ComponentModel;
using System.Drawing;
using System.IO;
namespace System.Windows.Forms
{
- public class OpenFileDialog : FileDialog
+ [Designer("System.Windows.Forms.Design.OpenFileDialogDesigner, " +
Consts.AssemblySystem_Design)]
+ public sealed class OpenFileDialog : FileDialog
{
#region Public Constructors
public OpenFileDialog( )
@@ -54,6 +56,7 @@
#endregion // Public Constructors
#region Public Instance Properties
+ [DefaultValue(true)]
public override bool CheckFileExists
{
get
@@ -67,6 +70,7 @@
}
}
+ [DefaultValue(false)]
public new bool Multiselect
{
get
@@ -80,6 +84,7 @@
}
}
+ [DefaultValue(false)]
public new bool ReadOnlyChecked
{
get
@@ -93,6 +98,7 @@
}
}
+ [DefaultValue(false)]
public new bool ShowReadOnly
{
get
@@ -128,12 +134,6 @@
showReadOnly = false;
ShowReadOnly = showReadOnly;
}
-
- [MonoTODO]
- protected override bool RunDialog( IntPtr hwndOwner )
- {
- return base.RunDialog( hwndOwner );
- }
}
}
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -339,7 +339,8 @@
{
Brush backBrush =
ThemeEngine.Current.ResPool.GetSolidBrush(BackColor);
Brush foreBrush = brush;
- bool selectedItem = false, expandable = false;
+ //bool selectedItem = false, expandable = false;
+
if (grid_item == property_grid.SelectedGridItem){
backBrush =
ThemeEngine.Current.ResPool.GetSolidBrush(ThemeEngine.Current.ColorHilight);
foreBrush =
ThemeEngine.Current.ResPool.GetSolidBrush(ThemeEngine.Current.ColorHilightText);
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyManager.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -35,6 +35,9 @@
private PropertyDescriptor prop_desc;
private bool binding_suspended;
+ public PropertyManager() {
+ }
+
internal PropertyManager (object data_source, string
property_name)
{
this.data_source = data_source;
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/RadioButton.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -272,7 +272,12 @@
#region Protected Instance Methods
protected override AccessibleObject
CreateAccessibilityInstance() {
- return base.CreateAccessibilityInstance ();
+ AccessibleObject ao;
+
+ ao = base.CreateAccessibilityInstance ();
+ ao.role = AccessibleRole.RadioButton;
+
+ return ao;
}
protected virtual void OnCheckedChanged(EventArgs e) {
Modified:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -27,11 +27,13 @@
// NOT COMPLETE - work in progress
using System;
+using System.ComponentModel;
using System.Drawing;
using System.IO;
namespace System.Windows.Forms
{
+ [Designer("System.Windows.Forms.Design.SaveFileDialogDesigner, " +
Consts.AssemblySystem_Design)]
public sealed class SaveFileDialog : FileDialog
{
#region Public Constructors
@@ -52,6 +54,7 @@
#endregion // Public Constructors
#region Public Instance Properties
+ [DefaultValue(false)]
public new bool CreatePrompt
{
set
@@ -65,6 +68,7 @@
}
}
+ [DefaultValue(true)]
public new bool OverwritePrompt
{
set
@@ -108,12 +112,6 @@
OverwritePrompt = overwritePrompt;
CreatePrompt = createPrompt;
}
-
- [MonoTODO]
- protected override bool RunDialog( IntPtr hwndOwner )
- {
- return base.RunDialog( hwndOwner );
- }
}
}
Added:
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SecurityIDType.cs
===================================================================
---
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SecurityIDType.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/SecurityIDType.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -0,0 +1,41 @@
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (c) 2005 Novell, Inc. (http://www.novell.com)
+//
+// Authors:
+// Peter Bartok ([EMAIL PROTECTED])
+//
+//
+
+// COMPLETE
+
+namespace System.Windows.Forms {
+ public enum SecurityIDType {
+ User = 1,
+ Group = 2,
+ Domain = 3,
+ Alias = 4,
+ WellKnownGroup = 5,
+ DeletedAccount = 6,
+ Invalid = 7,
+ Unknown = 8,
+ Computer = 9
+ }
+}
Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2005-05-11 04:36:38 UTC (rev 44370)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/TreeView.cs
2005-05-11 04:42:35 UTC (rev 44371)
@@ -725,7 +725,7 @@
// Decide if we need a scrollbar
int old_open_node_count = open_node_count;
- Rectangle fill = ClientRectangle;
+ //Rectangle fill = ClientRectangle;
add_vscroll = false;
add_hscroll = false;
@@ -841,8 +841,8 @@
private void DrawNodeImage (TreeNode node, Graphics dc,
Rectangle clip, int x, int y)
{
- Rectangle r = new Rectangle (x, y + 2,
ImageList.ImageSize.Width,
- ImageList.ImageSize.Height);
+ // Rectangle r = new Rectangle (x, y + 2,
ImageList.ImageSize.Width, ImageList.ImageSize.Height);
+
if (!RectsIntersect (clip, x, y + 2,
ImageList.ImageSize.Width, ImageList.ImageSize.Height))
return;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
