Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@apache.org Received: (qmail 53222 invoked from network); 29 Apr 2003 06:59:22 -0000 Received: from exchange.sun.com (192.18.33.10) by daedalus.apache.org with SMTP; 29 Apr 2003 06:59:22 -0000 Received: (qmail 11008 invoked by uid 97); 29 Apr 2003 07:01:32 -0000 Delivered-To: qmlist-jakarta-archive-commons-dev@nagoya.betaversion.org Received: (qmail 10997 invoked from network); 29 Apr 2003 07:01:32 -0000 Received: from daedalus.apache.org (HELO apache.org) (208.185.179.12) by nagoya.betaversion.org with SMTP; 29 Apr 2003 07:01:32 -0000 Received: (qmail 52967 invoked by uid 500); 29 Apr 2003 06:59:19 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 52956 invoked by uid 500); 29 Apr 2003 06:59:19 -0000 Received: (qmail 52952 invoked from network); 29 Apr 2003 06:59:19 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 29 Apr 2003 06:59:19 -0000 Received: (qmail 38079 invoked by uid 1526); 29 Apr 2003 06:59:17 -0000 Date: 29 Apr 2003 06:59:17 -0000 Message-ID: <20030429065917.38078.qmail@icarus.apache.org> From: mturk@apache.org To: jakarta-commons-sandbox-cvs@apache.org Subject: cvs commit: jakarta-commons-sandbox/daemon/src/native/nt/procrun procgui.c X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N mturk 2003/04/28 23:59:17 Modified: daemon/src/native/nt/procrun procgui.c Log: Fixed double default try menu items and properties title. Revision Changes Path 1.12 +6 -3 jakarta-commons-sandbox/daemon/src/native/nt/procrun/procgui.c Index: procgui.c =================================================================== RCS file: /home/cvs/jakarta-commons-sandbox/daemon/src/native/nt/procrun/procgui.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- procgui.c 28 Apr 2003 17:17:45 -0000 1.11 +++ procgui.c 29 Apr 2003 06:59:16 -0000 1.12 @@ -242,7 +242,7 @@ ac_append_menu_item(menu, 0, "", 0, 1); } ac_append_menu_item(menu, IDM_ABOUT, "About", 0, 1); - ac_append_menu_item(menu, IDM_OPTIONS, "Properties", 1, 1); + ac_append_menu_item(menu, IDM_OPTIONS, "Properties", 0, 1); strcpy(tmp, "Shutdown: "); strcat(tmp, g_env->m->service.name); ac_append_menu_item(menu, IDM_EXIT, tmp, 0, 1); @@ -730,7 +730,10 @@ { PROPSHEETPAGE psp[3]; PROPSHEETHEADER psh; + char title[256]; + strcpy(title, ac_cmdline); + strcat(title, " Service properties"); psp[0].dwSize = sizeof(PROPSHEETPAGE); psp[0].dwFlags = PSP_USETITLE; psp[0].hInstance = ac_instance; @@ -764,7 +767,7 @@ psh.hInstance = ac_instance; psh.pszIcon = MAKEINTRESOURCE(IDI_ICOCONWRAP); psh.pszbmHeader = MAKEINTRESOURCE(IDB_BMPJAKARTA); - psh.pszCaption = TEXT("Service Options"); + psh.pszCaption = title; psh.nPages = sizeof(psp) / sizeof(PROPSHEETPAGE); psh.ppsp = (LPCPROPSHEETPAGE) &psp; psh.pfnCallback = (PFNPROPSHEETCALLBACK)PropSheetCallback; @@ -851,7 +854,7 @@ hwnd, (DLGPROC)ac_about_dlg_proc); break; case IDM_OPTIONS: - ac_show_properties(hwnd); + ac_show_properties(NULL); if (ac_use_props) PostMessage(hwnd, WM_QUIT, 0, 0); --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org