more... group...

progmgr/dialog.c

@@ -142,7 +142,7 @@ BOOL CALLBACK NewGroupDlgProc(HWND hWndDlg, UINT message, WPARAM wParam, LPARAM
 				grp.rcGroup.left = grp.rcGroup.top = grp.rcGroup.right = grp.rcGroup.bottom = CW_USEDEFAULT;
 
 				// Group's ready!
-				if (CreateGroupWindow(&grp) != NULL)
+				if (CreateGroupWindow(grp) != NULL)
 				{
 					EndDialog(hWndDlg, FALSE);
 					break;

progmgr/group.c

@@ -81,12 +81,12 @@ BOOL InitializeGroups()
 	CreateGroupWindow -
 		Create an MDI window from a group structure
 	RETURNS -
-		Pointer to a group window structure
+		Pointer to the new group window
 		or NULL on failure
 \* * * */
 #pragma warning(push)
 #pragma warning(disable: 4172)
-PGROUPWND CreateGroupWindow(PGROUP pgGroup)
+HWND CreateGroupWindow(GROUP grp)
 {
 	GROUPWND gw = { NULL };
 	MDICREATESTRUCT mcs = { NULL };
@@ -95,7 +95,7 @@ PGROUPWND CreateGroupWindow(PGROUP pgGroup)
 	HICON hIconTemp = NULL;
 	
 	// Copy group structure to our group window
-	gw.grp = *pgGroup;
+	gw.grp = grp;
 
 	// TODO: allocate memory from pgwArray in here
 
@@ -119,7 +119,7 @@ PGROUPWND CreateGroupWindow(PGROUP pgGroup)
 		mcs.cy = gw.grp.rcGroup.bottom - gw.grp.rcGroup.top;
 	}
 	mcs.style = WS_VISIBLE;
-	mcs.lParam = (LPARAM)pgGroup;
+	mcs.lParam = (LPARAM)&grp;
 
 	if ((gw.hWndGroup = (HWND)SendMessage(hWndMDIClient, WM_MDICREATE, 0, (LPARAM)(LPTSTR)&mcs)) == NULL)
 		return NULL;
@@ -144,7 +144,7 @@ PGROUPWND CreateGroupWindow(PGROUP pgGroup)
 
 	// TODO: make sure the groups delete their icons upon destruction!
 
-	return &gw;
+	return gw.hWndGroup;
 }
 #pragma warning(pop)
 

progmgr/group.h

@@ -80,7 +80,7 @@ extern HWND			hWndMDIClient;
 BOOL InitializeGroups();
 // Group Window
 LRESULT CALLBACK GroupWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam);
-PGROUPWND CreateGroupWindow(PGROUP pgGroup);
+HWND CreateGroupWindow(GROUP grp);
 // Group information
 BOOL SetGroupFlags(PGROUPWND pgw, DWORD dwFlags);
 BOOL GetGroupFlags(PGROUPWND pgw, DWORD dwFlags);