This is the mail archive of the cygwin-apps@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

RE: [setup PATCH] Obsolete next_dialog use.


> I've been looking at the current mechanism for moving between pages in
> setup, in order to be able to extract the correct bits of Gary's patch for
> the OnAcceptActivation change.
>
> I've found that we are actually stuck in the middle of a transition between
> 2 idioms.
> Old: The global variable next_dialog, and macro NEXT()
> New: OnNext(), and some special handling in threebar.cc
>
> With this patch, I remove various things which I believe to be no-ops.
>
> Gary, you are our PropertySheet guru, aren't you?

<blush> Well, now, I wouldn't say *guru*... I'd say "Most Holy Guardian Of All
That Is Knowable Concerning The PropertySheet".

;-)

> Please could review this
> patch?
>

Looks good, but let's do it up like they do downtown and wipe next_dialog off
the face of the earth!  Add the attached patch to yours, and with our combined
might we shall be through with it FOREVER!!!  BAAHAHHAHAHHAAAA!!!!

Single non-mega concept, pinky-swear. ;-)

--
Gary R. Van Sickle
Brewer.  Patriot.

2003-07-22  Gary R. Van Sickle  <g.r.vansickle@worldnet.att.net>

	* dialog.h (next_dialog): Remove global variable, obsolete.
	(do_fromcwd): Change function declaration.
	(NEXT): Remove obsolete macro.
	* download.cc (do_download_thread): Add next_dialog as return
	parameter (return by reference).
	(do_download_reflector): Call do_download_thread() with third
	parameter.  Call Progress.PostMessage() with returned value.
	(context): Increase context to three HANDLE's.
	(do_download): Initialize new context member.
	* fromcwd.cc (do_fromcwd): Change return type to bool.  Eliminate
	use of next_dialog, return true or false instead.
	* ini.cc (do_ini_thread): Add next_dialog as return
	parameter (return by reference).
	(do_ini_thread_reflector): Call do_ini_thread with third parameter.
	Call Progress.PostMessage() with returned value.
	(context): Increase context to three HANDLE's.
	(do_ini): Initialize new context member.
	* localdir.cc (LocalDirPage::OnNext): Use do_fromcwd()'s return
	value instead of next_dialog.
	* main.cc (next_dialog): Remove obsolete global variable.
	(main): Remove initialization of next_dialog.

>
>
> 2003-07-22  Max Bowsher  <maxb@ukf.net>
>
>  * desktop.cc (DesktopSetupPage::OnBack): Remove obsolete use of NEXT().
>  * root.cc (RootPage::OnNext): Ditto.
>  (RootPage::OnBack): Ditto.
>  * install.cc (do_install_thread): Remove obsolete use of next_dialog.
>  * main.cc (main): Ditto.
>  * postinstall.cc (do_postinstall_thread): Ditto.
>
> Index: desktop.cc
> ===================================================================
> RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/desktop.cc,v
> retrieving revision 2.35
> diff -u -p -r2.35 desktop.cc
> --- desktop.cc 25 Mar 2003 20:57:13 -0000 2.35
> +++ desktop.cc 22 Jul 2003 20:16:27 -0000
> @@ -387,7 +387,6 @@ DesktopSetupPage::OnBack ()
>  {
>    HWND h = GetHWND ();
>    save_dialog (h);
> -  NEXT (IDD_CHOOSE);
>    return IDD_CHOOSE;
>  }
>
> Index: install.cc
> ===================================================================
> RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/install.cc,v
> retrieving revision 2.61
> diff -u -p -r2.61 install.cc
> --- install.cc 25 Mar 2003 20:57:13 -0000 2.61
> +++ install.cc 22 Jul 2003 20:15:53 -0000
> @@ -455,8 +455,6 @@ do_install_thread (HINSTANCE h, HWND own
>    num_installs = 0, num_uninstalls = 0, num_replacements = 0;
>    rebootneeded = false;
>
> -  next_dialog = IDD_S_POSTINSTALL;
> -
>    io_stream::mkpath_p (PATH_TO_DIR, String ("file://") + get_root_dir ());
>
>    for (i = 0; Installer::StandardDirs[i]; i++)
> Index: main.cc
> ===================================================================
> RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/main.cc,v
> retrieving revision 2.26
> diff -u -p -r2.26 main.cc
> --- main.cc 2 Apr 2003 14:26:27 -0000 2.26
> +++ main.cc 22 Jul 2003 20:15:33 -0000
> @@ -466,8 +466,6 @@ main (int argc, char **argv)
>    theLog->setFile (LOG_BABBLE, local_dir + "/setup.log.full", false);
>    theLog->setFile (0, local_dir + "/setup.log", true);
>
> -  next_dialog = IDD_SPLASH;
> -
>    log (LOG_PLAIN) << "Starting cygwin install, version " << version <<
> endLog;
>
>    SplashPage Splash;
> Index: postinstall.cc
> ===================================================================
> RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/postinstall.cc,v
> retrieving revision 2.14
> diff -u -p -r2.14 postinstall.cc
> --- postinstall.cc 12 Apr 2003 13:18:53 -0000 2.14
> +++ postinstall.cc 22 Jul 2003 20:16:05 -0000
> @@ -82,8 +82,6 @@ private:
>  static void
>  do_postinstall_thread (HINSTANCE h, HWND owner)
>  {
> -  next_dialog = IDD_DESKTOP;
> -
>    Progress.SetText1 ("Running...");
>    Progress.SetText2 ("");
>    Progress.SetText3 ("");
> Index: root.cc
> ===================================================================
> RCS file: /home/max/cvsmirror/cygwin-apps-cvs/setup/root.cc,v
> retrieving revision 2.13
> diff -u -p -r2.13 root.cc
> --- root.cc 11 Jul 2003 22:48:14 -0000 2.13
> +++ root.cc 22 Jul 2003 20:16:44 -0000
> @@ -194,8 +194,6 @@ RootPage::OnNext ()
>    else if (directory_has_spaces () && (IDNO == yesno (h, IDS_ROOT_SPACE)))
>      return -1;
>
> -  NEXT (IDD_LOCAL_DIR);
> -
>    log (LOG_PLAIN, String ("root: ") + get_root_dir () +
>         (root_text == IDC_ROOT_TEXT ? " text" : " binary")  +
>         (root_scope == IDC_ROOT_USER ? " user" : " system"));
> @@ -209,7 +207,6 @@ RootPage::OnBack ()
>    HWND h = GetHWND ();
>
>    save_dialog (h);
> -  NEXT (IDD_SOURCE);
>    return 0;
>  }
>
>
>

Attachment: next.diff
Description: Binary data

Attachment: Changelog.next.txt
Description: Text document


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]