[Dotgnu-pnet-commits] pnetlib/System.Windows.Forms RadioButton.cs, 1.4, 1.5

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms
In directory subversions:/tmp/cvs-serv29580/System.Windows.Forms

Modified Files:
        RadioButton.cs 
Log Message:


Fix some drawing/logic bugs in "RadioButton".


Index: RadioButton.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/RadioButton.cs,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** RadioButton.cs      21 Nov 2003 06:47:35 -0000      1.4
--- RadioButton.cs      21 Nov 2003 12:05:12 -0000      1.5
***************
*** 385,391 ****
        protected virtual void OnAppearanceChanged(EventArgs e)
                        {
!                               if (AppearanceChanged != null)
                                {
!                                       AppearanceChanged(this, e);
                                }
                        }
--- 385,393 ----
        protected virtual void OnAppearanceChanged(EventArgs e)
                        {
!                               EventHandler handler;
!                               handler = 
(EventHandler)(GetHandler(EventId.AppearanceChanged));
!                               if(handler != null)
                                {
!                                       handler(this, e);
                                }
                        }
***************
*** 394,400 ****
        protected virtual void OnCheckedChanged(EventArgs e)
                        {
!                               if (CheckedChanged != null)
                                {
!                                       CheckedChanged(this, e);
                                }
                        }
--- 396,404 ----
        protected virtual void OnCheckedChanged(EventArgs e)
                        {
!                               EventHandler handler;
!                               handler = 
(EventHandler)(GetHandler(EventId.CheckedChanged));
!                               if(handler != null)
                                {
!                                       handler(this, e);
                                }
                        }
***************
*** 453,458 ****
        protected override void OnMouseUp(MouseEventArgs e)
                        {
                                pressed = false;
!                               OnClick(EventArgs.Empty);
                                base.OnMouseUp(e);
                        }
--- 457,466 ----
        protected override void OnMouseUp(MouseEventArgs e)
                        {
+                               bool clicked = (entered && pressed);
                                pressed = false;
!                               if(clicked)
!                               {
!                                       OnClick(EventArgs.Empty);
!                               }
                                base.OnMouseUp(e);
                        }
***************
*** 477,491 ****
                        }
  
- 
- 
- 
- 
- 
- 
        // Occurs when the value of the Appearance property changes.
!       public event EventHandler AppearanceChanged;
  
        // Occurs when the value of the Checked property changes.
!       public event EventHandler CheckedChanged;
  
  }; // class RadioButton
--- 485,513 ----
                        }
  
        // Occurs when the value of the Appearance property changes.
!       public event EventHandler AppearanceChanged
!                       {
!                               add
!                               {
!                                       AddHandler(EventId.AppearanceChanged, 
value);
!                               }
!                               remove
!                               {
!                                       
RemoveHandler(EventId.AppearanceChanged, value);
!                               }
!                       }
  
        // Occurs when the value of the Checked property changes.
!       public event EventHandler CheckedChanged
!                       {
!                               add
!                               {
!                                       AddHandler(EventId.CheckedChanged, 
value);
!                               }
!                               remove
!                               {
!                                       RemoveHandler(EventId.CheckedChanged, 
value);
!                               }
!                       }
  
  }; // class RadioButton