commit 95105908f585d3b315fde33ebbcdc4d639cdb46e
author Eric Williams <ewill@ncal.verio.com> Thu Oct 19 20:40:49 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Oct 19 20:40:49 2000 +0000
tree 0aa42f696b53d95ac7fb4b100e40203fdb2e3242
parent 220312e993bb7000569ca6df7fdd32cc21b2ba00

Changed GROUP to PROGGROUP.

programs/progman/program.c

diff --git a/programs/progman/program.c b/programs/progman/program.c
index a283eb1..9effcc3 100644
--- a/programs/progman/program.c
+++ b/programs/progman/program.c
@@ -22,7 +22,7 @@
       {
 	HLOCAL  hProgram = (HLOCAL) GetWindowLong(hWnd, 0);
 	PROGRAM *program = LocalLock(hProgram);
-	GROUP   *group   = LocalLock(program->hGroup);
+	PROGGROUP   *group   = LocalLock(program->hGroup);
 	group->hActiveProgram = hProgram;
 	EnableMenuItem(Globals.hFileMenu, PM_MOVE , MF_ENABLED);
 	EnableMenuItem(Globals.hFileMenu, PM_COPY , MF_ENABLED);
@@ -152,7 +152,7 @@
 			  LPCSTR lpszIconFile, INT nIconIndex,
 			  LPCSTR lpszWorkDir, INT nHotKey, INT nCmdShow)
 {
-  GROUP *group = LocalLock(hGroup);
+  PROGGROUP *group = LocalLock(hGroup);
   PROGRAM *program;
   HLOCAL hPrior, *p;
   HLOCAL hProgram  = LocalAlloc(LMEM_FIXED, sizeof(PROGRAM));
@@ -222,13 +222,13 @@
 VOID PROGRAM_CopyMoveProgram(HLOCAL hProgram, BOOL bMove)
 {
   PROGRAM *program = LocalLock(hProgram);
-  GROUP   *fromgroup = LocalLock(program->hGroup);
+  PROGGROUP   *fromgroup = LocalLock(program->hGroup);
   HLOCAL hGroup = DIALOG_CopyMove(LocalLock(program->hName),
 				  LocalLock(fromgroup->hName), bMove);
   if (!hGroup) return;
 
   /* FIXME shouldn't be necessary */
-  OpenIcon(((GROUP*)LocalLock(hGroup))->hWnd);
+  OpenIcon(((PROGGROUP*)LocalLock(hGroup))->hWnd);
 
   if (!PROGRAM_AddProgram(hGroup,
 #if 0
@@ -274,14 +274,14 @@
 VOID PROGRAM_DeleteProgram(HLOCAL hProgram, BOOL bUpdateGrpFile)
 {
   PROGRAM *program = LocalLock(hProgram);
-  GROUP   *group   = LocalLock(program->hGroup);
+  PROGGROUP   *group   = LocalLock(program->hGroup);
 
   group->hActiveProgram = 0;
 
   if (program->hPrior)
     ((PROGRAM*)LocalLock(program->hPrior))->hNext = program->hNext;
   else
-    ((GROUP*)LocalLock(program->hGroup))->hPrograms = program->hNext;
+    ((PROGGROUP*)LocalLock(program->hGroup))->hPrograms = program->hNext;
 	
   if (program->hNext)
     ((PROGRAM*)LocalLock(program->hNext))->hPrior = program->hPrior;
@@ -308,7 +308,7 @@
 
 HLOCAL PROGRAM_FirstProgram(HLOCAL hGroup)
 {
-  GROUP *group;
+  PROGGROUP *group;
   if (!hGroup) return(0);
   group = LocalLock(hGroup);
   return(group->hPrograms);
@@ -334,7 +334,7 @@
 
 HLOCAL PROGRAM_ActiveProgram(HLOCAL hGroup)
 {
-  GROUP *group;
+  PROGGROUP *group;
   if (!hGroup) return(0);
   group = LocalLock(hGroup);
   if (IsIconic(group->hWnd)) return(0);