Changeset 146 for trunk/src/helpers/dialog.c

Timestamp:

Mar 6, 2002, 6:34:48 PM (23 years ago)

Author:

umoeller

Message:

misc fixes

File:

• trunk/src/helpers/dialog.c (modified) (14 diffs)

trunk/src/helpers/dialog.c

@@ -109 +109 @@
     POINTL      ptlTotalOfs;
 
-    LINKLIST    llControls;     // linked list of all PCOLUMNDEF structs,
-                                 // in the order in which windows were
-                                 // created
+    PLINKLIST   pllControls;            // linked list of HWNDs in the order
+                                        // in which controls were created;
+                                        // ptr can be NULL
 
     PCSZ        pcszControlsFont;  // from dlghCreateDlg
@@ -910 +910 @@
                                       pcszFont);
 
-            lstAppendItem(&pDlgData->llControls,
-                          pColumnDef);
+            // append window that was created
+            // V0.9.18 (2002-03-03) [umoeller]
+            if (pDlgData->pllControls)
+                lstAppendItem(pDlgData->pllControls,
+                              (PVOID)pColumnDef->hwndControl);
 
             // if this is the first control with WS_TABSTOP,
@@ -1455 +1458 @@
  *
  *@@added V0.9.15 (2001-08-26) [umoeller]
+ *@@changed V0.9.18 (2002-03-03) [umoeller]: aded pllWindows
  */
 
 static APIRET Dlg0_Init(PDLGPRIVATE *ppDlgData,
-                        PCSZ pcszControlsFont)
+                        PCSZ pcszControlsFont,
+                        PLINKLIST pllControls)
 {
     PDLGPRIVATE pDlgData;
@@ -1465 +1470 @@
     ZERO(pDlgData);
     lstInit(&pDlgData->llTables, FALSE);
-    lstInit(&pDlgData->llControls, FALSE);
+
+    if (pllControls)
+        pDlgData->pllControls = pllControls;
 
     pDlgData->pcszControlsFont = pcszControlsFont;
@@ -1756 +1763 @@
 
         lstClear(&pDlgData->llTables);
-        lstClear(&pDlgData->llControls);
 
         free(pDlgData);
@@ -2040 +2046 @@
 
     if (!(arc = Dlg0_Init(&pDlgData,
-                          pcszControlsFont)))
+                          pcszControlsFont,
+                          NULL)))
     {
         if (!(arc = Dlg1_ParseTables(pDlgData,
@@ -2204 +2211 @@
  *          except that the frame is already created.
  *
- *      --  DFFL_RESIZEFRAME: hwndDlg should be resized so
- *          that it will properly surround the controls.
- *
- *          This can only be used in conjunction with
- *          DFFL_RESIZEFRAME.
+ *      If pszlClient is specified, it receives the required
+ *      size of the client to surround all controls properly.
+ *      You can then use dlghResizeFrame to resize the frame
+ *      with a bit of spacing, if desired.
  *
  *@@added V0.9.16 (2001-09-29) [umoeller]
+ *@@changed V0.9.18 (2002-03-03) [umoeller]: added pszlClient, fixed output
  */
 
@@ -2217 +2224 @@
                      ULONG cDlgItems,           // in: array item count (NOT array size)
                      PCSZ pcszControlsFont, // in: font for ctls with CTL_COMMON_FONT
-                     ULONG flFlags)             // in: DFFL_* flags
+                     ULONG flFlags,             // in: DFFL_* flags
+                     PSIZEL pszlClient,         // out: size of all controls (ptr can be NULL)
+                     PVOID *ppllControls)   // out: new LINKLIST receiving HWNDs of created controls (ptr can be NULL)
 {
     APIRET      arc = NO_ERROR;
@@ -2224 +2233 @@
 
     PDLGPRIVATE  pDlgData = NULL;
+    PLINKLIST   pllControls = NULL;
 
     /*
@@ -2230 +2240 @@
      */
 
+    if (ppllControls)
+        pllControls = *(PLINKLIST*)ppllControls = lstCreate(FALSE);
+
     if (!(arc = Dlg0_Init(&pDlgData,
-                          pcszControlsFont)))
+                          pcszControlsFont,
+                          pllControls)))
     {
         if (!(arc = Dlg1_ParseTables(pDlgData,
@@ -2237 +2251 @@
                                      cDlgItems)))
         {
+            HWND hwndFocusItem;
+
             /*
              *  2) create empty dialog frame
@@ -2242 +2258 @@
              */
 
-            HWND    hwndFocusItem = NULLHANDLE;
-            SIZEL   szlClient = {0};
-            RECTL   rclClient;
-
             pDlgData->hwndDlg = hwndDlg;
 
@@ -2255 +2267 @@
             Dlg2_CalcSizes(pDlgData);
 
-            // WinSubclassWindow(hwndDlg, pfnwpDialogProc);
-
-            /*
-             *  4) compute size of dialog client from total
-             *     size of all controls
-             */
-
-            if (flFlags & DFFL_RESIZEFRAME)
+            if (pszlClient)
             {
-                // calculate the frame size from the client size
-                rclClient.xLeft = 10;
-                rclClient.yBottom = 10;
-                rclClient.xRight = szlClient.cx + 2 * SPACING;
-                rclClient.yTop = szlClient.cy + 2 * SPACING;
-                WinCalcFrameRect(hwndDlg,
-                                 &rclClient,
-                                 FALSE);            // frame from client
-
-                WinSetWindowPos(hwndDlg,
-                                0,
-                                10,
-                                10,
-                                rclClient.xRight,
-                                rclClient.yTop,
-                                SWP_MOVE | SWP_SIZE | SWP_NOADJUST);
+                pszlClient->cx = pDlgData->szlClient.cx + 2 * SPACING;
+                pszlClient->cy = pDlgData->szlClient.cy + 2 * SPACING;
             }
 
@@ -2303 +2294 @@
 
     return (arc);
+}
+
+/*
+ *@@ dlghResizeFrame:
+ *
+ *@@added V0.9.18 (2002-03-03) [umoeller]
+ */
+
+VOID dlghResizeFrame(HWND hwndDlg,
+                     PSIZEL pszlClient)
+{
+    // calculate the frame size from the client size
+    RECTL   rclClient;
+    rclClient.xLeft = 10;
+    rclClient.yBottom = 10;
+    rclClient.xRight = pszlClient->cx;
+    rclClient.yTop = pszlClient->cy;
+    WinCalcFrameRect(hwndDlg,
+                     &rclClient,
+                     FALSE);            // frame from client
+
+    WinSetWindowPos(hwndDlg,
+                    0,
+                    10,
+                    10,
+                    rclClient.xRight,
+                    rclClient.yTop,
+                    SWP_MOVE | SWP_SIZE | SWP_NOADJUST);
 }