Ignore:
Timestamp:
Jul 24, 1999, 4:01:45 PM (26 years ago)
Author:
sandervl
Message:

* empty log message *

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/new/wingdi.cpp

    r378 r385  
    1 /* $Id: wingdi.cpp,v 1.5 1999-07-23 19:09:26 cbratschi Exp $ */
     1/* $Id: wingdi.cpp,v 1.6 1999-07-24 14:01:45 sandervl Exp $ */
    22/*
    33 * Win32 Window graphics apis for OS/2
    … …  
    1717#include <oslibgdi.h>
    1818
     19#define OPEN32_GDI
     20
    1921//******************************************************************************
    2022//TODO: Not complete
    … …  
    2325{
    2426  Win32Window *window;
     27  HDC hdc;
    2528
    2629    window = Win32Window::GetWindowFromHandle(hwnd);
    … …  
    2932        return 0;
    3033    }
    31     dprintf(("BeginPaint %X\n", hwnd));
    32     return O32_BeginPaint(window->getOS2WindowHandle(),lps);
     34#ifdef OPEN32_GDI
     35    hdc = O32_BeginPaint(window->getOS2WindowHandle(),lps);
    3336    //CB: conflict with Open32 mechanism
    34     //lps->hdc = OSLibWinBeginPaint(window->getOS2WindowHandle(), &lps->rcPaint);
     37#else
     38    hdc = OSLibWinBeginPaint(window->getOS2WindowHandle(), &lps->rcPaint);
     39    lps->hdc = hdc;
     40#endif
     41    dprintf(("BeginPaint %X returned %x\n", hwnd, hdc));
     42    return hdc;
    3543
    36     return lps->hdc;
     44//    return lps->hdc;
    3745}
    3846//******************************************************************************
    … …  
    4149{
    4250    dprintf(("EndPaint %x\n", hwnd));
     51#ifdef OPEN32_GDI
    4352    return O32_EndPaint(hwnd,lps);
    4453    //CB: dito
    45     //return OSLibWinEndPaint(lps->hdc);
     54#else
     55    return OSLibWinEndPaint(lps->hdc);
     56#endif
    4657}
    4758//******************************************************************************
    … …  
    5869   }
    5970   dprintf(("GetDC %x", hwnd));
     71#ifdef OPEN32_GDI
    6072   return O32_GetDC(window->getOS2WindowHandle());
    61    //return OSLibWinGetPS(window->getOS2WindowHandle());
     73#else
     74   return OSLibWinGetPS(window->getOS2WindowHandle());
     75#endif
    6276}
    6377//******************************************************************************
    … …  
    7589int WIN32API ReleaseDC(HWND hwnd, HDC hdc)
    7690{
     91#ifdef OPEN32_GDI
    7792    return O32_ReleaseDC(hwnd,hdc);
    78     //return OSLibWinReleasePS(hdc);
     93#else
     94    return OSLibWinReleasePS(hdc);
     95#endif
    7996}
    8097//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.