2008-10-03 Ivan N. Zlatev <contact@i-nz.net>

	* PropertyGrid.cs: Cleanup compilation warnings.

svn path=/trunk/mcs/; revision=114768

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 6be3b4a9c6144c032f4c7633ebeea000957019df..43a84861c0e2f90288e8f4e6de0b4bb8eddbe6f2 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-03  Ivan N. Zlatev  <contact@i-nz.net>
+
+       * PropertyGrid.cs: Cleanup compilation warnings.
+
 2008-10-02  Jonathan Pobst  <monkey@jpobst.com>
 
        * DataGridViewRow.cs: Only clear the row background if we

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
index 2046d18548ac64ab0158180461a01011baa46e8f..a7c32a7cc8ac84188b9b7587936f3f5675084cf5 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
@@ -104,6 +104,7 @@ namespace System.Windows.Forms
 
                        line_color = SystemColors.ScrollBar;
                        category_fore_color = line_color;
+                       commands_visible = false;
                        commands_visible_if_available = false;
                        property_sort = PropertySort.CategorizedAlphabetical;
                        property_grid_view = new PropertyGridView(this);
@@ -148,6 +149,7 @@ namespace System.Windows.Forms
                        propertypages_toolbarbutton = new PropertyToolBarButton ();
                        separator_toolbarbutton = new PropertyToolBarSeparator ();
                        ContextMenu context_menu = new ContextMenu();
+                       context_menu_default_location = Point.Empty;
 
                        categorized_image = new Bitmap (typeof (PropertyGrid), "propertygrid-categorized.png");
                        alphabetical_image = new Bitmap (typeof (PropertyGrid), "propertygrid-alphabetical.png");
@@ -1754,13 +1756,14 @@ namespace System.Windows.Forms
                {
                
 #if NET_2_0
-                       bool flat;
+                       ToolBarAppearance appearance;
 #endif
                        public PropertyToolBar ()
                        {
                                SetStyle (ControlStyles.ResizeRedraw, true);
 #if NET_2_0
                                GripStyle = ToolStripGripStyle.Hidden;
+                               appearance = ToolBarAppearance.Normal;
 #endif
                        }
 
@@ -1777,7 +1780,7 @@ namespace System.Windows.Forms
                        }
                        
                        public ToolBarAppearance Appearance {
-                               get { return flat ? ToolBarAppearance.Flat : ToolBarAppearance.Normal; }
+                               get { return appearance; }
                                set { 
                                        if (value == Appearance)
                                                return;
@@ -1785,11 +1788,13 @@ namespace System.Windows.Forms
                                        switch (value) {
                                        case ToolBarAppearance.Flat:
                                                Renderer = new ToolStripSystemRenderer ();
+                                               appearance = ToolBarAppearance.Flat;
                                                break;
                                        case ToolBarAppearance.Normal:
                                                ProfessionalColorTable table = new ProfessionalColorTable ();
                                                table.UseSystemColors = true;
                                                Renderer = new ToolStripProfessionalRenderer (table);
+                                               appearance = ToolBarAppearance.Normal;
                                                break;
                                        }
                                }