Changeset 85

Timestamp:

Jul 6, 2001, 6:57:59 PM (24 years ago)

Author:

umoeller

Message:

Misc changes.

Location:

trunk

Files:

• include/helpers/dialog.h (modified) (1 diff)
• include/helpers/textview.h (modified) (3 diffs)
• include/helpers/winh.h (modified) (3 diffs)
• readme.txt (modified) (3 diffs)
• src/helpers/dialog.c (modified) (1 diff)
• src/helpers/textview.c (modified) (4 diffs)
• src/helpers/tree.c (modified) (1 diff)
• src/helpers/winh.c (modified) (1 diff)

trunk/include/helpers/dialog.h

@@ -179 +179 @@
      ********************************************************************/
 
-    APIRET dlghCreateDlg(HWND *phwndDlg,
-                         HWND hwndOwner,
-                         ULONG flCreateFlags,
-                         PFNWP pfnwpDialogProc,
-                         const char *pcszDlgTitle,
-                         PDLGHITEM paDlgItems,
-                         ULONG cDlgItems,
-                         PVOID pCreateParams,
-                         const char *pcszControlsFont);
+    APIRET XWPENTRY dlghCreateDlg(HWND *phwndDlg,
+                                  HWND hwndOwner,
+                                  ULONG flCreateFlags,
+                                  PFNWP pfnwpDialogProc,
+                                  const char *pcszDlgTitle,
+                                  PDLGHITEM paDlgItems,
+                                  ULONG cDlgItems,
+                                  PVOID pCreateParams,
+                                  const char *pcszControlsFont);
+    typedef APIRET XWPENTRY DLGHCREATEDLG(HWND *phwndDlg,
+                                          HWND hwndOwner,
+                                          ULONG flCreateFlags,
+                                          PFNWP pfnwpDialogProc,
+                                          const char *pcszDlgTitle,
+                                          PDLGHITEM paDlgItems,
+                                          ULONG cDlgItems,
+                                          PVOID pCreateParams,
+                                          const char *pcszControlsFont);
+    typedef DLGHCREATEDLG *PDLGHCREATEDLG;
 
     /*

trunk/include/helpers/textview.h

@@ -160 +160 @@
     #define TXVWORDF_LINEFEED           4       // \r
 
+    typedef struct _TXVRECTANGLE *PTXVRECTANGLE;
+
     /*
      *@@ TXVWORD:
@@ -211 +213 @@
         LONG        lX;             // X position to paint this word at;
                                     // this is (re)set during word-to-rectangle correlation!
-        PVOID       pvRectangle;    // reverse pointer to the TXVRECTANGLE structure to
+        PTXVRECTANGLE pRectangle;   // reverse pointer to the TXVRECTANGLE structure to
                                     // which this word belongs; useful for repainting;
                                     // this is (re)set during word-to-rectangle correlation!
@@ -256 +258 @@
                                         // So one allocated TXVWORD structure can
                                         // have two pointers pointing to it.
-        } TXVRECTANGLE, *PTXVRECTANGLE;
+        } TXVRECTANGLE;
     #endif
 

trunk/include/helpers/winh.h

@@ -161 +161 @@
      ********************************************************************/
 
+    ULONG XWPENTRY winhQueryWindowStyle(HWND hwnd);
+
     BOOL XWPENTRY winhEnableDlgItem(HWND hwndDlg, SHORT id, BOOL fEnable);
 
@@ -356 +358 @@
                                          ULONG max,
                                          ULONG current);
+    typedef VOID XWPENTRY WINHSETDLGITEMSPINDATA(HWND hwndDlg,
+                                                 ULONG idSpinButton,
+                                                 ULONG min,
+                                                 ULONG max,
+                                                 ULONG current);
+    typedef WINHSETDLGITEMSPINDATA *PWINHSETDLGITEMSPINDATA;
 
     LONG XWPENTRY winhAdjustDlgItemSpinData(HWND hwndDlg,
@@ -361 +369 @@
                                             LONG lGrid,
                                             USHORT usNotifyCode);
