Changeset 10343 for trunk/include/dcdata.h

Timestamp:

Nov 26, 2003, 4:52:49 PM (22 years ago)

Author:

sandervl

Message:

update

File:

• trunk/include/dcdata.h (modified) (4 diffs)

trunk/include/dcdata.h

@@ -29 +29 @@
 } XFORM_W, *PXFORM_W, *LPXFORM_W;
 
-#ifndef USING_OPEN32
-#ifndef GPI_INCLUDED
+#ifndef INCL_GPI
    typedef struct _SIZEF
    {
@@ -38 +37 @@
    typedef SIZEF *PSIZEF;
 
+#ifndef OS2DEF_INCLUDED
    typedef struct _MATRIXLF
    {
@@ -53 +53 @@
 
    typedef ULONG   HPS;
+#endif
 
    typedef struct _CHARBUNDLE
@@ -194 +195 @@
 } tDCData, *pDCData;
 #pragma pack()
-#else
-
-#ifndef GPI_INCLUDED
-   typedef struct _SIZEF
-   {
-      FIXED cx;
-      FIXED cy;
-   } SIZEF;
-   typedef SIZEF *PSIZEF;
-
-   typedef struct _MATRIXLF
-   {
-      FIXED fxM11;
-      FIXED fxM12;
-      LONG  lM13;
-      FIXED fxM21;
-      FIXED fxM22;
-      LONG  lM23;
-      LONG  lM31;
-      LONG  lM32;
-      LONG  lM33;
-   } MATRIXLF;
-   typedef MATRIXLF *PMATRIXLF;
-
-   typedef ULONG   HPS;
-#endif
-
-typedef struct _DCData
-{
-   HDC         hdc;
-   HWND        hwnd;
-   HPS         hps;
-
-   UINT        lastBrushKey;
-   PVOID       lastBrushObject;
-   UINT        lastPenHandle;
-   struct _penobject *lastPenObject;
-   UINT        lastFontHandle;
-   PVOID       lastFontObject;
-   UINT        lastBitmapHandle;
-   PVOID       lastBitmapObject;
-   UINT        lastPaletteHandle;
-   PVOID       lastPaletteObject;
-
-   UINT        nullBitmapHandle;
-
-   ULONG       BkColor;
-   ULONG       TextColor;
-   ULONG       BkColor_PM;
-   ULONG       TextColor_PM;
-
-   int         BkMode;
-   ULONG       BkMode_PM;
-
-   int         ROP2Mode;
-   int         ROP2Mode_PM;
-
-   unsigned    isMemoryPS:1;
-   unsigned    isMetaPS:1;
-   unsigned    isPrinter:1;
-   unsigned    isFrameWindow:1;
-   unsigned    isOD_QUEUED:1;
-   unsigned    isOD_INFO:1;
-   unsigned    isClient:1;
-   unsigned    isClientArea:1;
-   unsigned    isLeftLeft:1;
-   unsigned    isTopTop:1;
-   unsigned    isWideLine:1;
-   unsigned    alignUpdateCP:1;
-   unsigned    isCacheable:1;
-   unsigned    penIsExtPen:1;
-   unsigned    isValid:1;
-   unsigned    inPath:1;
-   unsigned    isStartDoc:1;
-   unsigned    resetStockFonts:1;
-   unsigned    unused:14;
-
-   ULONG       MapMode;
-   HBITMAP     bitmapHandle;
-   ULONG       bitmapHeight;
-   ULONG       bitmapWidth;
-   ULONG       hMeta;
-   PVOID       pMetaFileObject;
-   int         polyFillMode;
-   int         arcDirection;
-   int         stretchBltMode;
-   int         graphicsMode;
-   HRGN        hrgnHDC;
-
-   PS_Type     psType;
-
-   HDC_Type    hdcType;
-   USHORT      usFiller;
-   POINTL      viewportOrg;
-   double      viewportXExt;
-   double      viewportYExt;
-   POINTL      windowOrg;
-   SIZEL       windowExt;
-   HRGN        hrgnVis;
-   POINTL      ptlOrigin;
-   ULONG       printPageHeight;
-   PVOID       printerObject;
-
-   LONG        taMode;
-   XFORM_W     xform;
-
-   INT         worldYDeltaFor1Pixel;
-   INT         worldXDeltaFor1Pixel;
-   ULONG       colorMode;
-   PULONG      pLogColorTable;
-
-   ULONG       lcidBitfield;
-
-   HWND        hwndRealize;
-   ULONG       cpeMap;
-
-   LONG        lTechnology;
-
-   LONG        lWndXExtSave, lWndYExtSave,
-               lVwpXExtSave, lVwpYExtSave;
-
-   int         height;
-
-   POINTL      brushOrgPoint;
-
-   PVOID       pEnhMetaPalette;
-   PVOID       lpAbortProc;
-   ULONG       HPStoHDCInversionHeight;
-
-   int         saveLevel;
-
-   struct      _DCData *nextDCData;
-} tDCData, *pDCData;
-#endif
 
 #endif //__DCDATA_H__