[ros-diffs] [cwittich] 35231: this change got lost due to a merge conflict with Ged's commit

cwittich at svn.reactos.org cwittich at svn.reactos.org
Sat Aug 9 15:57:53 CEST 2008


Author: cwittich
Date: Sat Aug  9 08:57:52 2008
New Revision: 35231

URL: http://svn.reactos.org/svn/reactos?rev=35231&view=rev
Log:
this change got lost due to a merge conflict with Ged's commit

Modified:
    trunk/tools/reactosdbg/RosDBG/MainWindow.cs

Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs
URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow.cs?rev=35231&r1=35230&r2=35231&view=diff
==============================================================================
--- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original)
+++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Sat Aug  9 08:57:52 2008
@@ -146,7 +146,8 @@
                                 useshell.SetShell(this);
                             AddTab(ctrl);
                         };
-                    NewWindowItem.DropDownItems.Add(t.Name, null, create);
+                    Control c = (Control)x.GetConstructor(Type.EmptyTypes).Invoke(new object[] { });
+                    NewWindowItem.DropDownItems.Add( c.Tag != null ? c.Tag.ToString() : t.Name, null, create);
 
                     object[] buildNow = t.GetCustomAttributes(typeof(BuildAtStartupAttribute), false);
                     if (buildNow.Length > 0)
@@ -160,7 +161,7 @@
             SuspendLayout();
             TabPage tp = new TabPage(ctrl.Text);
             tp.Controls.Add(ctrl);
-            tp.Text = ctrl.GetType().Name;
+            tp.Text = ctrl.Tag != null ? ctrl.Tag.ToString() : ctrl.GetType().Name;
             ctrl.Dock = DockStyle.Fill;
             WorkTabs.Controls.Add(tp);
             ResumeLayout();



More information about the Ros-diffs mailing list