[Roam-commit] SF.net SVN: roam: [91] Trunk/Source

[<jon...@us...>]

Revision: 91
          http://roam.svn.sourceforge.net/roam/?rev=91&view=rev
Author:   jonfroehlich
Date:     2007-09-04 23:00:39 -0700 (Tue, 04 Sep 2007)

Log Message:
-----------
fixed RoamForm bug in Show and ShowDialog, they were not prefixing their calls to specify the base class

Modified Paths:
--------------
    Trunk/Source/Roam.Test/Roam.Test.csproj
    Trunk/Source/Roam.UI/Forms/RoamForm.Designer.cs
    Trunk/Source/Roam.UI/Forms/RoamForm.cs
    Trunk/Source/Roam.suo

Modified: Trunk/Source/Roam.Test/Roam.Test.csproj
===================================================================
--- Trunk/Source/Roam.Test/Roam.Test.csproj	2007-08-27 03:36:45 UTC (rev 90)
+++ Trunk/Source/Roam.Test/Roam.Test.csproj	2007-09-05 06:00:39 UTC (rev 91)
@@ -537,7 +537,7 @@
       <DependentUpon>TextBoxFilteredListTest.cs</DependentUpon>
     </Compile>
     <Compile Include="UI\Controls\FontTest.cs">
-      <SubType>Component</SubType>
+      <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\Controls\FontTest.Designer.cs">
       <DependentUpon>FontTest.cs</DependentUpon>

Modified: Trunk/Source/Roam.UI/Forms/RoamForm.Designer.cs
===================================================================
--- Trunk/Source/Roam.UI/Forms/RoamForm.Designer.cs	2007-08-27 03:36:45 UTC (rev 90)
+++ Trunk/Source/Roam.UI/Forms/RoamForm.Designer.cs	2007-09-05 06:00:39 UTC (rev 91)
@@ -34,6 +34,7 @@
         /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
         protected override void Dispose(bool disposing)
         {
+            _isDisposed = true;
             if (disposing && (components != null))
             {
                 components.Dispose();

Modified: Trunk/Source/Roam.UI/Forms/RoamForm.cs
===================================================================
--- Trunk/Source/Roam.UI/Forms/RoamForm.cs	2007-08-27 03:36:45 UTC (rev 90)
+++ Trunk/Source/Roam.UI/Forms/RoamForm.cs	2007-09-05 06:00:39 UTC (rev 91)
@@ -33,6 +33,7 @@
     {
         private bool _isModal = false;
         private bool _isClosed = false;
+        private bool _isDisposed = false;
 
         public RoamForm()
         {
@@ -80,7 +81,7 @@
         public new DialogResult ShowDialog()
         {
             _isModal = true;
-            DialogResult dr = ShowDialog();
+            DialogResult dr = base.ShowDialog();
             _isModal = false;
             return dr;
         }
@@ -88,7 +89,7 @@
         public new void Show()
         {
             _isModal = false;
-            Show();
+            base.Show();
         }
         #endregion Public Methods
 

Modified: Trunk/Source/Roam.suo
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.