Changeset 166

Timestamp:

May 29, 2002, 10:51:13 AM (23 years ago)

Author:

umoeller

Message:

Bunch of fixes.

Location:

trunk

Files:

• include/helpers/dialog.h (modified) (1 diff)
• include/helpers/except.h (modified) (2 diffs)
• include/helpers/winh.h (modified) (2 diffs)
• src/helpers/prfh.c (modified) (1 diff)
• src/helpers/winh.c (modified) (2 diffs)

trunk/include/helpers/dialog.h

@@ -404 +404 @@
             id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING, pctldata }
 
+    #define CONTROLDEF_VSLIDER(id, cx, cy, pctldata) { WC_SLIDER, NULL, \
+            WS_VISIBLE | WS_TABSTOP | WS_GROUP | SLS_VERTICAL | SLS_PRIMARYSCALE1 \
+            | SLS_BUTTONSRIGHT | SLS_SNAPTOINCREMENT, \
+            id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING, pctldata }
+
     /* ******************************************************************
      *

trunk/include/helpers/except.h

@@ -154 +154 @@
         #define TRY_LOUD(excptstruct)
     #else
+        #ifdef __NO_LOUD_EXCEPTION_HANDLERS__
+            #define TRY_LOUD(e) TRY_QUIET(e)
+        #else // __NO_LOUD_EXCEPTION_HANDLERS__
         #define TRY_LOUD(excptstruct)                                           \
                 {                                                               \
@@ -169 +172 @@
                     {
 
+        #endif // __NO_LOUD_EXCEPTION_HANDLERS__
     #endif
 

trunk/include/helpers/winh.h

@@ -107 +107 @@
         #define WinSetDlgItemText(a,b,c) winhSetDlgItemText((a),(b),(c))
 
+        // pmwin.h defines the WinEnableControl macro; turn this into our function call
+        #ifdef WinEnableControl
+            #undef WinEnableControl
+        #endif
+        #define WinEnableControl(hwndDlg, id, fEnable) winhEnableDlgItem((hwndDlg), (id), (fEnable))
+
         #ifdef INCL_WINMESSAGEMGR
             APIRET XWPENTRY winhRequestMutexSem(HMTX hmtx, ULONG ulTimeout);
@@ -798 +804 @@
                                       BOOL fEnable);
 
+    ULONG winhEnableControls2(HWND hwndDlg,
+                              const ULONG *paulIDs,
+                              ULONG cIDs,
+                              BOOL fEnable);
+
     HWND XWPENTRY winhCreateStdWindow(HWND hwndFrameParent,
                                       PSWP pswpFrame,

trunk/src/helpers/prfh.c

@@ -233 +233 @@
                           CHAR cDefault)    // in: default to return if not found
 {
-    // CHAR    crc = 0;
     CHAR    szTemp[5],
             szDefault[5];

trunk/src/helpers/winh.c

@@ -3628 +3628 @@
                          USHORT usIDFirst,              // in: first affected control ID
                          USHORT usIDLast,               // in: last affected  control ID (inclusive)
-                         BOOL fEnable)
+                         BOOL fEnable)                  // in: enable or disable?
 {
     HENUM   henum1 = NULLHANDLE;
@@ -3658 +3658 @@
     WinEndEnumWindows(henum1);
     return (ulCount);
+}
+
+/*
+ *@@ winhEnableControls2:
+ *      like winhEnableControls, but instead this
+ *      takes an array of ULONGs as input, which
+ *      is assumed to contain the dialog IDs of
+ *      the controls to be enabled/disabled.
+ *
+ *@@added V0.9.19 (2002-05-28) [umoeller]
+ */
+
+ULONG winhEnableControls2(HWND hwndDlg,             // in: dialog window
+                          const ULONG *paulIDs,     // in: array of dialog IDs
+                          ULONG cIDs,               // in: array item count (NOT array size)
+                          BOOL fEnable)             // in: enable or disable?
+{
+    ULONG   ul,
+            ulrc = 0;
+    for (ul = 0;
+         ul < cIDs;
+         ++ul)
+    {
+        if (WinEnableControl(hwndDlg, paulIDs[ul], fEnable))
+            ++ulrc;
+    }
+
+    return ulrc;
 }