Merge r21-4-11-chise-0_20-=ucs.

[chise/xemacs-chise.git.1] / netinstall / source.cc

diff --git a/netinstall/source.cc b/netinstall/source.cc
index a1aa889..7e0aaf1 100644 (file)
--- a/netinstall/source.cc
+++ b/netinstall/source.cc
@@ -11,6 +11,7 @@
  *
  * Written by DJ Delorie <dj@cygnus.com>
  *
+ * Sync'ed with cinstall 2001-10-16
  */
 
 /* The purpose of this file is to manage the dialog box that lets the
@@ -25,19 +26,12 @@
 #include "msg.h"
 #include "log.h"
 
-static int rb[] = { IDC_SOURCE_DOWNLOAD, IDC_SOURCE_NETINST, IDC_SOURCE_CWD, 0 };
-
-static void
-check_if_enable_next (HWND h)
-{
-  EnableWindow (GetDlgItem (h, IDOK), source ? 1 : 0);
-}
+static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 };
 
 static void
 load_dialog (HWND h)
 {
   rbset (h, rb, source);
-  check_if_enable_next (h);
 }
 
 static void
@@ -56,7 +50,6 @@ dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
     case IDC_SOURCE_NETINST:
     case IDC_SOURCE_CWD:
       save_dialog (h);
-      check_if_enable_next (h);
       break;
 
     case IDOK:
@@ -72,8 +65,10 @@ dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
     case IDCANCEL:
       NEXT (0);
       break;
+
+    default:
+      break;
     }
-  return FALSE;
 }
 
 static BOOL CALLBACK
@@ -83,6 +78,12 @@ dialog_proc (HWND h, UINT message, WPARAM wParam, LPARAM lParam)
     {
     case WM_INITDIALOG:
       load_dialog (h);
+      // Check to see if any radio buttons are selected. If not, select a default.
+      if ((!SendMessage(GetDlgItem (h, IDC_SOURCE_DOWNLOAD), BM_GETCHECK, 0, 0) == BST_CHECKED)
+        && (!SendMessage(GetDlgItem (h, IDC_SOURCE_CWD), BM_GETCHECK, 0, 0) == BST_CHECKED))
+        {
+          SendMessage(GetDlgItem (h, IDC_SOURCE_NETINST), BM_SETCHECK, BST_CHECKED, 0);
+        }
       return FALSE;
     case WM_COMMAND:
       return HANDLE_WM_COMMAND (h, wParam, lParam, dialog_cmd);
@@ -94,6 +95,8 @@ void
 do_source (HINSTANCE h)
 {
   int rv = 0;
+  /* source = IDC_SOURCE_CWD;*/
+  source = IDC_SOURCE_NETINST;
   rv = DialogBox (h, MAKEINTRESOURCE (IDD_SOURCE), 0, dialog_proc);
   if (rv == -1)
     fatal (IDS_DIALOG_FAILED);