# Patch created by marioluca
# Date: Fri Aug  1 16:09:12 CEST 2003
# Repository: pnetlib
# Comments:
# 
# ----------------------------------------------------------------------
# Implementation of RadioButton class.
# Note that FlatStyle.Flat and FlatStyle.Popup are correct only with
# Appearance.Normal setting since DrawButton(...) does not handle Flat
# styles.
# 
# Modified Files:
#    System.Windows.Forms/RadioButton.cs
#    System.Windows.Forms/Themes/DefaultThemePainter.cs
#    samples/samples.build
# New Files:
#    samples/radiobuttons.cs
# ----------------------------------------------------------------------
#### End of Preamble ####

#### Patch data follows ####
Index: System.Windows.Forms/RadioButton.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/RadioButton.cs,v
retrieving revision 1.1
diff -c -r1.1 RadioButton.cs
*** System.Windows.Forms/RadioButton.cs	30 Jul 2003 17:15:14 -0000	1.1
--- System.Windows.Forms/RadioButton.cs	1 Aug 2003 14:01:20 -0000
***************
*** 1,8 ****
  /*
   * RadioButton.cs - Implementation of the
!  *		"System.Windows.Forms.RichTextBoxFinds" class.
   *
!  * Copyright (C) 2003  Neil Cawse.
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
--- 1,11 ----
  /*
   * RadioButton.cs - Implementation of the
!  *			"System.Windows.Forms.RadioButton" class.
   *
!  * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
!  *
!  * Contributions from Mario Luca Bernardi
!  * ContentAligment code from Simon Guidon
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
***************
*** 18,182 ****
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  
  namespace System.Windows.Forms
  {
  
! using System.Drawing;
! using System.ComponentModel;
  
!     public class RadioButton : ButtonBase {
  
! 		Appearance appearance;
! 		bool       autoCheck;
! 		ContentAlignment checkAlign;
! 		bool       checked_;
  
! 		public RadioButton()
  		{
! 			appearance = Appearance.Normal;
! 			autoCheck  = true;
! 			checkAlign = ContentAlignment.MiddleLeft;
! 			checked_   = false;
! 			TextAlign  = ContentAlignment.MiddleLeft;			
  		}
! 
! 		public Appearance Appearance
  		{
! 			get
  			{
! 				return appearance;
  			}
  
! 			set
  			{
! 				if ( !Enum.IsDefined ( typeof(Appearance), value ) )
! 					throw new InvalidEnumArgumentException( "Appearance", (int)value, typeof(Appearance));
  
! 				if ( appearance != value ) {
! 					appearance = value;
! 					
! 					if ( IsHandleCreated )
! 						;
  
! 					if ( AppearanceChanged != null )
! 						AppearanceChanged ( this, EventArgs.Empty );
  				}
  			}
- 		}
  
! 		public bool AutoCheck {
! 			get
  			{
! 				return autoCheck;
  			}
! 			set
  			{
! 				if ( autoCheck != value )
  				{
! 					autoCheck = value;
  
! 					if ( IsHandleCreated )
! 						;
  				}
  			}
- 		}
  
! 		public ContentAlignment CheckAlign {
! 			get
  			{
! 				return checkAlign;
  			}
! 			set
  			{
! 				if ( !Enum.IsDefined ( typeof(ContentAlignment), value ) )
! 					throw new InvalidEnumArgumentException( "CheckAlign", (int)value, typeof(Appearance));
  
! 				if ( checkAlign != value ) {
! 					;
  				}
  			}
  		}
  
! 		public bool Checked {
! 			get 
  			{
! 				return checked_;
  			}
  
! 			set
  			{
! 				if ( checked_ != value )
  				{
! 					checked_ = value;
! 
! 					UpdateCheck();
! 					OnCheckedChanged (EventArgs.Empty);
  				}
  			}
! 		}
  
! 		public override ContentAlignment TextAlign {
! 			get
  			{
! 				return base.TextAlign;
  			}
! 			
! 			set
  			{
! 				base.TextAlign = value;
  			}
- 		}
  
! 		public void PerformClick()
! 		{
! 			Checked = !Checked;
! 			OnClick ( EventArgs.Empty );
! 		}
  
! 		public override string ToString()
! 		{
! 			return GetType().FullName.ToString () + ", Checked: " + Checked.ToString ( );
! 		}
  
- 		public event EventHandler AppearanceChanged;
- 		public event EventHandler CheckedChanged;
  
! 		protected override ImeMode DefaultImeMode {
! 			get {	return ImeMode.Disable;	}
! 		}
  
- 		protected override Size DefaultSize {
- 			get {	return new Size(104,24); }
- 		}
  
! 		protected virtual void OnCheckedChanged(EventArgs e)
! 		{
! 			if ( CheckedChanged != null )
! 				CheckedChanged ( this, e );
! 		}
  
! 		protected override void OnClick(EventArgs e)
! 		{
! 			bool check = Checked;
  
! 			if ( checked_ != check ) {
! 				checked_ = check;
! 				OnCheckedChanged ( EventArgs.Empty );
  			}
  
! 			base.OnClick ( e );
! 		}
  
- 		protected override void OnHandleCreated(EventArgs e)
- 		{
- 			base.OnHandleCreated ( e );
- 			UpdateCheck ( );
- 		}
  
! 		private void UpdateCheck ( ) {
! 			if ( IsHandleCreated )
! 				;
! 		}
! 	 }
! }
--- 21,629 ----
   * along with this program; if not, write to the Free Software
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
+ using System;
+ using System.Drawing;
+ using System.Drawing.Drawing2D;
+ using System.ComponentModel;
+ using System.Windows.Forms;
+ using System.Windows.Forms.Themes;
  
  namespace System.Windows.Forms
  {
  
! public class RadioButton : ButtonBase
! {
! // ---- Private data ----------------------------------------------------// 
! 	private Appearance appearance;
! 	private ContentAlignment checkAlign;
! 	private bool autoCheck;
! 	private CheckState state;
! 	private ImeMode defaultImeMode;
! 	private Size defaultSize;
! 	private bool justreleased;
! 	private int checkX;
! 	private int checkY;
! 	private int checkSize = 13;
! // ---- end of Private data ---------------------------------------------//
! 
! // ---- Public contructors ----------------------------------------------//
! 	public RadioButton()
! 	{
! 	Appearance = Appearance.Normal;
! 	defaultSize = new Size(104, 24);
! 	Size = defaultSize;
! 	checkAlign = ContentAlignment.MiddleLeft;
! 	TextAlign = ContentAlignment.MiddleLeft;
! 	entered=false;
! 	pressed=false;
! 	}
! // ---- end of Public constructors --------------------------------------//
! 
! 
! // ---- Private Methods -------------------------------------------------//
! 	private void Redraw()
! 	{
! 	  // Bail out if the button is not currently visible.
! 	  if(!Visible || !IsHandleCreated)
! 	  {
! 	    return;
! 	  }
! 
! 	  // Redraw the button.
! 	  Graphics graphics = CreateGraphics();
! 	  Draw(graphics);
! 	  graphics.Dispose();
! 	}
! 	
! 	private void DrawPopupRadioButton
! 				(Graphics graphics, int x, int y, int width,
! 				 int height, ButtonState state)
! 			{
  
! 			Color ControlAreaColor = new Color();
! 			Color CheckColor       = new Color();
! 	
! 			if ((state & ButtonState.Flat) == 0 ) {
! 				// Take care of the radio background & border.
! 				// FlatStyle.Popup mouse over effect 
! 
! 				if ((state==ButtonState.Normal)||(state==ButtonState.Checked)) 
! 		    		// ControlLightLight background for ( Normal || Checked )
! 		    		  ControlAreaColor = SystemColors.ControlLightLight;
! 		  		else
! 		    		// ControlLightLight background for everything else
! 		    		  ControlAreaColor = SystemColors.ControlLightLight;	   
! 
! 				Brush brush = new SolidBrush(ControlAreaColor);
! 				graphics.FillEllipse(brush, x+1 , y+1 , width-1 , width-1 );
! 				brush.Dispose();
! 			
! 				Pen mypen = new Pen(SystemColors.ControlLight,1);
! 				graphics.DrawArc(mypen,x+2,y+2,width-2,width-2,30,190);
! 				Pen mypen1 = new Pen(SystemColors.ControlLight,1);
! 				graphics.DrawArc(mypen1,x+2,y+2,width-2,width-2,220,180);	
! 			
! 				Pen mypen2 = new Pen(SystemColors.ControlDark,1);
! 				graphics.DrawArc(mypen2,x+1,y+1,width,width,30,190);
! 				Pen mypen3 = new Pen(SystemColors.ControlLightLight,1);
! 				graphics.DrawArc(mypen3,x+1,y+1,width,width,220,180);
! 				
! 			}			
! 			else
! 			{
! 	 		  // Take care of background & border
! 			  // Flat Popup Style
  
!   		  	state -= ButtonState.Flat; 		  
! 		  	if ((state==ButtonState.Normal)||
! 		  	    (state==ButtonState.Checked)||
! 		  	    (state==ButtonState.Pushed)||
! 		  	    (state==(ButtonState.Checked | ButtonState.Pushed))) 
! 		  	      // ControlLightLight background for ( Normal || Checked )
! 		  	      ControlAreaColor = SystemColors.ControlLightLight;
! 		  	else
! 		    	      // ControlLightLight background for everything else
! 		    	      ControlAreaColor = SystemColors.Control;	    
! 		  	state |= ButtonState.Flat;
! 
! 			Brush clear = new SolidBrush(SystemColors.Control);
! 			graphics.FillEllipse(clear, x-2 , y-2 , width+4 , width+4 );
! 			clear.Dispose();
! 
! 			Brush brush = new SolidBrush(ControlAreaColor);
! 			graphics.FillEllipse(brush, x+1 , y+1 , width-1 , width-1 );
! 			brush.Dispose();
! 
! 			Pen mypen = new Pen(Color.Gray,1);
! 			graphics.DrawArc(mypen,x+1,y+1,width-1,width-1,0,360);
! 			}
! 				
! 			// Take care of the radio's check ( popup style )	
! 			if ((state & ButtonState.Checked)!=0)
! 			{ 
! 			  if (((state & ButtonState.Inactive)!=0)||((state & ButtonState.Pushed)!=0))
! 			   CheckColor=SystemColors.GrayText;
! 			  else
! 			   CheckColor=SystemColors.ControlText;
! 	
! 			 Brush brush = new SolidBrush(CheckColor);
! 			 graphics.FillEllipse(brush, x + 5, y + 5, 5, 5); 
! 			 brush.Dispose();
! 			}
! 	}
! 
! 	
! 	internal new virtual ButtonState CalculateState()
! 	{
! 		ButtonState state = ButtonState.Normal;
! 		
! 		if (this.state == CheckState.Checked){
! 		 state |= ButtonState.Checked;
! 		 if (appearance==appearance.Button)
! 		  state |= ButtonState.Pushed;
! 		}
! 		
! 		if (base.FlatStyle == FlatStyle.Flat) 
! 		    state |= ButtonState.Flat;
! 		if (base.FlatStyle == FlatStyle.Popup)
! 		     state |= ButtonState.Flat;
  
! 		if(Enabled)
  		{
! 		  if(entered && pressed)
! 		  {
! 		    state |= ButtonState.Pushed;
! 		    if (this.FlatStyle == FlatStyle.Popup)
!  		     state -= ButtonState.Flat;
! 		  }
! 		  else if(entered && ((state & ButtonState.Flat)!=0))
! 		  {
! 		    if (this.FlatStyle != FlatStyle.Popup)
! 		     state |= ButtonState.Inactive;
! 		    else
! 		    {
! 		     state -= ButtonState.Flat;
! 		    }
! 		  }
  		}
! 		else
  		{
! 		  state |= ButtonState.Inactive;
! 		}
! 		return state;
! 	  }
! 
! 	internal override void Draw(Graphics graphics)
! 			{
! 				DrawBox(graphics);
! 				DrawText(graphics);
! 			}
! 
! 	private void DrawBox(Graphics graphics)
  			{
! 				int checkX = 0;
! 				int checkY = 0;
! 		
! 				switch (checkAlign)
! 				{
! 					case ContentAlignment.BottomCenter:
! 						checkX = (Width / 2) - (checkSize / 2);
! 						checkY = Height - checkSize - 1;
! 						break;
! 					case ContentAlignment.BottomLeft:
! 						checkX = 0;
! 						checkY = Height - checkSize - 1;
! 						break;
! 					case ContentAlignment.BottomRight:
! 						checkX = Width - checkSize - 1;
! 						checkY = Height - checkSize - 1;
! 						break;
! 					case ContentAlignment.MiddleCenter:
! 						checkX = (Width / 2) - (checkSize / 2);
! 						checkY = (Height / 2) - (checkSize / 2);
! 						break;
! 					case ContentAlignment.MiddleLeft:
! 						checkX = 0;
! 						checkY = (Height / 2) - (checkSize / 2);
! 						break;
! 					case ContentAlignment.MiddleRight:
! 						checkX = Width - checkSize - 1;
! 						checkY = (Height / 2) - (checkSize / 2);
! 						break;
! 					case ContentAlignment.TopCenter:
! 						checkX = (Width / 2) - (checkSize / 2);
! 						checkY = 0;
! 						break;
! 					case ContentAlignment.TopLeft:
! 						checkX = 0;
! 						checkY = 0;
! 						break;
! 					case ContentAlignment.TopRight:
! 						checkX = Width - checkSize - 1;
! 						checkY = 0;
! 						break;
! 				}
! 				
! 				// Calculate ButtonState needed by DrawRadioButton
! 				ButtonState checkState = CalculateState();	
! 				if (appearance == Appearance.Normal) 
! 				 if (this.FlatStyle != FlatStyle.Popup) 
! 				  ThemeManager.MainPainter.DrawRadioButton(graphics, checkX, checkY, checkSize, checkSize, checkState);
! 				 else
! 				  DrawPopupRadioButton(graphics,checkX,checkY,checkSize,checkSize,checkState);
! 				else 
! 		 		 ControlPaint.DrawButton(graphics, 0,0, Size.Width, Size.Height, checkState);
! 			    		 
  			}
  
! 	private void DrawText(Graphics graphics)
  			{
! 				int x = 0;
! 				int y = 2;
! 				int width = Width - 2;
! 				int height = Height - 4;
! 		
! 				SizeF textSize = graphics.MeasureString(Text, Font);
! 				StringFormat format = new StringFormat();
! 				format.Alignment = StringAlignment.Near;
! 				format.LineAlignment = StringAlignment.Far;
  
! 				switch (checkAlign)
! 				{
! 					case ContentAlignment.BottomCenter:
! 						height = checkY + 2;
! 						break;
! 					case ContentAlignment.BottomLeft:
! 						x = checkX + checkSize + 3;
! 						width -= x;
! 						break;
! 					case ContentAlignment.BottomRight:
! 						width -= checkSize;
! 						break;
! 					case ContentAlignment.MiddleCenter:
! 						break;
! 					case ContentAlignment.MiddleLeft:
! 						x = checkX + checkSize + 3;
! 						width -= x;
! 						break;
! 					case ContentAlignment.MiddleRight:
! 						x = checkX + checkSize + 3;
! 						width -= x;
! 						break;
! 					case ContentAlignment.TopCenter:
! 						y = checkY + checkSize + 3;
! 						height -= y - 2;
! 						break;
! 					case ContentAlignment.TopLeft:
! 						x = checkX + checkSize + 3;
! 						width -= x;
! 						break;
! 					case ContentAlignment.TopRight:
! 						width -= checkSize;
! 						break;
! 				}
  
! 				switch (TextAlign)
! 				{
! 					case ContentAlignment.BottomCenter:
! 						format.Alignment = StringAlignment.Center;
! 						format.LineAlignment = StringAlignment.Far;
! 						break;
! 					case ContentAlignment.BottomLeft:
! 						format.Alignment = StringAlignment.Near;
! 						format.LineAlignment = StringAlignment.Far;
! 						break;
! 					case ContentAlignment.BottomRight:
! 						format.Alignment = StringAlignment.Far;
! 						format.LineAlignment = StringAlignment.Far;
! 						break;
! 					case ContentAlignment.MiddleCenter:
! 						format.Alignment = StringAlignment.Center;
! 						format.LineAlignment = StringAlignment.Center;
! 						break;
! 					case ContentAlignment.MiddleLeft:
! 						format.LineAlignment = StringAlignment.Center;
! 						break;
! 					case ContentAlignment.MiddleRight:
! 						format.Alignment = StringAlignment.Far;
! 						format.LineAlignment = StringAlignment.Center;
! 						break;
! 					case ContentAlignment.TopCenter:
! 						format.Alignment = StringAlignment.Center;
! 						format.LineAlignment = StringAlignment.Near;
! 						break;
! 					case ContentAlignment.TopLeft:
! 						format.Alignment = StringAlignment.Near;
! 						format.LineAlignment = StringAlignment.Near;
! 						break;
! 					case ContentAlignment.TopRight:
! 						format.Alignment = StringAlignment.Far;
! 						format.LineAlignment = StringAlignment.Near;
! 						break;
! 				}
! 				Brush brush = new SolidBrush(ForeColor);
! 				if (appearance == Appearance.Button) {
! 				 x-=10;
! 				 ButtonState radiostate = CalculateState();
! 				 if ((radiostate & ButtonState.Pushed)!=0){
! 				  x++;
! 				  y++;
! 				 }
  				}
+ 				Rectangle rect = new Rectangle(x, y, width, height);
+ 				graphics.DrawString(Text, Font, brush, rect, format);
+ 				brush.Dispose();
  			}
  
! 	// Set the radiobutton state - used by the toolkit in response to events.
! 	internal void SetCheckState(CheckState state)
  			{
! 				this.state = state;
  			}
! 
! 	// Get or set the check box state.
! 	private CheckState CheckState
  			{
! 				get
! 				{
! 					return state;
! 				}
! 				set
  				{
! 					if(state != value)
! 					{
! 						state = value;
! 					}
! 				}
! 			}
! 
! // ---- end of Private Methods -----------------------------------------//
  
! 
! // ---- Public Properties ----------------------------------------------//
! 	
! 	// Gets or sets the value that determines the appearance 
! 	// of a check box control.
! 	public Appearance Appearance 
! 			{
! 				get
! 				{
! 					return appearance; 
! 				}
! 				set
! 				{
! 					appearance = value;
  				}
  			}
  
! 	// Get or set the "auto check" style for this check box.
! 	public bool AutoCheck
  			{
! 				get
! 				{
! 					return autoCheck;
! 				}
! 				set
! 				{
! 					if(autoCheck != value)
! 					{
! 						autoCheck = value;
! 					}
! 				}
  			}
! 
! 	// Gets or sets the horizontal and vertical alignment of a check box on a check box control.
! 	public ContentAlignment CheckAlign 
  			{
! 				get
! 				{
! 					return checkAlign;
! 				}
! 				set
! 				{
! 					checkAlign = value;
! 					Invalidate();
! 				}
! 			}
  
! 	// Get or set the checked state as a simple boolean value.
! 	public bool Checked
! 			{
! 				get
! 				{
! 					return (CheckState != CheckState.Unchecked);
! 				}
! 				set
! 				{
! 					if(value)
! 					{
! 						CheckState = CheckState.Checked;
! 					}
! 					else
! 					{
! 						CheckState = CheckState.Unchecked;
! 					}
  				}
  			}
+ 
+ 
+ 	// Gets or sets the site of the control.
+ #if CONFIG_COMPONENT_MODEL
+ 	public override ISite Site 
+ 	{
+ 		get 
+ 		{
+ 			return base.Site;
+ 		}
+ 		set
+ 		{
+ 			base.Site = value;
  		}
+ 	}
+ #endif
  
! 	// Gets or sets the alignment of the text on the RadioButton control.
! 	public override ContentAlignment TextAlign 
  			{
! 				get
! 				{
! 					return base.TextAlign;
! 				}
! 				set
! 				{
! 					base.TextAlign = value;
! 					Invalidate();
! 				}
  			}
  
! // ---- end of Public Properties ---------------------------------------//
! 
! 
! // ---- Public Methods -------------------------------------------------//
! 
! 	public override string ToString()
! 	{
! 	 return GetType().FullName.ToString () + ", Checked: " + Checked.ToString ( );
! 	}
! 
! 
! // ---- end of Public Methods ------------------------------------------//
! 
! 
! // ---- Public Events --------------------------------------------------//
! 
! 	// 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;
! 	
! // ---- end of Public Events -------------------------------------------//
! 
! 
! 
! // ---- Protected Properties -------------------------------------------//
! 
! 	// Gets the required creation parameters when the control handle is 
! 	// created.
! 	protected override CreateParams CreateParams 
  			{
! 				get
  				{
! 					return base.CreateParams;
  				}
  			}
! 	// Gets the default Input Method Editor (IME) mode supported by this control.
! 	protected override ImeMode DefaultImeMode 
! 			{
! 				get
! 				{
! 					return defaultImeMode;
! 				}
! 			}
! 	// Gets the default size of the control.	
! 	protected override Size DefaultSize 
! 			{
! 				get
! 				{
! 					return defaultSize;
! 				}
! 			}
! // ---- end of Protected Propertied ------------------------------------//
! 
  
! // ---- Protected Methods ----------------------------------------------//
! 
! 	// Raises the AppearanceChanged event.
! 	protected virtual void OnAppearanceChanged(EventArgs e)
  			{
! 				if (AppearanceChanged != null)
! 					AppearanceChanged(this, e);
  			}
! 
! 	// Raises the CheckedChanged event.
! 	protected virtual void OnCheckedChanged(EventArgs e)
  			{
! 			if ( CheckedChanged != null )
! 				CheckedChanged ( this, e );
  			}
  
! 	// Raises the Click event.
! 	protected override void OnClick(EventArgs e)
! 			{
! 				base.OnClick(e);
! 			}
  
! 	// Raises the HandleCreated event.
! 	protected override void OnHandleCreated(EventArgs e)
! 			{
! 				base.OnHandleCreated(e);
! 			}
  
  
! 	 // Override MouseEnter event from ButtonBase
! 	 protected override void OnMouseEnter(EventArgs e) {
! 	  entered=true;
! 	  Redraw();
! 	  base.OnMouseEnter(e);
! 	}
! 
! 	// Override MouseLeave event from ButtonBase
! 	protected override void OnMouseLeave(EventArgs e) {
! 	  entered=false;
! 	  Redraw();
! 	  
! 	  base.OnMouseLeave(e);
! 	}
! 
! 	protected override void OnMouseDown(MouseEventArgs e) {
! 	 // Console.WriteLine("CheckBox::OnMouseDown");
! 	  pressed=true;
! 	  Redraw();
! 	  base.OnMouseDown(e);
! 	}
  
  
! 	// Raises the MouseUp event.
! 	protected override void OnMouseUp(MouseEventArgs mevent)
! 			{
! 			pressed=false;
! 			if (state == CheckState.Unchecked)
! 			 {
! 			 state = CheckState.Checked;
! 			 for (int i=0;i<this.Parent.Controls.Count;i++) { 
! 			   RadioButton rb = this.Parent.Controls[i] as RadioButton;
! 			   if ((rb!=null)&&(rb!=this))
! 			    if (rb.CheckState==CheckState.Checked) {
! 			     rb.SetCheckState(CheckState.Unchecked);
! 			     rb.Invalidate();
! 			     }
! 			   }
! 			   this.OnCheckedChanged(mevent);
! 			 }
! 			 Graphics g = CreateGraphics();
! 			 DrawBox(g);
! 			 g.Dispose();
! 			 base.OnMouseUp(mevent);
! 			}
  
! 	// Processes a mnemonic character.
! 	protected override bool ProcessMnemonic(char charCode)
! 			{
! 				return false;
! 			}
  
! 	protected override AccessibleObject CreateAccessibilityInstance()
! 			{
! 				return base.CreateAccessibilityInstance();
  			}
  
! // ---- End of Protected Methods ---------------------------------------//
  
  
! 
! 
! 
! }; // class RadioButton
! 
! }; // namespace System.Windows.Forms
Index: System.Windows.Forms/Themes/DefaultThemePainter.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/System.Windows.Forms/Themes/DefaultThemePainter.cs,v
retrieving revision 1.7
diff -c -r1.7 DefaultThemePainter.cs
*** System.Windows.Forms/Themes/DefaultThemePainter.cs	24 Jul 2003 17:50:22 -0000	1.7
--- System.Windows.Forms/Themes/DefaultThemePainter.cs	1 Aug 2003 14:01:23 -0000
***************
*** 1178,1186 ****
  				(Graphics graphics, int x, int y, int width,
  				 int height, ButtonState state)
  			{
! 				// TODO
  			}
  
  	// Draw a reversible frame.
  	[TODO]
  	public virtual void DrawReversibleFrame
--- 1178,1258 ----
  				(Graphics graphics, int x, int y, int width,
  				 int height, ButtonState state)
  			{
! 
! 			Color ControlAreaColor = new Color();
! 			Color CheckColor       = new Color();
! 	
! 			if ((state & ButtonState.Flat) == 0 ) {
! 				// Take care of the radio background & border.
! 				// Standard Style
! 
! 				if ((state==ButtonState.Normal)||(state==ButtonState.Checked)) 
! 		    		// ControlLightLight background for ( Normal || Checked )
! 		    		  ControlAreaColor = SystemColors.ControlLightLight;
! 		  		else
! 		    		// ControlLightLight background for everything else
! 		    		  ControlAreaColor = SystemColors.ControlLight;	   
! 
! 				Brush brush = new SolidBrush(ControlAreaColor);
! 				graphics.FillEllipse(brush, x + 1, y + 1, width - 1, width - 1);
! 				brush.Dispose();
! 
! 				Pen mypen = new Pen(SystemColors.ControlDarkDark,1);
! 				graphics.DrawArc(mypen,x+2,y+2,width-2,width-2,30,190);
! 				Pen mypen1 = new Pen(SystemColors.ControlLight,1);
! 				graphics.DrawArc(mypen1,x+2,y+2,width-2,width-2,220,180);	
! 			
! 				Pen mypen2 = new Pen(SystemColors.ControlDark,1);
! 				graphics.DrawArc(mypen2,x+1,y+1,width,width,30,190);
! 				Pen mypen3 = new Pen(SystemColors.ControlLightLight,1);
! 				graphics.DrawArc(mypen3,x+1,y+1,width,width,220,180);
! 				
! 			}			
! 			else
! 			{
! 	 		  // Take care of background & border
! 			  // Flat Style
! 
!   		  	state -= ButtonState.Flat; 		  
! 		  	if ((state==ButtonState.Normal)||
! 		  	    (state==ButtonState.Checked)||
! 		  	    (state==ButtonState.Pushed)||
! 		  	    (state==(ButtonState.Checked | ButtonState.Pushed))) 
! 		  	      // ControlLightLight background for ( Normal || Checked )
! 		  	      ControlAreaColor = SystemColors.ControlLightLight;
! 		  	else
! 		    	      // ControlLightLight background for everything else
! 		    	      ControlAreaColor = SystemColors.Control;	    
! 		  	state |= ButtonState.Flat;
! 
! 			Brush brush = new SolidBrush(ControlAreaColor);
! 			graphics.FillEllipse(brush, x + 1, y + 1, width - 1, width - 1);
! 			brush.Dispose();
! 
! 			Pen mypen = new Pen(SystemColors.ControlDarkDark,1);
! 			graphics.DrawArc(mypen,x+1,y+1,width-1,width-1,0,360);
! 
  			}
+ 			
+ 			
+ 			if ((state & ButtonState.Checked)!=0)
+ 			{	  
+ 			  if ((state & ButtonState.Inactive)!=0)
+ 			   CheckColor=SystemColors.ControlText;
+ 			  else
+ 			   CheckColor=SystemColors.ControlText;
+ 	
+ 			 Brush brush = new SolidBrush(CheckColor);
  
+ 			 if ((state & ButtonState.Flat)!=0)
+ 			  graphics.FillEllipse(brush, x + 4, y + 4, 6, 6);
+ 			 else
+ 			  graphics.FillEllipse(brush, x + 5, y + 5, 5, 5); 
+ 			 brush.Dispose();
+ 			
+ 			
+ 			}
+ 	}
  	// Draw a reversible frame.
  	[TODO]
  	public virtual void DrawReversibleFrame
Index: samples/samples.build
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/samples/samples.build,v
retrieving revision 1.14
diff -c -r1.14 samples.build
*** samples/samples.build	30 Jul 2003 16:18:55 -0000	1.14
--- samples/samples.build	1 Aug 2003 14:01:26 -0000
***************
*** 234,245 ****
--- 234,278 ----
  
  			<arg compiler="cscc" value="-Wno-empty-input"/>
  			<arg compiler="cscc" value="-flatin1-charset"/>
+ 			<arg compiler="cscc" value="-g"/>
  			<arg compiler="csc" value="/nowarn:626"/>
  			<arg compiler="csc" value="/nowarn:649"/>
  			<arg compiler="csc" value="/nowarn:168"/>
  			<arg compiler="csc" value="/nowarn:67"/>
  			<arg compiler="csc" value="/nowarn:169"/>
  		</compile>
+ 		
+ 		<!-- Build the radiobuttons.exe program -->
+ 		<compile output="radiobuttons.exe"
+ 				 target="exe"
+ 				 unsafe="true"
+ 				 nostdlib="true"
+ 				 optimize="true"
+ 				 debug="true">
+ 
+ 			<sources>
+ 				<includes if="${CONFIG_REFLECTION}" name="radiobuttons.cs"/>
+ 				<file name="dummy.cs"/>
+ 			</sources>
+ 
+ 			<references>
+ 				<includes if="${CONFIG_REFLECTION}" name="../System.Windows.Forms/System.Windows.Forms.dll"/>
+ 				<includes if="${CONFIG_REFLECTION}" name="../compat/Accessibility.dll"/>
+ 				<includes if="${CONFIG_REFLECTION}" name="../System.Drawing/System.Drawing.dll"/>
+ 				<includes if="${CONFIG_REFLECTION}" name="../System/System.dll"/>
+ 				<includes if="${CONFIG_REFLECTION}" name="../DotGNU.SSL/DotGNU.SSL.dll"/>
+ 				<file name="../runtime/mscorlib.dll"/>
+ 			</references>
+ 
+ 			<arg compiler="cscc" value="-Wno-empty-input"/>
+ 			<arg compiler="csc" value="/nowarn:626"/>
+ 			<arg compiler="csc" value="/nowarn:649"/>
+ 			<arg compiler="csc" value="/nowarn:168"/>
+ 			<arg compiler="csc" value="/nowarn:67"/>
+ 			<arg compiler="csc" value="/nowarn:169"/>
+ 		</compile>
+ 
+ 		
  		<!-- Build the CustomControl.exe program -->
  		<compile output="CustomControl.exe"
  				 target="exe"
Index: samples/radiobuttons.cs
===================================================================
*** /dev/null	Thu Jan  1 01:00:00 1970
--- samples/radiobuttons.cs	Fri Aug  1 16:05:21 2003
***************
*** 0 ****
--- 1,117 ----
+ /*
+  * FormsHello.cs - Sample program for Forms.
+  *
+  * Copyright (C) 2003  Southern Storm Software, Pty Ltd.
+  *
+  * This program is free software, you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY, without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program, if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+  */
+ 
+ using System;
+ using System.Drawing;
+ using System.Drawing.Drawing2D;
+ using System.Windows.Forms;
+ 
+ public class FormsHello : Form
+ {
+ 	private Button button;
+ 	private ProgressBar progress;
+ 	private int msgNum;
+ 	private RadioButton aCheckBox;
+ 	private RadioButton[] arrCB = new RadioButton[10];
+ 	
+ 	private FormsHello()
+ 	{
+ 		// Force the entire form to repaint when it is resized.
+ 		SetStyle(ControlStyles.ResizeRedraw, true);
+ 
+ 		// Create a button control on the form.
+ 		button = new Button();
+ 		button.Text = "Kill Me!";
+ 		button.Location = new Point(150, 220);
+ 		Controls.Add(button);
+ 	
+ 		aCheckBox = new RadioButton();
+ 		aCheckBox.Location = new Point(10,10);
+ 		aCheckBox.Size = new Size(300,20);
+ 		aCheckBox.Text = "Appearance Normal , No FlatStyle";
+ 		Controls.Add(aCheckBox);
+ 
+ 		arrCB[0] = new RadioButton();
+ 		arrCB[0].Location = new Point(10,40);
+ 		arrCB[0].Size = new Size(300,20);
+ 		arrCB[0].Text = "Apearance Normal , FlatStyle.Popup";
+ 		arrCB[0].FlatStyle=FlatStyle.Popup;
+ 		Controls.Add(arrCB[0]);
+ 
+ 		arrCB[1] = new RadioButton();
+ 		arrCB[1].Location = new Point(10,70);
+ 		arrCB[1].Size = new Size(300,20);
+ 		arrCB[1].Text = "Appearance Normal , FlatStyle.Flat";
+ 		arrCB[1].FlatStyle=FlatStyle.Flat;
+ 		Controls.Add(arrCB[1]);
+ 
+ 		arrCB[2] = new RadioButton();
+ 		arrCB[2].Location = new Point(10,100);
+ 		arrCB[2].Size = new Size(300,20);
+ 		arrCB[2].Text = "Apearance Button , FlatStyle.Popup";
+ 		arrCB[2].Appearance=Appearance.Button;
+ 		arrCB[2].FlatStyle=FlatStyle.Popup;
+ 		Controls.Add(arrCB[2]);
+ 
+ 		arrCB[3] = new RadioButton();
+ 		arrCB[3].Location = new Point(10,130);
+ 		arrCB[3].Size = new Size(300,20);
+ 		arrCB[3].Text = "Appearance Button , FlatStyle.Flat";
+ 		arrCB[3].Appearance=Appearance.Button;
+ 		arrCB[3].FlatStyle=FlatStyle.Flat;
+ 		Controls.Add(arrCB[3]);
+ 
+ 		arrCB[4] = new RadioButton();
+ 		arrCB[4].Location = new Point(10,160);
+ 		arrCB[4].Size = new Size(300,20);
+ 		arrCB[4].Text = "Appearance Button , FlatStyle.Standard";
+ 		arrCB[4].Appearance=Appearance.Button;
+ 		arrCB[4].FlatStyle=FlatStyle.Standard;
+ 		Controls.Add(arrCB[4]);
+ 
+ 		// Hook up interesting events.
+ 		Paint += new PaintEventHandler(HandlePaint);
+ 		button.Click += new EventHandler(HandleClick);
+ 	}
+ 
+ 	private void HandlePaint(Object sender, PaintEventArgs e)
+ 	{
+ 		Graphics graphics = e.Graphics;
+ 		Form form = (sender as Form);
+ 	}
+ 
+ 	private static readonly String[] Messages = {
+ 		"The OnClick Event was Processed"
+ 	};
+ 
+ 	private void HandleClick(Object sender, EventArgs e)
+ 	{
+ 		Application.Exit();
+ 	}
+ 
+ 	public static void Main(String[] args)
+ 	{
+ 		FormsHello form = new FormsHello();
+ 		form.Width = 400;
+ 		form.Height = 250;
+ 		form.Text = "RadioButtons example";
+ 		Application.Run(form);
+ 	}
+ }
#### End of Patch data ####