* FileDialog.cs: When Save/Open is clicked and no filename is selected

or entered then do not close the dialog. Fixes bug #82539. Removed
CWLs.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index ef2c3c7a126dcd2fc493985dacfbe4d251d68219..eea110c17d09d1d81bb6729e8da730a8fe6f8819 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,9 @@
+2007-08-23  Gert Driesen  <drieseng@users.sourceforge.net>
+
+       * FileDialog.cs: When Save/Open is clicked and no filename is selected
+       or entered then do not close the dialog. Fixes bug #82539. Removed
+       CWLs.
+
 2007-08-22  Everaldo Canuto  <ecanuto@novell.com>
 
        * FileDialog.cs: Create UpdateRecentFiles and move the recent files refresh

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
index d6147624abff93a89429650ff4c5014d44cd0aa5..edd5bae7842c802e72d4644d91561067b3584ce4 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/FileDialog.cs
@@ -949,6 +949,8 @@ namespace System.Windows.Forms
                                // remove items above the maximum items that we want to display
                                while (fileNameComboBox.Items.Count > MaxFileNameItems)
                                        fileNameComboBox.Items.RemoveAt (MaxFileNameItems);
+                       } else {
+                               return;
                        }
 
                        if (checkPathExists && mwfFileView.CurrentRealFolder != null) {
@@ -1189,7 +1191,6 @@ namespace System.Windows.Forms
 
                private void UpdateRecentFiles ()
                {
-                       Console.WriteLine ("UpdateRecentFiles");
                        fileNameComboBox.Items.Clear ();
                        if (configFileNames != null) {
                                foreach (string configFileName in configFileNames) {
@@ -1199,7 +1200,6 @@ namespace System.Windows.Forms
                                        if (fileNameComboBox.Items.Count >= MaxFileNameItems)
                                                break;
                                        fileNameComboBox.Items.Add (configFileName);
-Console.WriteLine ("> {0} {1}", GetExtension (configFileName), configFileName);
                                }
                        }
                }
@@ -3419,20 +3419,20 @@ Console.WriteLine ("> {0} {1}", GetExtension (configFileName), configFileName);
                        directories_out = new ArrayList ();
                        
                        DirectoryInfo[] dirs = null;
-                       
+
                        try {
                                dirs = dirinfo.GetDirectories ();
                        } catch (Exception) {}
-                       
+
                        if (dirs != null)
                                for (int i = 0; i < dirs.Length; i++) {
                                        directories_out.Add (GetDirectoryFSEntry (dirs [i], currentTopFolderFSEntry));
                                }
-                       
+
                        files_out = new ArrayList ();
                        
                        ArrayList files = new ArrayList ();
-                       
+
                        try {
                                if (filters == null) {
                                        files.AddRange (dirinfo.GetFiles ());
@@ -3443,14 +3443,14 @@ Console.WriteLine ("> {0} {1}", GetExtension (configFileName), configFileName);
                                        files.Sort (fileInfoComparer);
                                }
                        } catch (Exception) {}
-                       
+
                        for (int i = 0; i < files.Count; i++) {
                                FSEntry fs = GetFileFSEntry (files [i] as FileInfo);
                                if (fs != null)
                                        files_out.Add (fs);
                        }
                }
-               
+
                protected ArrayList GetNormalFolders (string from_folder)
                {
                        DirectoryInfo dirinfo = new DirectoryInfo (from_folder);