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

Timestamp:

Aug 21, 2001, 7:29:38 PM (24 years ago)

Author:

umoeller

Message:

Misc updates.

File:

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

trunk/src/helpers/dialog.c

@@ -100 +100 @@
     LINKLIST    llTables;
 
-    HWND        hwndFirstFocus;
+    HWND        hwndFirstFocus,
+                hwndDefPushbutton;      // V0.9.14 (2001-08-21) [umoeller]
 
     POINTL      ptlTotalOfs;
@@ -719 +720 @@
                        )
                         pDlgData->hwndFirstFocus = pColumnDef->hwndControl;
+
+                    // if this is the first default push button,
+                    // go store it too
+                    // V0.9.14 (2001-08-21) [umoeller]
+                    if (    (!pDlgData->hwndDefPushbutton)
+                         && ((ULONG)pControlDef->pcszClass == 0xffff0003L)
+                         && (pControlDef->flStyle & BS_DEFAULT)
+                       )
+                        pDlgData->hwndDefPushbutton = pColumnDef->hwndControl;
                 }
                 else
@@ -1048 +1058 @@
  *      This does NOT use regular dialog templates from
  *      module resources. Instead, you pass in an array
- *      of _DLGHITEM structures, which define the controls
+ *      of DLGHITEM structures, which define the controls
  *      and how they are to be formatted.
+ *
+ *      The main advantage compared to dialog resources is
+ *      that with this  function, you will never have to
+ *      define control _positions_. Instead, you only specify
+ *      the control _sizes_, and all positions are computed
+ *      automatically here. Even better, for many controls,
+ *      auto-sizing is supported according to the control's
+ *      text (e.g. for statics and checkboxes).
  *
  *      A regular standard dialog would use something like
@@ -1068 +1086 @@
  *      your dlg proc, use WinDefDlgProc as usual.
  *
- *      There is NO run-time overhead after creation; after this
- *      function returns, the dialog is a standard dialog as if
- *      loaded from WinLoadDlg.
- *
- *      The array of _DLGHITEM structures defines how the
+ *      There is NO run-time overhead for either code or memory
+ *      after dialog creation; after this function returns, the
+ *      dialog is a standard dialog as if loaded from WinLoadDlg.
+ *      The array of DLGHITEM structures defines how the
  *      dialog is set up. All this is ONLY used by this function
  *      and NOT needed after the dialog has been created.
  *
- *      In _DLGHITEM, the "Type" field determines what this
+ *      In DLGHITEM, the "Type" field determines what this
  *      structure defines. A number of handy macros have been
  *      defined to make this easier and to provide type-checking
- *      at compile time.
+ *      at compile time. See dialog.h for more.
  *
  *      Essentially, such a dialog item operates similarly to
@@ -1111 +1128 @@
  *
  *      --  CONTROL_DEF(pDef) defines a control in a table row.
- *          pDef must point to a _CONTROLDEF structure.
- *
- *          The main difference (and advantage) of this
- *          function is that there is NO information in
- *          _CONTROLDEF about a control's _position_.
+ *          pDef must point to a CONTROLDEF structure.
+ *
+ *          Again, there is is NO information in
+ *          CONTROLDEF about a control's _position_.
  *          Instead, the structure only contains the _size_
  *          of the control. All positions are computed by
@@ -1251 +1267 @@
  +                                        DlgTemplate,      // DLGHITEM array
  +                                        ARRAYITEMCOUNT(DlgTemplate),
- +                                        NULL))
+ +                                        NULL,             // mp2 for WM_INITDLG
+ +                                        "9.WarpSans"))    // default font
  +          {
  +              ULONG idReturn = WinProcessDlg(hwndDlg);
@@ -1259 +1276 @@
  *@@changed V0.9.14 (2001-07-07) [umoeller]: fixed disabled mouse with hwndOwner == HWND_DESKTOP
  *@@changed V0.9.14 (2001-08-01) [umoeller]: fixed major memory leaks with nested tables
+ *@@changed V0.9.14 (2001-08-21) [umoeller]: fixed default push button problems
  */
 
@@ -1317 +1335 @@
 
                 // push the current table on the stack
-                PSTACKITEM pStackItem = NEW(STACKITEM);
-                if (pStackItem)
+                PSTACKITEM pStackItem;
+                if (!(pStackItem = NEW(STACKITEM)))
+                {
+                    arc = ERROR_NOT_ENOUGH_MEMORY;
+                    break;
+                }
+                else
                 {
                     pStackItem->pLastTable = pCurrentTable;
@@ -1326 +1349 @@
 
                 // create new table
-                pCurrentTable = NEW(TABLEDEF);
-                if (!pCurrentTable)
+                if (!(pCurrentTable = NEW(TABLEDEF)))
                     arc = ERROR_NOT_ENOUGH_MEMORY;
                 else
@@ -1372 +1394 @@
                 {
                     // create new row
-                    pCurrentRow = NEW(ROWDEF);
-                    if (!pCurrentRow)
+                    if (!(pCurrentRow = NEW(ROWDEF)))
                         arc = ERROR_NOT_ENOUGH_MEMORY;
                     else
@@ -1465 +1486 @@
             hwndOwner = NULLHANDLE;
 
-        pDlgData->hwndDlg = WinCreateWindow(HWND_DESKTOP,
-                                            WC_FRAME,
-                                            (PSZ)pcszDlgTitle,
-                                            flStyle,        // style; invisible for now
-                                            0, 0, 0, 0,
-                                            hwndOwner,
-                                            HWND_TOP,
-                                            0,              // ID
-                                            &fcData,
-                                            NULL);          // presparams
-
-        if (!pDlgData->hwndDlg)
+        if (!(pDlgData->hwndDlg = WinCreateWindow(HWND_DESKTOP,
+                                                  WC_FRAME,
+                                                  (PSZ)pcszDlgTitle,
+                                                  flStyle,        // style; invisible for now
+                                                  0, 0, 0, 0,
+                                                  hwndOwner,
+                                                  HWND_TOP,
+                                                  0,              // ID
+                                                  &fcData,
+                                                  NULL)))          // presparams
             arc = DLGERR_CANNOT_CREATE_FRAME;
         else
@@ -1493 +1512 @@
                        &szlClient,
                        PROCESS_CALC_SIZES);
-
+                // this goes into major recursions...
+
+            // free the cached font resources that
+            // might have been created here
             if (pDlgData->lcidLast)
             {
@@ -1501 +1523 @@
             if (pDlgData->hps)
                 WinReleasePS(pDlgData->hps);
+
+            WinSubclassWindow(hwndDlg, pfnwpDialogProc);
 
             /*
@@ -1506 +1530 @@
              *     size of all controls
              */
-
-            WinSubclassWindow(hwndDlg, pfnwpDialogProc);
 
             // calculate the frame size from the client size
@@ -1546 +1568 @@
                        &szlClient,
                        PROCESS_CREATE_CONTROLS);
+
+            if (pDlgData->hwndDefPushbutton)
+                // we had a default pushbutton:
+                // go set it V0.9.14 (2001-08-21) [umoeller]
+                WinSetWindowULong(pDlgData->hwndDlg,
+                                  QWL_DEFBUTTON,
+                                  pDlgData->hwndDefPushbutton);
 
             /*