+    typedef LONG XWPENTRY WINHADJUSTDLGITEMSPINDATA(HWND hwndDlg,
+                                                    USHORT usItemID,
+                                                    LONG lGrid,
+                                                    USHORT usNotifyCode);
+    typedef WINHADJUSTDLGITEMSPINDATA *PWINHADJUSTDLGITEMSPINDATA;
 
     /* ******************************************************************

trunk/readme.txt

@@ -1 +1 @@
 XWP Helpers 0.9.7 README
 (W) Ulrich M”ller, October 26, 2000
-Last updated January 6, 2001, Ulrich M”ller
+Last updated July 5, 2001, Ulrich M”ller
 
 
@@ -61 +61 @@
     sorts of OS/2 programs, including:
 
-    --  standard C code which is independent of the OS/2 platform;
+    --  standard C code which is independent of the OS/2 platform
+        (and should even work for Unix or Windows);
 
     --  OS/2-specific code which can be used in any OS/2 program
-        (text mode or PM);
+        (VIO or PM);
 
     --  PM-specific code which assists you in writing PM programs.
 
     The XWPHelpers can be compiled with EMX/GCC or IBM VisualAge
-    C++ 3.08. They can be used with C or C++ programs.
+    C++ 3.08. They can be used with C or C++ programs. All typecasts
+    should be C++-compatible.
 
 
@@ -98 +100 @@
 
     The XWPHelpers do not come with pre-made documentation. However,
-    you can automatically have documentation generated from the sources
-    using my "xdoc" utility, which resides in the main directory of
-    the helpers. (The source code for xdoc is in the WarpIN CVS
-    repository because it shares some C++ code with WarpIN.)
-
-    To have the code generated, call "createdoc.cmd" in the main
-    directory. This will call xdoc in turn with the proper parameters
-    and create a new "HTML" directory, from where you should start
-    with the "index.html" file.
+    you can automatically have extensive, categorized documentation
+    generated automatically from the C sources using my "xdoc"
+    utility, which resides in the main directory of the helpers.
+    (The source code for xdoc is in the WarpIN CVS repository
+    because it shares some C++ code with WarpIN.)
+
+    To have the code generated, simply call "createdoc.cmd" in the
+    main directory. This will call xdoc in turn with the proper
+    parameters and create a new "HTML" directory, from where you
+    should start with the "index.html" file.
 
 
 4. COMPILING
 ============
+
+    You don't have to worry about compilation if you only want
+    to compile XWorkplace or WarpIN. The makefiles of those two
+    projects are set up properly to automatically compile the
+    XWPHelpers as well. This section is only for people who
+    want to compile the XWPHelpers separately for use in a
+    different project.
 
     Compiling is a bit tricky because the code and the makefiles

trunk/src/helpers/dialog.c

@@ -212 +212 @@
  ********************************************************************/
 
-#define PM_GROUP_SPACING_X          20
-#define PM_GROUP_SPACING_TOP        30
+#define PM_GROUP_SPACING_X          10
+#define PM_GROUP_SPACING_TOP        20
 
 VOID ProcessTable(PTABLEDEF pTableDef,

trunk/src/helpers/textview.c

@@ -1266 +1266 @@
                             {
                                 pWordThis->lX = flbuf.lXCurrent;
-                                pWordThis->pvRectangle = (PVOID)pRect;
+                                pWordThis->pRectangle = pRect;
                                 lstAppendItem(&pRect->llWords, pWordThis);
                                 ulWordsInThisRect++;
@@ -1310 +1310 @@
 
                                 // store word in rectangle
-                                pWordThis->pvRectangle = (PVOID)pRect;
+                                pWordThis->pRectangle = pRect;
                                 lstAppendItem(&pRect->llWords, pWordThis);
-                                            // ### memory leak right here!!!
+                                            // @@todo memory leak right here!!!
                                 ulWordsInThisRect++;
 
@@ -2138 +2138 @@
     POINTL ptlStart;
     ULONG flOptions = pWordThis->flOptions;
-    PTXVRECTANGLE pLineRcl = (PTXVRECTANGLE)pWordThis->pvRectangle;
+    PTXVRECTANGLE pLineRcl = pWordThis->pRectangle;
 
     RECTL           rclLine;
@@ -3031 +3031 @@
                     if (pWord)
                     {
-                        PTXVRECTANGLE pRect = (PTXVRECTANGLE)pWord->pvRectangle;
+                        PTXVRECTANGLE pRect = pWord->pRectangle;
                         ULONG ulWinCY = (ptxvd->rclViewText.yTop - ptxvd->rclViewText.yBottom);
 

trunk/src/helpers/tree.c

@@ -114 +114 @@
  *
  *      -- Fully balanced trees can be quite expensive because on
- *         every insertion or deletion, the tree nodes must be reordered.
+ *         every insertion or deletion, the tree nodes must be rotated.
  *         By contrast, "Red-black" binary balanced trees contain
  *         an additional bit in each node which marks the node as
  *         either red or black. This bit is used only for efficient
  *         rebalancing when inserting or deleting nodes.
- *
- *         The color of each node is instrumental in determining the
- *         balance of the tree. During insert and delete operations,
- *         nodes may be rotated to maintain tree balance.
  *
  *         I don't fully understand why this works, but if you really

trunk/src/helpers/winh.c

@@ -258 +258 @@
  *
  ********************************************************************/
+
+/*
+ *@@ winhQueryWindowStyle:
+ *
+ *@@added V0.9.13 (2001-07-02) [umoeller]
+ */
+
+ULONG winhQueryWindowStyle(HWND hwnd)
+{
+    return (WinQueryWindowULong(hwnd, QWL_STYLE));
+}
 
 /*