Changeset 18 for trunk/src/helpers/gpih.c

Timestamp:

Jan 1, 2001, 4:30:29 PM (25 years ago)

Author:

umoeller

Message:

Tons of updates.

File:

• trunk/src/helpers/gpih.c (modified) (8 diffs)

trunk/src/helpers/gpih.c

@@ -15 +15 @@
  *      example, WinQueryWindowRect returns an inclusive-exclusive
  *      rectangle (so that the xRight value is the same as the window
- *      width). However, GpiBox expects an inclusive-inclusive rectangle.
+ *      width -- tested V0.9.7 (2000-12-20) [umoeller]).
+ *
+ *      WinFillRect expects an inclusive-exclusive rectangle, so it
+ *      will work with a rectangle from WinQueryWindowRect directly.
+ *
+ *      By contrast, the GpiBox expects an inclusive-inclusive rectangle.
  *
  *      Function prefixes (new with V0.81):
@@ -194 +199 @@
  *      (bitmap) PS's also.
  *
- *      The specified rectangle is exclusive, meaning that
- *      the top right point lies _outside_ the rectangle
- *      which is actually drawn. This is the same as with
- *      WinFillRect. ### I don't think so any more... GpiBox
- *      uses inclusive-inclusive rectangles...
+ *      The specified rectangle is inclusive, that is, the top
+ *      right corner specifies the top right pixel to be drawn.
+ *      This is different from WinFillRect.
  *
  *      Changes to the HPS:
@@ -272 +275 @@
  *      The specified rectangle is inclusive, that is, the top
  *      right corner specifies the top right pixel to be drawn.
+ *      This is different from WinFillRect.
  *
  *      If usWidth > 1, the additional pixels will be drawn towards
@@ -288 +292 @@
 
 VOID gpihDrawThickFrame(HPS hps,              // in: presentation space for output
-                        PRECTL prcl,          // in: rectangle to draw (exclusive)
+                        PRECTL prcl,          // in: rectangle to draw (inclusive)
                         ULONG ulWidth)       // in: line width (>= 1)
 {
@@ -318 +322 @@
  *      The specified rectangle is inclusive, that is, the top
  *      right corner specifies the top right pixel to be drawn.
+ *      This is different from WinFillRect.
  *
  *      If usWidth > 1, the additional pixels will be drawn towards
@@ -324 +329 @@
  *
  *@@changed V0.9.0 [umoeller]: changed function prototype to have colors specified
+ *@@changed V0.9.7 (2000-12-20) [umoeller]: now really using inclusive rectangle...
  */
 
 VOID gpihDraw3DFrame(HPS hps,
-                     PRECTL prcl,       // in: rectangle
+                     PRECTL prcl,       // in: rectangle (inclusive)
                      USHORT usWidth,    // in: line width (>= 1)
                      LONG lColorLeft,   // in: color to use for left and top; e.g. SYSCLR_BUTTONLIGHT
@@ -342 +348 @@
         ptl1.y = rcl2.yBottom;
         GpiMove(hps, &ptl1);
-        ptl1.y = rcl2.yTop-1;
+        ptl1.y = rcl2.yTop;     // V0.9.7 (2000-12-20) [umoeller]
         GpiLine(hps, &ptl1);
-        ptl1.x = rcl2.xRight-1;
+        ptl1.x = rcl2.xRight;   // V0.9.7 (2000-12-20) [umoeller]
         GpiLine(hps, &ptl1);
         GpiSetColor(hps, lColorRight);
@@ -1063 +1069 @@
  *      screen yourself and need the height of a text
  *      line to advance to the next.
- */
-
-LONG gpihQueryLineSpacing(HPS hps,
-                          PSZ pszText)      // in:  text to output
+ *
+ *@@changed V0.9.7 (2000-12-20) [umoeller]: removed psz param
+ */
+
+LONG gpihQueryLineSpacing(HPS hps)
 {
     FONTMETRICS fm;
-    POINTL aptlText[TXTBOX_COUNT];
-    GpiQueryTextBox(hps, strlen(pszText), pszText,
-                    TXTBOX_COUNT, (PPOINTL)&aptlText);
 
     if (GpiQueryFontMetrics(hps, sizeof(FONTMETRICS), &fm))
         return ( (  fm.lMaxBaselineExt     // max vertical font space
                    +fm.lExternalLeading)    // space advised by font designer
-                 // * 12 / 10
                );
     else