Changeset 197 for trunk/include/helpers/dialog.h

Timestamp:

Aug 9, 2002, 8:44:53 PM (23 years ago)

Author:

umoeller

Message:

Misc fixes.

File:

• trunk/include/helpers/dialog.h (modified) (5 diffs)

trunk/include/helpers/dialog.h

@@ -55 +55 @@
     #define DLGERR_INVALID_CONTROL_TITLE        (ERROR_DLG_FIRST + 9)
     #define DLGERR_INVALID_STATIC_BITMAP        (ERROR_DLG_FIRST + 10)
-
-    #define ERROR_DLG_LAST                      (ERROR_DLG_FIRST + 10)
+    #define DLGERR_INTEGRITY_BAD_COLUMN_INDEX   (ERROR_DLG_FIRST + 11)
+
+    #define ERROR_DLG_LAST                      (ERROR_DLG_FIRST + 11)
 
     /* ******************************************************************
@@ -67 +68 @@
 
     #define CTL_COMMON_FONT             ((PCSZ)-1)
-
-    #define ROW_VALIGN_MASK             0x0003
-    #define ROW_VALIGN_BOTTOM           0x0000
-    #define ROW_VALIGN_CENTER           0x0001
-    #define ROW_VALIGN_TOP              0x0002
 
     /*
@@ -162 +158 @@
     } DLGHITEMTYPE;
 
-    // a few handy macros for defining templates
-
-    #define START_TABLE         { TYPE_START_NEW_TABLE, 0 }
-
-    // this macro is slightly insane, but performs type checking
-    // in case the user gives a pointer which is not of CONTROLDEF
-    #define START_GROUP_TABLE(pDef)   { TYPE_START_NEW_TABLE, \
-                (   (ULONG)(&(pDef)->pcszClass)   ) }
-
-    #define END_TABLE           { TYPE_END_TABLE, 0 }
-
-    #define START_ROW(fl)       { TYPE_START_NEW_ROW, fl }
-
-    #define CONTROL_DEF(pDef)   { TYPE_CONTROL_DEF, \
-                (   (ULONG)(&(pDef)->pcszClass)   ) }
-
     /*
      *@@ DLGHITEM:
@@ -197 +177 @@
                 // TYPE_END_TABLE               // end of table
 
-        ULONG           ulData;
+        const CONTROLDEF *pCtlDef;
                 // -- with TYPE_START_NEW_TABLE: if NULL, this starts
                 //          an invisible table (for formatting only).
@@ -205 +185 @@
                 //          with SS_GROUPBOX to create a group around
                 //          the table.
+
+        ULONG           fl;
+                // -- with TYPE_START_NEW_TABLE. TABLE_* formatting flags.
+                        #define TABLE_ALIGN_COLUMNS         0x0100
+
                 // -- with TYPE_START_NEW_ROW: ROW_* formatting flags.
-                // -- with TYPE_CONTROL_DEF: _CONTROLDEF pointer to a control definition
+                        #define ROW_VALIGN_MASK             0x0003
+                        #define ROW_VALIGN_BOTTOM           0x0000
+                        #define ROW_VALIGN_CENTER           0x0001
+                        #define ROW_VALIGN_TOP              0x0002
+
     } DLGHITEM, *PDLGHITEM;
 
     typedef const struct _DLGHITEM *PCDLGHITEM;
+
+    // a few handy macros for defining templates
+
+    #define START_TABLE                     { TYPE_START_NEW_TABLE, NULL, 0 }
+
+    #define START_TABLE_ALIGN               { TYPE_START_NEW_TABLE, NULL, TABLE_ALIGN_COLUMNS }
+                // added V0.9.20 (2002-08-08) [umoeller]
+
+    #define START_GROUP_TABLE(pDef)         { TYPE_START_NEW_TABLE, pDef, 0 }
+
+    #define START_GROUP_TABLE_ALIGN(pDef)   { TYPE_START_NEW_TABLE, pDef, TABLE_ALIGN_COLUMNS }
+                // added V0.9.20 (2002-08-08) [umoeller]
+
+    #define END_TABLE                       { TYPE_END_TABLE, NULL, 0 }
+
+    #define START_ROW(fl)                   { TYPE_START_NEW_ROW, NULL, fl }
+
+    #define CONTROL_DEF(pDef)               { TYPE_CONTROL_DEF, pDef, 0 }
 
     /* ******************************************************************