Changeset 155 for trunk/include/helpers

Timestamp:

Apr 17, 2002, 10:11:38 PM (23 years ago)

Author:

umoeller

Message:

Patches from Martin and Paul, plus regexp support.

Location:

trunk/include/helpers

Files:

• dialog.h (modified) (7 diffs)
• procstat.h (modified) (1 diff)
• regexp.h (added)
• winh.h (modified) (1 diff)

trunk/include/helpers/dialog.h

@@ -208 +208 @@
     #define PM_GROUP_SPACING_TOP        16
 
+    // the following require INCL_WINSTATICS
+
     #define CONTROLDEF_GROUP(pcsz, id, cx, cy) { WC_STATIC, pcsz, \
             WS_VISIBLE | SS_GROUPBOX | DT_MNEMONIC, \
@@ -216 +218 @@
             id, CTL_COMMON_FONT,  0, {cx, cy}, COMMON_SPACING }
 
+    #define CONTROLDEF_TEXT_CENTER(pcsz, id, cx, cy) { WC_STATIC, pcsz, \
+            WS_VISIBLE | SS_TEXT | DT_CENTER | DT_VCENTER | DT_MNEMONIC, \
+            id, CTL_COMMON_FONT,  0, {cx, cy}, COMMON_SPACING }
+
     #define CONTROLDEF_TEXT_WORDBREAK(pcsz, id, cx) { WC_STATIC, pcsz, \
             WS_VISIBLE | SS_TEXT | DT_LEFT | DT_TOP | DT_WORDBREAK, \
@@ -228 +234 @@
             id, CTL_COMMON_FONT, 0, {-1, -1}, COMMON_SPACING }
 
+    // the following require INCL_WINBUTTONS
+
     #define CONTROLDEF_DEFPUSHBUTTON(pcsz, id, cx, cy) { WC_BUTTON, pcsz, \
             WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_DEFAULT, \
@@ -236 +244 @@
             id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING }
 
+    #define CONTROLDEF_DEFNOFOCUSBUTTON(pcsz, id, cx, cy) { WC_BUTTON, pcsz, \
+            WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_DEFAULT | BS_NOPOINTERFOCUS, \
+            id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING }
+
+    #define CONTROLDEF_NOFOCUSBUTTON(pcsz, id, cx, cy) { WC_BUTTON, pcsz, \
+            WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_NOPOINTERFOCUS, \
+            id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING }
+
     #define CONTROLDEF_HELPPUSHBUTTON(pcsz, id, cx, cy) { WC_BUTTON, pcsz, \
             WS_VISIBLE | WS_TABSTOP | BS_PUSHBUTTON | BS_HELP, \
@@ -252 +268 @@
             id, CTL_COMMON_FONT, 0, { cx, cy }, COMMON_SPACING }
 
+    // the following require INCL_WINENTRYFIELDS
+
     #define CONTROLDEF_ENTRYFIELD(pcsz, id, cx, cy) { WC_ENTRYFIELD, pcsz, \
             WS_VISIBLE | WS_TABSTOP | ES_MARGIN | ES_AUTOSCROLL, \
@@ -260 +278 @@
             id, CTL_COMMON_FONT, 0, { cx, cy }, COMMON_SPACING }
 
+    // the following require INCL_WINMLE
+
     #define CONTROLDEF_MLE(pcsz, id, cx, cy) { WC_MLE, pcsz, \
             WS_VISIBLE | WS_TABSTOP | MLS_BORDER | MLS_IGNORETAB | MLS_WORDWRAP, \
             id, CTL_COMMON_FONT, 0, { cx, cy }, COMMON_SPACING }
 
+    // the following require INCL_WINLISTBOXES
+
     #define CONTROLDEF_LISTBOX(id, cx, cy) { WC_LISTBOX, NULL, \
             WS_VISIBLE | WS_TABSTOP | LS_HORZSCROLL | LS_NOADJUSTPOS, \
             id, CTL_COMMON_FONT, 0, { cx, cy }, COMMON_SPACING }
 
+    // the following require INCL_WINLISTBOXES and INCL_WINENTRYFIELDS
+
+    #define CONTROLDEF_DROPDOWN(id, cx, cy) { WC_COMBOBOX, NULL, \
+            WS_VISIBLE | WS_TABSTOP | LS_HORZSCROLL | CBS_DROPDOWN, \
+            id, CTL_COMMON_FONT, 0, { cx, cy }, COMMON_SPACING }
+
+    #define CONTROLDEF_DROPDOWNLIST(id, cx, cy) { WC_COMBOBOX, NULL, \
+            WS_VISIBLE | WS_TABSTOP | LS_HORZSCROLL | CBS_DROPDOWNLIST, \
+            id, CTL_COMMON_FONT, 0, { cx, cy }, COMMON_SPACING }
+
+    // the following require INCL_WINSTDSPIN
+
     #define CONTROLDEF_SPINBUTTON(id, cx, cy) { WC_SPINBUTTON, NULL, \
             WS_VISIBLE | WS_TABSTOP | SPBS_MASTER | SPBS_NUMERICONLY | SPBS_JUSTCENTER | SPBS_FASTSPIN, \
             id, CTL_COMMON_FONT, 0, {cx, cy}, COMMON_SPACING }
 
+    // the following require INCL_WINSTDCNR
+
     #define CONTROLDEF_CONTAINER(id, cx, cy) { WC_CONTAINER, NULL, \
             WS_VISIBLE | WS_TABSTOP | 0, \
@@ -281 +317 @@
      *
      ********************************************************************/
+
+    #ifndef FCF_CLOSEBUTTON
+        #define FCF_CLOSEBUTTON            0x04000000L // toolkit 4 only
+    #endif
+
+    #define FCF_FIXED_DLG       FCF_TITLEBAR | FCF_SYSMENU | FCF_DLGBORDER | FCF_NOBYTEALIGN | FCF_CLOSEBUTTON
+    #define FCF_SIZEABLE_DLG    FCF_TITLEBAR | FCF_SYSMENU | FCF_SIZEBORDER | FCF_NOBYTEALIGN | FCF_CLOSEBUTTON
 
     APIRET XWPENTRY dlghCreateDlg(HWND *phwndDlg,

trunk/include/helpers/procstat.h

@@ -247 +247 @@
     #define QS32_MODVER       0x0200
 
+/*
     #define QS32_SUPPORTED    (QS32_PROCESS | QS32_SEMAPHORE | QS32_MTE | QS32_FILESYS \
+                               | QS32_SHMEMORY | QS32_MODVER)
+    QS32_SEMAPHORE is broken V0.9.19 (2002-04-14) [pr]
+*/
+    #define QS32_SUPPORTED    (QS32_PROCESS | QS32_MTE | QS32_FILESYS \
                                | QS32_SHMEMORY | QS32_MODVER)
 

trunk/include/helpers/winh.h

@@ -661 +661 @@
     typedef WINHCENTERWINDOW *PWINHCENTERWINDOW;
 
+    #define PLF_SMART               0x0001
+
+    BOOL winhPlaceBesides(HWND hwnd,
+                          HWND hwndRelative,
+                          ULONG fl);
+
     HWND XWPENTRY winhFindWindowBelow(HWND hwndFind);