Changeset 1108 for trunk/include

Timestamp:

Oct 2, 1999, 3:55:46 PM (26 years ago)

Author:

cbratschi

Message:

added DrawTextExA/W

Location:

trunk/include/win

Files:

• header.h (modified) (3 diffs)
• winuser.h (modified) (2 diffs)

trunk/include/win/header.h

@@ -1 @@
-/* $Id: header.h,v 1.1 1999-05-24 20:19:12 ktk Exp $ */
+/* $Id: header.h,v 1.2 1999-10-02 13:55:45 cbratschi Exp $ */
 
 /*
@@ -11 +11 @@
 #define __WINE_HEADER_H_
 
-typedef struct 
+typedef struct
 {
     INT     cxy;
     HBITMAP hbm;
-    LPWSTR    pszText;
+    LPWSTR  pszText;
     INT     fmt;
-    LPARAM    lParam;
+    LPARAM  lParam;
     INT     iImage;
-    INT     iOrder;             /* see documentation of HD_ITEM */
+    INT     iOrder;             /* see documentation of HD_ITEM */
 
-    BOOL    bDown;              /* is item pressed? (used for drawing) */
-    RECT    rect;               /* bounding rectangle of the item */
+    BOOL    bDown;              /* is item pressed? (used for drawing) */
+    RECT    rect;               /* bounding rectangle of the item */
 } HEADER_ITEM;
 
@@ -28 +28 @@
 typedef struct
 {
-    UINT      uNumItem; /* number of items (columns) */
-    INT       nHeight;  /* height of the header (pixels) */
-    HFONT     hFont;            /* handle to the current font */
-    HCURSOR   hcurArrow;        /* handle to the arrow cursor */
-    HCURSOR   hcurDivider;      /* handle to a cursor (used over dividers) <-|-> */
-    HCURSOR   hcurDivopen;      /* handle to a cursor (used over dividers) <-||-> */
-    BOOL      bCaptured;        /* Is the mouse captured? */
-    BOOL      bPressed; /* Is a header item pressed (down)? */
-    BOOL      bTracking;        /* Is in tracking mode? */
+    UINT      uNumItem; /* number of items (columns) */
+    INT       nHeight;  /* height of the header (pixels) */
+    HFONT     hFont;            /* handle to the current font */
+    HCURSOR   hcurArrow;        /* handle to the arrow cursor */
+    HCURSOR   hcurDivider;      /* handle to a cursor (used over dividers) <-|-> */
+    HCURSOR   hcurDivopen;      /* handle to a cursor (used over dividers) <-||-> */
+    BOOL      bCaptured;        /* Is the mouse captured? */
+    BOOL      bPressed; /* Is a header item pressed (down)? */
+    BOOL      bTracking;        /* Is in tracking mode? */
     BOOL      bUnicode;       /* Unicode flag */
-    INT       iMoveItem;        /* index of tracked item. (Tracking mode) */
-    INT       xTrackOffset;     /* distance between the right side of the tracked item and the cursor */
-    INT       xOldTrack;        /* track offset (see above) after the last WM_MOUSEMOVE */
-    INT       nOldWidth;        /* width of a sizing item after the last WM_MOUSEMOVE */
-    INT       iHotItem; /* index of hot item (cursor is over this item) */
+    INT       iMoveItem;        /* index of tracked item. (Tracking mode) */
+    INT       xTrackOffset;     /* distance between the right side of the tracked item and the cursor */
+    INT       xOldTrack;        /* track offset (see above) after the last WM_MOUSEMOVE */
+    INT       nOldWidth;        /* width of a sizing item after the last WM_MOUSEMOVE */
+    INT       iHotItem; /* index of hot item (cursor is over this item) */
 
-    HIMAGELIST  himl;           /* handle to a image list (may be 0) */
-    HEADER_ITEM *items;         /* pointer to array of HEADER_ITEM's */
+    HIMAGELIST  himl;           /* handle to a image list (may be 0) */
+    HEADER_ITEM *items;         /* pointer to array of HEADER_ITEM's */
     LPINT     pOrder;         /* pointer to order array */
 } HEADER_INFO;

trunk/include/win/winuser.h

@@ -1 @@
-/* $Id: winuser.h,v 1.8 1999-09-08 12:12:28 sandervl Exp $ */
+/* $Id: winuser.h,v 1.9 1999-10-02 13:55:46 cbratschi Exp $ */
 
 #ifndef __INCLUDE_WINUSER_H
@@ -3157 +3157 @@
 INT       WINAPI DrawTextW(HDC,LPCWSTR,INT,LPRECT,UINT);
 #define     DrawText WINELIB_NAME_AW(DrawText)
+INT       WINAPI DrawTextExA(HDC,LPCSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
+INT       WINAPI DrawTextExW(HDC,LPWSTR,INT,LPRECT,UINT,LPDRAWTEXTPARAMS);
+#define DrawTextEx WINELIB_NAME_AW(DrawTextEx)
 BOOL      WINAPI EmptyClipboard(void);
 BOOL      WINAPI EnableMenuItem(HMENU,UINT,UINT);