* LinkLabel.cs: fix up compiler warnings.
* TableLayoutSettings.cs: same.
* TreeView.cs: same.
* ToolBar.cs: same.
* TabControl.cs: same.
* RichTextBox.cs: same.
* ListViewItem.cs: same.
* PropertyGrid.cs: same.
* DataGridViewRowPostPaintEventArgs.cs: corcompare fix.
* ToolTip.cs same.
* TextRenderer.cs: fix up compiler warnings.
* Label.cs: same.
* Form.cs: corcompare fixes.
* PictureBox.cs: fix up compiler warnings.
* ImageListStreamer.cs: same.
* TrackBar.cs: corcompare fix.
* Control.cs: fix up compiler warnings.
* SplitterPanel.cs: same.
* NumericTextBox.cs: same.
* ImageList.cs: same.
* StatusStrip.cs: same.
* ProgressBar.cs: corcompare fix.
* ToolStripButton.cs: fix up compiler warnings.
* ToolStripStatusLabel.cs: same.
* ToolStripSplitButton.cs: same.
* ToolStripSeparator.cs: same.
* ToolStripProgressBar.cs: same.
* ToolStripDropDownMenu.cs: same
* ToolStripDropDown.cs: same.
* ToolStripDropDownButton.cs: same.
* ToolStrip.cs: same.
* ToolStripControlHost.cs: same.
* ToolStripContentPanel.cs: same.
* ToolStripDropDown.cs: same.
* ToolStripContainer.cs: same.
* ToolStripPanel.cs: same, and add "new" where we need it to work
with the new ArrangedElementCollection.
* ToolStripItemCollection.cs: add "new" where we need it to work
with the new ArrangedElementCollection.
svn path=/trunk/mcs/; revision=69012
+2006-12-04 Chris Toshok <toshok@ximian.com>
+
+ * LinkLabel.cs: fix up compiler warnings.
+
+ * TableLayoutSettings.cs: same.
+
+ * TreeView.cs: same.
+
+ * ToolBar.cs: same.
+
+ * TabControl.cs: same.
+
+ * RichTextBox.cs: same.
+
+ * ListViewItem.cs: same.
+
+ * PropertyGrid.cs: same.
+
+ * DataGridViewRowPostPaintEventArgs.cs: corcompare fix.
+
+ * ToolTip.cs same.
+
+ * TextRenderer.cs: fix up compiler warnings.
+
+ * Label.cs: same.
+
+ * Form.cs: corcompare fixes.
+
+ * PictureBox.cs: fix up compiler warnings.
+
+ * ImageListStreamer.cs: same.
+
+ * TrackBar.cs: corcompare fix.
+
+ * Control.cs: fix up compiler warnings.
+
+ * SplitterPanel.cs: same.
+
+ * NumericTextBox.cs: same.
+
+ * ImageList.cs: same.
+
+ * StatusStrip.cs: same.
+
+ * ProgressBar.cs: corcompare fix.
+
+ * ToolStripButton.cs: fix up compiler warnings.
+
+ * ToolStripStatusLabel.cs: same.
+
+ * ToolStripSplitButton.cs: same.
+
+ * ToolStripSeparator.cs: same.
+
+ * ToolStripProgressBar.cs: same.
+
+ * ToolStripDropDownMenu.cs: same
+
+ * ToolStripDropDown.cs: same.
+
+ * ToolStripDropDownButton.cs: same.
+
+ * ToolStrip.cs: same.
+
+ * ToolStripControlHost.cs: same.
+
+ * ToolStripContentPanel.cs: same.
+
+ * ToolStripDropDown.cs: same.
+
+ * ToolStripContainer.cs: same.
+
+ * ToolStripPanel.cs: same, and add "new" where we need it to work
+ with the new ArrangedElementCollection.
+
+ * ToolStripItemCollection.cs: add "new" where we need it to work
+ with the new ArrangedElementCollection.
+
2006-12-04 Andreia Gaita <avidigal@novell.com>
* TabControl.cs: Fix default tab selection to after TabControl
private ControlBindingsCollection data_bindings;
#if NET_2_0
- internal bool use_compatible_text_rendering;
- static internal bool verify_thread_handle;
- private Padding padding;
- private Size maximum_size;
- private Size minimum_size;
- private Size preferred_size;
- private Padding margin;
- internal Layout.LayoutEngine layout_engine;
+ internal bool use_compatible_text_rendering;
+ static bool verify_thread_handle;
+ Padding padding;
+ Size maximum_size;
+ Size minimum_size;
+ Size preferred_size;
+ Padding margin;
+ Layout.LayoutEngine layout_engine;
#endif
#endregion // Local Variables
PerformLayout(null, null);
}
+#if !NET_2_0
private void SetImplicitBounds (int x, int y, int width, int height)
{
Rectangle saved_bounds = explicit_bounds;
SetBounds (x, y, width, height);
explicit_bounds = saved_bounds;
}
+#endif
[EditorBrowsable(EditorBrowsableState.Advanced)]
public void PerformLayout(Control affectedControl, string affectedProperty) {
namespace System.Windows.Forms {
- public class DataGridViewRowPostPaintEventArgs : HandledEventArgs {
+ public class DataGridViewRowPostPaintEventArgs : EventArgs {
private DataGridView dataGridView;
private Graphics graphics;
}
}
+#if NET_2_0
+#else
[DefaultValue(true)]
+#endif
[MWFCategory("Layout")]
public bool AutoScale {
get {
[Localizable(true)]
[RefreshProperties(RefreshProperties.Repaint)]
[MWFCategory("Layout")]
- public Size MaximumSize {
+ public
+#if NET_2_0
+ override
+#endif
+ Size MaximumSize {
get {
return maximum_size;
}
}
}
+#if !NET_2_0
[DefaultValue("{Width=0, Height=0}")]
+#endif
[Localizable(true)]
[RefreshProperties(RefreshProperties.Repaint)]
[MWFCategory("Layout")]
- public Size MinimumSize {
+ public
+#if NET_2_0
+ override
+#endif
+ Size MinimumSize {
get {
return minimum_size;
}
if (eh != null)
eh (this, EventArgs.Empty);
}
-
-#if NET_2_0
- // For use in Designers
- private void ResetColorDepth()
- {
- this.ColorDepth = DefaultColorDepth;
- }
-
- // For use in Designers
- private void ResetImageSize()
- {
- this.ImageSize = DefaultImageSize;
- }
-
- // For use in Designers
- private void ResetTransparentColor()
- {
- this.TransparentColor = DefaultTransparentColor;
- }
-
- // For use in Designers
- private bool ShouldSerializeColorDepth()
- {
- // ColorDepth is serialized in ImageStream when non-empty.
- // It is serialized even if it has its default value when empty.
- return images.Empty;
- }
-
- // For use in Designers
- private bool ShouldSerializeImageSize()
- {
- // ImageSize is serialized in ImageStream when non-empty.
- // It is serialized even if it has its default value when empty.
- return images.Empty;
- }
-
- // For use in Designers
- private bool ShouldSerializeTransparentColor()
- {
- return this.TransparentColor != DefaultTransparentColor;
- }
-#endif
#endregion // Private Instance Methods
#region Public Instance Properties
this.imageCollection = imageCollection;
}
- static int GetInt (Stream st)
- {
- byte [] bytes = new byte [4];
- st.Read (bytes, 0, 4);
- return (bytes [0] + (bytes [1] << 8) + (bytes [2] << 16) + (bytes [3] << 24));
- }
-
private ImageListStreamer (SerializationInfo info, StreamingContext context)
{
byte [] data = (byte []) info.GetValue ("Data", typeof (byte []));
[DefaultValue(false)]
[Localizable(true)]
[RefreshProperties(RefreshProperties.All)]
- public virtual bool AutoSize {
+ public new virtual bool AutoSize {
get { return autosize; }
set {
if (autosize == value)
private LinkCollection link_collection;
internal Link[] sorted_links;
private bool link_visited;
- private bool link_click;
internal Piece[] pieces;
internal Font link_font;
private Cursor override_cursor;
LinkArea = new LinkArea (0, -1);
link_behavior = LinkBehavior.SystemDefault;
link_visited = false;
- link_click = false;
pieces = null;
link_font = null;
focused_index = -1;
}
#if NET_2_0
- public bool UseCompatibleTextRendering {
+ public new bool UseCompatibleTextRendering {
get {
return use_compatible_text_rendering;
}
CalculateScrollBars ();
}
- bool HaveModKeys {
- get {
- return (XplatUI.State.ModifierKeys & (Keys.Control | Keys.Shift)) != 0;
- }
- }
-
private bool KeySearchString (KeyEventArgs ke)
{
int current_tickcnt = Environment.TickCount;
}
}
- Rectangle CheckRect {
- get { return this.checkbox_rect; }
- }
-
- Rectangle IconRect {
- get { return this.icon_rect; }
- }
-
- Rectangle LabelRect {
- get { return this.label_rect; }
- }
-
internal Point Location {
set {
if (bounds.X == value.X && bounds.Y == value.Y)
}
[DefaultValue (ToolStripGripStyle.Hidden)]
- public ToolStripGripStyle GripStyle {
+ public new ToolStripGripStyle GripStyle {
get { return base.GripStyle; }
set { base.GripStyle = value; }
}
[DefaultValue (false)]
- public bool ShowItemToolTips {
+ public new bool ShowItemToolTips {
get { return base.ShowItemToolTips; }
set { base.ShowItemToolTips = value; }
}
[DefaultValue (true)]
- public bool Stretch {
+ public new bool Stretch {
get { return base.stretch; }
set { base.stretch = value; }
}
}
}
- protected void OnLostFocus (EventArgs args)
+ protected override void OnLostFocus (EventArgs args)
{
// Update to the last valid value
string val = Value.ToString ();
private Image image;
private PictureBoxSizeMode size_mode;
//private bool recalc;
- private bool allow_drop;
private Image initial_image;
private int no_update;
#endregion // Fields
public PictureBox ()
{
//recalc = true;
- allow_drop = false;
#if NET_2_0
SetStyle (ControlStyles.OptimizedDoubleBuffer, true);
#else
[Browsable(false)]
[EditorBrowsable(EditorBrowsableState.Never)]
public override bool AllowDrop {
- get {
- return allow_drop;
- }
- set {
- if (allow_drop != value) {
- allow_drop = value;
- }
- }
+ get { return base.AllowDrop; }
+ set { base.AllowDrop = value; }
}
#endregion // Public Properties
namespace System.Windows.Forms
{
[DefaultProperty ("Value")]
- public sealed class ProgressBar : Control
+ public
+#if !NET_2_0
+ sealed
+#endif
+ class ProgressBar : Control
{
#region Local Variables
private int maximum;
internal Panel help_panel;
internal Label help_title_label;
internal Label help_description_label;
- private ContextMenu context_menu;
private MenuItem reset_menuitem;
private MenuItem description_menuitem;
private object current_property_value;
alphabetic_toolbarbutton = new ToolBarButton();
separator_toolbarbutton = new ToolBarButton();
propertypages_toolbarbutton = new ToolBarButton();
- context_menu = new ContextMenu();
+ ContextMenu context_menu = new ContextMenu();
toolbar_imagelist = new ImageList();
toolbar_imagelist.ColorDepth = ColorDepth.Depth32Bit;
}
protected virtual void OnSelectionChanged(EventArgs e) {
- EventHandler eh = (EventHandler)(Events [SelectionChanged]);
+ EventHandler eh = (EventHandler)(Events [SelectionChangedEvent]);
if (eh != null)
eh (this, e);
}
}
protected virtual void OnVScroll(EventArgs e) {
- if (VScroll != null) {
- VScroll(this, e);
- }
+ EventHandler eh = (EventHandler)(Events [VScrollEvent]);
+ if (eh != null)
+ eh (this, e);
}
protected override void WndProc(ref Message m) {
remove { base.QueryContinueDrag -= value; }
}
- public event EventHandler SelectionChanged;
- public event EventHandler VScroll;
+ public event EventHandler SelectionChanged {
+ add { Events.AddHandler (SelectionChangedEvent, value); }
+ remove { Events.RemoveHandler (SelectionChangedEvent, value); }
+ }
+
+ public event EventHandler VScroll {
+ add { Events.AddHandler (VScrollEvent, value); }
+ remove { Events.RemoveHandler (VScrollEvent, value); }
+ }
#endregion // Events
#region Private Methods
[ClassInterfaceAttribute (ClassInterfaceType.AutoDispatch)]
public sealed class SplitterPanel : Panel
{
- private SplitContainer owner;
+ //private SplitContainer owner;
public SplitterPanel (SplitContainer owner)
{
- this.owner = owner;
+ //this.owner = owner;
}
#region Public Properties
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
}
}
- public ToolStripGripStyle GripStyle {
+ public new ToolStripGripStyle GripStyle {
get { return base.GripStyle; }
set { base.GripStyle = value; }
}
- public ToolStripLayoutStyle LayoutStyle {
+ public new ToolStripLayoutStyle LayoutStyle {
get { return this.layout_style; }
set { this.layout_style = value; }
}
- public Padding Padding {
+ public new Padding Padding {
get { return base.Padding; }
set { base.Padding = value; }
}
- public bool ShowItemToolTips {
+ public new bool ShowItemToolTips {
get { return base.ShowItemToolTips; }
set { base.ShowItemToolTips = value; }
}
set { this.sizing_grip = value; }
}
- public bool Stretch {
+ public new bool Stretch {
get { return this.stretch; }
set { this.stretch = value; }
}
private TabPageCollection tab_pages;
private bool show_tool_tips;
private TabSizeMode size_mode;
- private Rectangle display_rect;
private bool show_slider = false;
private ButtonState right_slider_state;
private ButtonState left_slider_state;
}
[Localizable(true)]
- public Point Padding {
+ public new Point Padding {
get { return padding; }
set {
if (value.X < 0 || value.Y < 0)
get { return left_slider_state; }
}
- private Size DefaultItemSize {
- get {
- return ThemeEngine.Current.TabControlDefaultItemSize;
- }
- }
-
#endregion // Internal Properties
#region Protected Instance Properties
public new class ControlCollection : System.Windows.Forms.Control.ControlCollection {
private TabControl owner;
- private ArrayList list = new ArrayList ();
public ControlCollection (TabControl owner) : base (owner)
{
#region Class TabPageControlCollection
public class TabPageControlCollection : ControlCollection {
- private TabPage owner;
+ //private TabPage owner;
public TabPageControlCollection (TabPage owner) : base (owner)
{
- this.owner = owner;
+ //this.owner = owner;
}
public override void Add (Control value)
//
// (C) 2004 Novell, Inc.
//
+
#if NET_2_0
using System;
using System.ComponentModel;
namespace System.Windows.Forms {
- public class TableLayoutSettings : LayoutSettings {
- TableLayoutPanel panel;
+ [Serializable]
+ public sealed class TableLayoutSettings : LayoutSettings {
+ //TableLayoutPanel panel;
ColumnStyleCollection column_style;
TableLayoutPanelGrowStyle grow_style;
int column_count;
internal TableLayoutSettings (TableLayoutPanel panel)
{
- this.panel = panel;
+ //this.panel = panel;
column_count = 0;
row_count = 0;
grow_style = TableLayoutPanelGrowStyle.AddRows;
[Localizable(true)]
[RefreshProperties(RefreshProperties.Repaint)]
[MWFCategory("Behavior")]
- public virtual bool AutoSize {
+ public
+#if NET_2_0
+ override
+#else
+ virtual
+#endif
+ bool AutoSize {
get {
return auto_size;
}
[DllImport ("gdi32")]
private extern static IntPtr SelectObject (IntPtr hDC, IntPtr hObject);
- [DllImport ("gdi32")]
- static extern int SetBkColor (IntPtr hdc, int crColor);
+ //[DllImport ("gdi32")]
+ //static extern int SetBkColor (IntPtr hdc, int crColor);
[DllImport ("gdi32")]
static extern int SetBkMode (IntPtr hdc, int iBkMode);
- [DllImport ("gdi32")]
- static extern bool GetTextExtentExPoint (IntPtr hdc, string lpszStr, int cchString, int nMaxExtent, IntPtr lpnFit, IntPtr alpDx, out VisualStyles.UXTheme.SIZE lpSize);
+ //[DllImport ("gdi32")]
+ //static extern bool GetTextExtentExPoint (IntPtr hdc, string lpszStr, int cchString, int nMaxExtent, IntPtr lpnFit, IntPtr alpDx, out VisualStyles.UXTheme.SIZE lpSize);
[DllImport ("gdi32")]
static extern bool GetTextExtentPoint32 (IntPtr hdc, string lpString, int cbString, out VisualStyles.UXTheme.SIZE lpSize);
[DefaultValue (true)]
[Localizable (true)]
- public bool AutoSize {
+ public new bool AutoSize {
get { return autosize; }
set {
if (value == autosize)
}
[Browsable (false)]
- public Color ForeColor {
+ public new Color ForeColor {
get { return this.fore_color; }
set { this.fore_color = value; }
}
}
[DefaultValue (false)]
- public bool TabStop {
+ public new bool TabStop {
get { return base.TabStop; }
set { base.TabStop = value; }
}
#region Public Events
public event EventHandler AutoSizeChanged;
[Browsable (false)]
- public event EventHandler ForeColorChanged;
+ public new event EventHandler ForeColorChanged;
public event ToolStripItemEventHandler ItemAdded;
public event ToolStripItemClickedEventHandler ItemClicked;
public event ToolStripItemEventHandler ItemRemoved;
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
#region Public Properties
[MonoTODO ("Need 2.0 ToolTip to implement tool tips.")]
[DefaultValue (true)]
- public bool AutoToolTip {
+ public new bool AutoToolTip {
get { return base.AutoToolTip; }
set { base.AutoToolTip = value; }
}
#region Public Events
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler DoubleClick;
+ public new event EventHandler DoubleClick;
public event EventHandler DropDown;
public event EventHandler DropDownClosed;
public event EventHandler DropDownStyleChanged;
}
[Browsable (false)]
- public Size AutoScrollMargin {
+ public new Size AutoScrollMargin {
get { return base.AutoScrollMargin; }
set { base.AutoScrollMargin = value; }
}
[Browsable (false)]
- public Size AutoScrollMinSize {
+ public new Size AutoScrollMinSize {
get { return base.AutoScrollMinSize; }
set { base.AutoScrollMinSize = value; }
}
[Browsable (false)]
- public Color BackColor {
+ public new Color BackColor {
get { return base.BackColor; }
set { base.BackColor = value; }
}
[Browsable (false)]
- public Image BackgroundImage {
+ public new Image BackgroundImage {
get { return base.BackgroundImage; }
set { base.BackgroundImage = value; }
}
}
[Browsable (false)]
- public bool CausesValidation {
+ public new bool CausesValidation {
get { return base.CausesValidation; }
set { base.CausesValidation = value; }
}
}
[Browsable (false)]
- public ControlCollection Controls {
+ public new ControlCollection Controls {
get { return base.Controls; }
}
}
[Browsable (false)]
- public Color ForeColor {
+ public new Color ForeColor {
get { return base.ForeColor; }
set { base.ForeColor = value; }
}
#region Public Events
[Browsable (false)]
- public event EventHandler BackColorChanged;
+ public new event EventHandler BackColorChanged;
[Browsable (false)]
- public event EventHandler BackgroundImageChanged;
+ public new event EventHandler BackgroundImageChanged;
[Browsable (false)]
public event EventHandler BackgroundImageLayoutChanged;
[Browsable (false)]
- public event EventHandler CausesValidationChanged;
+ public new event EventHandler CausesValidationChanged;
[Browsable (false)]
public event EventHandler ContextMenuStripChanged;
[Browsable (false)]
- public event EventHandler CursorChanged;
+ public new event EventHandler CursorChanged;
[Browsable (false)]
- public event EventHandler ForeColorChanged;
+ public new event EventHandler ForeColorChanged;
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
}
[Browsable (false)]
- public Size AutoScrollMargin {
+ public new Size AutoScrollMargin {
get { return base.AutoScrollMargin; }
set { base.AutoScrollMargin = value; }
}
[Browsable (false)]
- public Size AutoScrollMinSize {
+ public new Size AutoScrollMinSize {
get { return base.AutoScrollMinSize; }
set { base.AutoScrollMinSize = value; }
}
}
[Browsable (false)]
- public bool CausesValidation {
+ public new bool CausesValidation {
get { return base.CausesValidation; }
set { base.CausesValidation = value; }
}
}
[Browsable (false)]
- public Point Location {
+ public new Point Location {
get { return base.Location; }
set { base.Location = value; }
}
}
[Browsable (false)]
- public string Name {
+ public new string Name {
get { return base.Name; }
set { base.Name = value; }
}
}
[Browsable (false)]
- public int TabIndex {
+ public new int TabIndex {
get { return base.TabIndex; }
set { base.TabIndex = value; }
}
[Browsable (false)]
- public bool TabStop {
+ public new bool TabStop {
get { return base.TabStop; }
set { base.TabStop = value; }
}
[Browsable (false)]
public event EventHandler AutoSizeChanged;
[Browsable (false)]
- public event EventHandler CausesValidationChanged;
+ public new event EventHandler CausesValidationChanged;
[Browsable (false)]
- public event EventHandler DockChanged;
+ public new event EventHandler DockChanged;
public event EventHandler Load;
[Browsable (false)]
- public event EventHandler LocationChanged;
+ public new event EventHandler LocationChanged;
public event EventHandler RendererChanged;
[Browsable (false)]
- public event EventHandler TabIndexChanged;
+ public new event EventHandler TabIndexChanged;
[Browsable (false)]
- public event EventHandler TabStopChanged;
+ public new event EventHandler TabStopChanged;
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ToolStripItemDisplayStyle DisplayStyle {
+ public new ToolStripItemDisplayStyle DisplayStyle {
get { return base.DisplayStyle; }
set { base.DisplayStyle = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
[DefaultValue (false)]
- public bool DoubleClickEnabled {
+ public new bool DoubleClickEnabled {
get { return this.double_click_enabled; }
set { this.double_click_enabled = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ContentAlignment ImageAlign {
+ public new ContentAlignment ImageAlign {
get { return this.image_align; }
set { this.image_align = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ToolStripItemImageScaling ImageScaling {
+ public new ToolStripItemImageScaling ImageScaling {
get { return this.image_scaling; }
set { this.image_scaling = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public Color ImageTransparentColor {
+ public new Color ImageTransparentColor {
get { return this.image_transparent_color; }
set { this.image_transparent_color = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ContentAlignment TextAlign {
+ public new ContentAlignment TextAlign {
get { return this.text_align; }
set { this.text_align = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public TextImageRelation TextImageRelation {
+ public new TextImageRelation TextImageRelation {
get { return this.text_image_relation; }
set { this.text_image_relation = value; }
}
#region Public Events
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler DisplayStyleChanged;
+ public new event EventHandler DisplayStyleChanged;
public event EventHandler Enter;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Advanced)]
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public ContextMenu ContextMenu {\r
+ public new ContextMenu ContextMenu {\r
get { return null; }\r
set { }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public ToolStripGripDisplayStyle GripDisplayStyle {\r
+ public new ToolStripGripDisplayStyle GripDisplayStyle {\r
get { return ToolStripGripDisplayStyle.Vertical; }\r
set { }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public Padding GripMargin {\r
+ public new Padding GripMargin {\r
get { return Padding.Empty; }\r
set { }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public Rectangle GripRectangle {\r
+ public new Rectangle GripRectangle {\r
get { return Rectangle.Empty; }\r
set { }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public ToolStripGripStyle GripStyle {\r
+ public new ToolStripGripStyle GripStyle {\r
get { return base.GripStyle; }\r
set { base.GripStyle = value; }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public Point Location {\r
+ public new Point Location {\r
get { return base.Location; }\r
set { base.Location = value; }\r
}\r
}\r
}\r
\r
- public Region Region {\r
+ public new Region Region {\r
get { return base.Region; }\r
set { base.Region = value; }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public bool Stretch {\r
+ public new bool Stretch {\r
get { return false; }\r
set { }\r
}\r
\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public int TabIndex {\r
+ public new int TabIndex {\r
get { return 0; }\r
set { }\r
}\r
}\r
\r
[Localizable (true)]\r
- public bool Visible {\r
+ public new bool Visible {\r
get { return base.Visible; }\r
set { base.Visible = value; }\r
}\r
this.OnClosed (new ToolStripDropDownClosedEventArgs (reason));\r
}\r
\r
- public void Show ()\r
+ public new void Show ()\r
{\r
CancelEventArgs e = new CancelEventArgs ();\r
this.OnOpening (e);\r
#endregion\r
\r
#region Public Events\r
- public event EventHandler BackgroundImageChanged;\r
+ public new event EventHandler BackgroundImageChanged;\r
public event EventHandler BackgroundImageLayoutChanged;\r
- public event EventHandler BindingContextChanged;\r
- public event UICuesEventHandler ChangeUICues;\r
+ public new event EventHandler BindingContextChanged;\r
+ public new event UICuesEventHandler ChangeUICues;\r
public event ToolStripDropDownClosedEventHandler Closed;\r
public event ToolStripDropDownClosingEventHandler Closing;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event EventHandler ContextMenuChanged;\r
+ public new event EventHandler ContextMenuChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
public event EventHandler ContextMenuStripChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event EventHandler DockChanged;\r
- public event EventHandler Enter;\r
- public event EventHandler FontChanged;\r
- public event EventHandler ForeColorChanged;\r
+ public new event EventHandler DockChanged;\r
+ public new event EventHandler Enter;\r
+ public new event EventHandler FontChanged;\r
+ public new event EventHandler ForeColorChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event GiveFeedbackEventHandler GiveFeedback;\r
- public event HelpEventHandler HelpRequested;\r
- public event EventHandler ImeModeChanged;\r
- public event KeyEventHandler KeyDown;\r
- public event KeyPressEventHandler KeyPress;\r
- public event KeyEventHandler KeyUp;\r
- public event EventHandler Leave;\r
+ public new event GiveFeedbackEventHandler GiveFeedback;\r
+ public new event HelpEventHandler HelpRequested;\r
+ public new event EventHandler ImeModeChanged;\r
+ public new event KeyEventHandler KeyDown;\r
+ public new event KeyPressEventHandler KeyPress;\r
+ public new event KeyEventHandler KeyUp;\r
+ public new event EventHandler Leave;\r
public event EventHandler Opened;\r
public event CancelEventHandler Opening;\r
public event EventHandler RegionChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
public event ScrollEventHandler Scroll;\r
- public event EventHandler StyleChanged;\r
+ public new event EventHandler StyleChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event EventHandler TabIndexChanged;\r
+ public new event EventHandler TabIndexChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event EventHandler TabStopChanged;\r
+ public new event EventHandler TabStopChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event EventHandler TextChanged;\r
+ public new event EventHandler TextChanged;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event EventHandler Validated;\r
+ public new event EventHandler Validated;\r
[Browsable (false)]\r
[EditorBrowsable (EditorBrowsableState.Never)]\r
- public event CancelEventHandler Validating;\r
+ public new event CancelEventHandler Validating;\r
#endregion\r
\r
#region Private Methods\r
#endregion\r
}\r
}\r
-#endif
\ No newline at end of file
+#endif\r
#endregion
#region Public Properties
- public bool AutoToolTip {
+ public new bool AutoToolTip {
get { return base.AutoToolTip; }
set { base.AutoToolTip = value; }
}
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
get { return base.LayoutEngine; }
}
- public ToolStripLayoutStyle LayoutStyle {
+ public new ToolStripLayoutStyle LayoutStyle {
get { return this.layout_style; }
set { this.layout_style = value; }
}
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
#region Public Properties
public override bool IsReadOnly { get { return base.IsReadOnly; } }
- public virtual ToolStripItem this[int index] { get { return (ToolStripItem)base[index]; } }
+ public new virtual ToolStripItem this[int index] { get { return (ToolStripItem)base[index]; } }
public virtual ToolStripItem this[string key] {
get {
this.owner.ResumeLayout ();
}
- public virtual void Clear ()
+ public new virtual void Clear ()
{
if (this.IsReadOnly)
throw new NotSupportedException ("This collection is read-only");
owner.PerformLayout ();
}
- public void RemoveAt (int index)
+ public new void RemoveAt (int index)
{
if (this.IsReadOnly)
throw new NotSupportedException ("This collection is read-only");
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
{
[ComVisible (true)]
[ClassInterface (ClassInterfaceType.AutoDispatch)]
- public class ToolStripPanel : ContainerControl, IComponent, IDisposable
+ public class ToolStripPanel : ContainerControl, IComponent, IDisposable, IBindableComponent, IDropTarget
{
private bool done_first_layout;
private bool locked;
}
[Browsable (false)]
- public Size AutoScrollMargin {
+ public new Size AutoScrollMargin {
get { return base.AutoScrollMargin; }
set { base.AutoScrollMargin = value; }
}
[Browsable (false)]
- public Size AutoScrollMinSize {
+ public new Size AutoScrollMinSize {
get { return base.AutoScrollMinSize; }
set { base.AutoScrollMinSize = value; }
}
}
[Browsable (false)]
- public int TabIndex {
+ public new int TabIndex {
get { return base.TabIndex; }
set { base.TabIndex = value; }
}
[Browsable (false)]
- public bool TabStop {
+ public new bool TabStop {
get { return base.TabStop; }
set { base.TabStop = value; }
}
public event EventHandler AutoSizeChanged;
public event EventHandler RendererChanged;
[Browsable (false)]
- public event EventHandler TabIndexChanged;
+ public new event EventHandler TabIndexChanged;
[Browsable (false)]
- public event EventHandler TabStopChanged;
+ public new event EventHandler TabStopChanged;
[Browsable (false)]
- public event EventHandler TextChanged;
+ public new event EventHandler TextChanged;
#endregion
#region Private Methods
[ComVisible (false)]
public class ToolStripPanelRowCollection : ArrangedElementCollection, IList, ICollection, IEnumerable
{
- private ToolStripPanel owner;
+ //private ToolStripPanel owner;
public ToolStripPanelRowCollection (ToolStripPanel owner) : base ()
{
- this.owner = owner;
+ //this.owner = owner;
}
public ToolStripPanelRowCollection (ToolStripPanel owner, ToolStripPanelRow[] value) : this (owner)
this.Add (tspr);
}
- public virtual ToolStripPanelRow this [int index] {
+ public new virtual ToolStripPanelRow this [int index] {
get { return (ToolStripPanelRow)base[index]; }
}
this.Add (tspr);
}
- public virtual void Clear ()
+ public new virtual void Clear ()
{
base.Clear ();
}
base.Remove (value);
}
- public void RemoveAt (int index)
+ public new void RemoveAt (int index)
{
base.RemoveAt (index);
}
#region Public Events
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event KeyEventHandler KeyDown;
+ public new event KeyEventHandler KeyDown;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event KeyPressEventHandler KeyPress;
+ public new event KeyPressEventHandler KeyPress;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event KeyEventHandler KeyUp;
+ public new event KeyEventHandler KeyUp;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler LocationChanged;
+ public new event EventHandler LocationChanged;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler OwnerChanged;
+ public new event EventHandler OwnerChanged;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler TextChanged;
+ public new event EventHandler TextChanged;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler Validated;
+ public new event EventHandler Validated;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event CancelEventHandler Validating;
+ public new event CancelEventHandler Validating;
#endregion
}
}
#region Public Properties
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public bool AutoToolTip {
+ public new bool AutoToolTip {
get { return this.auto_tool_tip; }
set { this.auto_tool_tip = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ToolStripItemDisplayStyle DisplayStyle {
+ public new ToolStripItemDisplayStyle DisplayStyle {
get { return this.display_style; }
set { this.display_style = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public bool DoubleClickEnabled {
+ public new bool DoubleClickEnabled {
get { return this.double_click_enabled; }
set { this.double_click_enabled = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ContentAlignment ImageAlign {
+ public new ContentAlignment ImageAlign {
get { return this.image_align; }
set {
if (!Enum.IsDefined (typeof (ContentAlignment), value))
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public int ImageIndex {
+ public new int ImageIndex {
get { return this.image_index; }
set {
if (value < -1)
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ToolStripItemImageScaling ImageScaling {
+ public new ToolStripItemImageScaling ImageScaling {
get { return this.image_scaling; }
set { this.image_scaling = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public ContentAlignment TextAlign {
+ public new ContentAlignment TextAlign {
get { return this.text_align; }
set {
if (!Enum.IsDefined (typeof (ContentAlignment), value))
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public TextImageRelation TextImageRelation {
+ public new TextImageRelation TextImageRelation {
get { return this.text_image_relation; }
set { this.text_image_relation = value; }
}
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public string ToolTipText {
+ public new string ToolTipText {
get { return this.tool_tip_text; }
set { this.tool_tip_text = value; }
}
#region Public Events
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler DisplayStyleChanged;
+ public new event EventHandler DisplayStyleChanged;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler EnabledChanged;
+ public new event EventHandler EnabledChanged;
[Browsable (false)]
[EditorBrowsable (EditorBrowsableState.Never)]
- public event EventHandler TextChanged;
+ public new event EventHandler TextChanged;
#endregion
}
}
#endregion
#region Public Properties
- public bool AutoToolTip
+ public new bool AutoToolTip
{
get { return base.AutoToolTip; }
set { base.AutoToolTip = value; }
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
#endregion
#region Public Properties
- public ToolStripItemAlignment Alignment {
+ public new ToolStripItemAlignment Alignment {
get { return base.Alignment; }
set { base.Alignment = value; }
}
#endregion
}
}
-#endif
\ No newline at end of file
+#endif
namespace System.Windows.Forms {
[ProvideProperty ("ToolTip", typeof(System.Windows.Forms.Control))]
[ToolboxItemFilter("System.Windows.Forms", ToolboxItemFilterType.Allow)]
- public sealed class ToolTip : System.ComponentModel.Component, System.ComponentModel.IExtenderProvider {
+ public
+#if !NET_2_0
+ sealed
+#endif
+ class ToolTip : System.ComponentModel.Component, System.ComponentModel.IExtenderProvider {
#region Local variables
internal bool is_active;
internal int automatic_delay;
#region Public Properties
[DefaultValue (true)]
- public bool AutoSize {
+ public new bool AutoSize {
get { return autosize; }
set { autosize = value;}
}
}
}
- private void DrawLinesToNext (TreeNode node, Graphics dc, Rectangle clip, Pen dash, int x, int y)
- {
- int middle = y + (ActualItemHeight / 2);
-
- if (node.NextNode != null) {
- int top = (node.Nodes.Count > 0 && show_plus_minus ? middle + 4 : middle);
- int ncap = (node.NextNode.Nodes.Count > 0 && show_plus_minus ? 4 : 8);
- int bottom = Math.Min (node.NextNode.GetY () + ncap, clip.Bottom);
-
- dc.DrawLine (dash, x - indent + 9, top, x - indent + 9, bottom);
- }
-
- if (node.IsExpanded && node.Nodes.Count > 0) {
- int top = node.Bounds.Bottom;
- int ncap = (node.Nodes [0].Nodes.Count > 0 && show_plus_minus ? 4 : 8);
- int bottom = Math.Min (node.Nodes [0].GetY () + ncap, clip.Bottom);
- int nx = node.Nodes [0].GetLinesX ();
-
- dc.DrawLine (dash, nx - indent + 9, top, nx - indent + 9, bottom);
- }
- }
-
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);
return (int) DeviceContext.MeasureString (node.Text, font, 0, string_format).Width + 3;
}
- private bool ShowSelection {
- get {
- return Focused || !hide_selection;
- }
- }
-
private void DrawSelectionAndFocus(TreeNode node, Graphics dc, Rectangle r)
{
if (Focused && focused_node == node) {
projects / mono.git / commitdiff