* net.cc (do_net): Default to direct download.

* res.c: Move default selections to the top.

diff --git a/ChangeLog b/ChangeLog
index 8039cb39aeb0f44a650fe6b47430ffd6e344231a..23afe3d697a7209f0cd51b75558c3c43b38c6ded 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 24 23:35:31 2001  Christopher Faylor <cgf@cygnus.com>
+
+       * net.cc (do_net): Default to direct download.
+       * res.c: Move default selections to the top.
+
 2001-04-18  Earnie Boyd  <earnie@users.sourceforge.net>
 
        * win32.h: Remove the definitions for _UNION_NAME and _STRUCT_NAME.

diff --git a/net.cc b/net.cc
index f497857675c94974131dca13be38ad21d4a03e8b..cbaddca4848d384390f991a33955257b0b7c4c3f 100644 (file)
--- a/net.cc
+++ b/net.cc
@@ -138,6 +138,7 @@ do_net (HINSTANCE h)
 {
   int rv = 0;
 
+  net_method = IDC_NET_DIRECT;
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_NET), 0, dialog_proc);
   if (rv == -1)
     fatal (IDS_DIALOG_FAILED);

diff --git a/res.rc b/res.rc
index c08d78045ba5912da54c06135fdf56f9a981139b..50d4c6f51c655c5b0869a0d761fd08bf8af09c91 100644 (file)
--- a/res.rc
+++ b/res.rc
@@ -34,9 +34,9 @@ CAPTION "Cygwin Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDI_CYGWIN,-1,5,5,20,20
-    CONTROL         "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
-                    BS_AUTORADIOBUTTON,55,15,152,10
     CONTROL         "&Install from Internet",IDC_SOURCE_NETINST,"Button",
+                    BS_AUTORADIOBUTTON,55,15,152,10
+    CONTROL         "&Download from Internet",IDC_SOURCE_DOWNLOAD,"Button",
                     BS_AUTORADIOBUTTON,55,30,75,10
     CONTROL         "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
                     BS_AUTORADIOBUTTON,55,45,104,10
@@ -115,9 +115,9 @@ CAPTION "Cygwin Setup"
 FONT 8, "MS Sans Serif"
 BEGIN
     ICON            IDI_CYGWIN,IDC_STATIC,5,5,20,20
-    CONTROL         "Use &IE5 Settings",IDC_NET_IE5,"Button",
-                    BS_AUTORADIOBUTTON,55,10,69,10
     CONTROL         "&Direct Connection",IDC_NET_DIRECT,"Button",
+                    BS_AUTORADIOBUTTON,55,10,69,10
+    CONTROL         "Use &IE5 Settings",IDC_NET_IE5,"Button",
                     BS_AUTORADIOBUTTON,55,25,73,10
     CONTROL         "Use HTTP/FTP &Proxy:",IDC_NET_PROXY,"Button",
                     BS_AUTORADIOBUTTON,55,40,88,10