Changeset 3641 for trunk/src


Ignore:
Timestamp:
Jun 1, 2000, 1:27:57 PM (25 years ago)
Author:
sandervl
Message:

Moved GetClipRgn & GetClipBox into user32 (dc.cpp)

Location:
trunk/src
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gdi32/gdi32.cpp

    r3589 r3641  
    1 /* $Id: gdi32.cpp,v 1.47 2000-05-22 19:11:28 sandervl Exp $ */
     1/* $Id: gdi32.cpp,v 1.48 2000-06-01 11:27:05 sandervl Exp $ */
    22
    33/*
    … …  
    240240//******************************************************************************
    241241//******************************************************************************
    242 int WIN32API SetBkMode( HDC arg1, int  arg2)
    243 {
    244     dprintf(("GDI32: SetBkMode\n"));
    245     return O32_SetBkMode(arg1, arg2);
     242int WIN32API SetBkMode( HDC hdc, int mode)
     243{
     244    dprintf(("GDI32: SetBkMode %x %d (old %d)", hdc, mode, O32_GetBkMode(hdc)));
     245    return O32_SetBkMode(hdc, mode);
    246246}
    247247//******************************************************************************
    … …  
    796796//******************************************************************************
    797797//******************************************************************************
    798 int WIN32API GetClipBox( HDC arg1, PRECT  arg2)
    799 {
    800  int rc;
    801 
    802   rc = O32_GetClipBox(arg1, arg2);
    803   dprintf(("GDI32: GetClipBox of %X returned %d\n", arg1, rc));
    804   return(rc);
    805 }
    806 //******************************************************************************
    807 //******************************************************************************
    808798HANDLE WIN32API GetCurrentObject( HDC hdc, UINT arg2)
    809799{

  • trunk/src/gdi32/makefile

    r3076 r3641  
    1 # $Id: makefile,v 1.24 2000-03-10 16:13:45 sandervl Exp $
     1# $Id: makefile,v 1.25 2000-06-01 11:27:06 sandervl Exp $
    22
    33#
    … …  
    6262# Dll rule - builds the target dll.
    6363$(OBJDIR)\$(TARGET).dll: $(OBJS) $(TARGET).def $(OBJDIR)\$(TARGET).lrf
    64     $(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
     64    -4$(LD2) $(LD2FLAGS) @$(OBJDIR)\$(TARGET).lrf
    6565
    6666

  • trunk/src/gdi32/region.cpp

    r3273 r3641  
    1 /* $Id: region.cpp,v 1.3 2000-03-29 17:15:35 sandervl Exp $ */
     1/* $Id: region.cpp,v 1.4 2000-06-01 11:27:06 sandervl Exp $ */
    22
    33/*
    … …  
    117117    dprintf(("GDI32: FrameRgn"));
    118118    return O32_FrameRgn(arg1, arg2, arg3, arg4, arg5);
    119 }
    120 //******************************************************************************
    121 //******************************************************************************
    122 int WIN32API GetClipRgn( HDC arg1, HRGN  arg2)
    123 {
    124     dprintf(("GDI32: GetClipRgn"));
    125     return O32_GetClipRgn(arg1, arg2);
    126119}
    127120//******************************************************************************

  • trunk/src/user32/USER32.DEF

    r3419 r3641  
    1 ; $Id: USER32.DEF,v 1.30 2000-04-18 11:12:59 sandervl Exp $
     1; $Id: USER32.DEF,v 1.31 2000-06-01 11:27:55 sandervl Exp $
    22
    33;Created by BLAST for IBM's compiler
    … …  
    644644
    645645    _KEYBOARD_Enable@4                                           @2011
     646
     647    ;SvL: Belongs in GDI32, but put in dc.cpp to group similar apis
     648    _GetClipBox@8                                                @2014
     649    _GetClipRgn@8                                                @2015

  • trunk/src/user32/button.cpp

    r3584 r3641  
    1 /* $Id: button.cpp,v 1.35 2000-05-22 17:21:06 cbratschi Exp $ */
     1/* $Id: button.cpp,v 1.36 2000-06-01 11:27:56 sandervl Exp $ */
    22/* File: button.cpp -- Button type widgets
    33 *
    … …  
    176176static LRESULT BUTTON_EraseBkgnd(HWND hwnd,WPARAM wParam,LPARAM lParam)
    177177{
     178  //SvL: This is wrong: should be
     179  //SvL: TODO: NT does something extra for ownerdrawn buttons; check this
     180//  if(style == BS_OWNERDRAW) {
     181//        return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
     182//  }
     183//  return 1;
     184
    178185  //SvL: Erase background for groupboxes as the paint function only draws
    179186  //     a box

  • trunk/src/user32/dc.cpp

    r3525 r3641  
    1 /* $Id: dc.cpp,v 1.57 2000-05-12 18:09:39 sandervl Exp $ */
     1/* $Id: dc.cpp,v 1.58 2000-06-01 11:27:56 sandervl Exp $ */
    22
    33/*
    … …  
    685685}
    686686#endif
     687//******************************************************************************
     688//******************************************************************************
     689int WIN32API GetClipBox( HDC arg1, PRECT  arg2)
     690{
     691 int rc;
     692
     693  rc = O32_GetClipBox(arg1, arg2);
     694  dprintf(("GDI32: GetClipBox of %X returned %d\n", arg1, rc));
     695  return(rc);
     696}
     697//******************************************************************************
     698//******************************************************************************
     699int WIN32API GetClipRgn( HDC hdc, HRGN hRgn)
     700{
     701    dprintf(("GDI32: GetClipRgn"));
     702    return O32_GetClipRgn(hdc, hRgn);
     703}
    687704//******************************************************************************
    688705//******************************************************************************

  • trunk/src/user32/dc.h

    r2582 r3641  
    1 /* $Id: dc.h,v 1.11 2000-01-31 22:30:51 sandervl Exp $ */
     1/* $Id: dc.h,v 1.12 2000-06-01 11:27:57 sandervl Exp $ */
    22/*
    33 * public dc functions
    … …  
    438438
    439439
     440int       APIENTRY _O32_GetClipRgn( HDC, HRGN );
     441
     442inline int O32_GetClipRgn(HDC a, HRGN b)
     443{
     444 int yyrc;
     445 USHORT sel = RestoreOS2FS();
     446
     447    yyrc = _O32_GetClipRgn(a, b);
     448    SetFS(sel);
     449
     450    return yyrc;
     451}
     452
     453int       OPEN32API _O32_GetClipBox( HDC, PRECT );
     454
     455inline int O32_GetClipBox(HDC a, PRECT b)
     456{
     457 int yyrc;
     458 USHORT sel = RestoreOS2FS();
     459
     460    yyrc = _O32_GetClipBox(a, b);
     461    SetFS(sel);
     462
     463    return yyrc;
     464}
     465
    440466   // from pmddi.h:
    441467   /* CopyClipRegion */

  • trunk/src/user32/win32wbase.cpp

    r3625 r3641  
    1 /* $Id: win32wbase.cpp,v 1.196 2000-05-28 16:43:46 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.197 2000-06-01 11:27:57 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    515515                                 (owner) ? owner->getOS2WindowHandle() : OSLIB_HWND_DESKTOP,
    516516                                 (hwndLinkAfter == HWND_BOTTOM) ? TRUE : FALSE,
    517                                  &OS2HwndFrame, 0, fTaskList,fXDefault | fCXDefault,windowClass->getStyle() & CS_SAVEBITS);
     517                                 &OS2HwndFrame, 0, fTaskList,fXDefault | fCXDefault,windowClass->getStyle());
    518518  if(OS2Hwnd == 0) {
    519519        dprintf(("Window creation failed!!"));
Note: See TracChangeset for help on using the changeset viewer.