Changeset 1541 for trunk/gsinstaller/gsinstall.cpp

Timestamp:

2000-09-13T05:41:01+12:00 (24 years ago)

Author:

cs025

Message:

Fixes for WindowsNT. Also made File class subclass of FilePath class.

File:

• trunk/gsinstaller/gsinstall.cpp (modified) (7 diffs)

trunk/gsinstaller/gsinstall.cpp

@@ -38 +38 @@
 bool config_complete = false;
 
+dirSelector *rootSelector = NULL;
+
 typedef vector<dirSelector *> dirSelVector;
 
 class GSInstall : public installManager
-{ 
+{
 private:
   configureFile *configFile; // the installation configure file
@@ -680 +682 @@
       { case PSN_SETACTIVE:
         {   dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
+
+            // bodge to set the dialogue path to the correct value
+            if (selector != rootSelector)
+          { selector->setPath(rootSelector->selectedPath());
+            SetDlgItemText(Dialog, dirpath_PATH, selector->selectedPath());
+          }
+
             if (selector->isFinal())
             { PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_FINISH);
@@ -734 +743 @@
 { GSInstall_dirPathData *data = new GSInstall_dirPathData;
 
+    // create the directory Selector
     data->dirSelect     = new dirSelector(prompt, optPrompt, title, installer.installPath());
   data->dirSelect->setFinal(isFinal);
 
+  // if there is no extant root selector, make this it
+  if (rootSelector == NULL)
+  { rootSelector = data->dirSelect;
+  }
+
+  // add this directory selector to the installer
   installer.addSelectedDir(data->dirSelect);
 
+  // set up the rest of the page
     ppage.dwSize        = sizeof(PROPSHEETPAGE);
     ppage.dwFlags       = PSP_USETITLE;
@@ -788 +805 @@
     }
   else // cheat as the executable etc. is already installed
-    { 
+    {
       pshead.ppsp = &ppage[1];
     }
@@ -815 +832 @@
 
 long FAR PASCAL GSInstallWindProc(HWND Window, WORD Message, WPARAM wParameter, LPARAM lParameter)
-{ 
+{
   long reply = 0;
 
@@ -830 +847 @@
 
     case WM_USER:
-    { 
+    {
       // uninstall action
       if (strstr(app_cmdLine, "-u") != NULL)
@@ -1007 +1024 @@
   
   //  config_init("ReTreeval");
-  
+
   //  accel = LoadAccelerators(Current, "ReTreevalMenu");