This commit was generated by cvs2svn to compensate for changes in r5670,

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

diff --git a/netinstall/source.cc b/netinstall/source.cc
index c18f79c..a1aa889 100644 (file)
--- a/netinstall/source.cc
+++ b/netinstall/source.cc
@@ -11,7 +11,6 @@
  *
  * 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
@@ -26,7 +25,7 @@
 #include "msg.h"
 #include "log.h"
 
-static int rb[] = { IDC_SOURCE_NETINST, IDC_SOURCE_DOWNLOAD, IDC_SOURCE_CWD, 0 };
+static int rb[] = { IDC_SOURCE_DOWNLOAD, IDC_SOURCE_NETINST, IDC_SOURCE_CWD, 0 };
 
 static void
 check_if_enable_next (HWND h)
@@ -37,14 +36,13 @@ check_if_enable_next (HWND h)
 static void
 load_dialog (HWND h)
 {
-  int i;
   rbset (h, rb, source);
+  check_if_enable_next (h);
 }
 
 static void
 save_dialog (HWND h)
 {
-  int i;
   source = rbget (h, rb);
 }
 
@@ -58,6 +56,7 @@ 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:
@@ -73,10 +72,8 @@ dialog_cmd (HWND h, int id, HWND hwndctl, UINT code)
     case IDCANCEL:
       NEXT (0);
       break;
-
-    default:
-      break;
     }
+  return FALSE;
 }
 
 static BOOL CALLBACK
@@ -86,12 +83,6 @@ 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);
@@ -103,8 +94,6 @@ 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);