Changeset 9974 for trunk/src


Ignore:
Timestamp:
Apr 2, 2003, 2:58:02 PM (22 years ago)
Author:
sandervl
Message:

YD: Changes for header updates + WM_SETTEXT button fix

Location:
trunk/src/user32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/button.cpp

    r8629 r9974  
    1 /* $Id: button.cpp,v 1.46 2002-06-10 09:12:35 sandervl Exp $ */
     1/* $Id: button.cpp,v 1.47 2003-04-02 12:58:01 sandervl Exp $ */
    22/* File: button.cpp -- Button type widgets
    33 *
    … …  
    335335  DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
    336336
    337   DefWindowProcA(hwnd,WM_SETTEXT,wParam,lParam);
     337  LRESULT result = DefWindowProcA(hwnd,WM_SETTEXT,wParam,lParam);
    338338#ifdef __WIN32OS2__
    339339  BUTTONINFO* infoPtr = (BUTTONINFO*)GetInfoPtr(hwnd);
    … …  
    367367  if (dwStyle & WS_VISIBLE) PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
    368368
    369   return 0;
     369  return result;
    370370}
    371371

  • trunk/src/user32/display.cpp

    r6075 r9974  
    1 /* $Id: display.cpp,v 1.12 2001-06-23 07:27:08 achimha Exp $ */
     1/* $Id: display.cpp,v 1.13 2003-04-02 12:58:02 sandervl Exp $ */
    22/*
    33 * Display/Monitor Win32 apis
    … …  
    507507//******************************************************************************
    508508//******************************************************************************
    509 HMONITOR WIN32API MonitorFromRect(LPRECT lprcScreenCoords, DWORD dwFlags)
     509HMONITOR WIN32API MonitorFromRect(LPCRECT lprcScreenCoords, DWORD dwFlags)
    510510{
    511511    dprintf(("USER32: MonitorFromRect (%d,%d)(%d,%d) %x", lprcScreenCoords->left, lprcScreenCoords->top, lprcScreenCoords->right, lprcScreenCoords->bottom, dwFlags));

  • trunk/src/user32/winaccel.cpp

    r7409 r9974  
    1 /* $Id: winaccel.cpp,v 1.10 2001-11-21 11:51:39 sandervl Exp $ */
     1/* $Id: winaccel.cpp,v 1.11 2003-04-02 12:58:02 sandervl Exp $ */
    22/*
    33 * Win32 accelerator key functions for OS/2
    … …  
    405405       if( !(accel[i].fVirt & FVIRTKEY) ) {
    406406            ckey = (char) lpaccel[i].key;
    407             MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, &ckey, 1, &accel[i].key, 1);
     407            MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, &ckey, 1, (LPWSTR)&accel[i].key, 1);
    408408       }
    409409       else  accel[i].key = lpaccel[i].key;

  • trunk/src/user32/window.cpp

    r9930 r9974  
    1 /* $Id: window.cpp,v 1.133 2003-03-20 13:20:46 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.134 2003-04-02 12:58:02 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    17771777 *             SwitchToThisWindow   (USER32.539)
    17781778 */
    1779 DWORD WINAPI SwitchToThisWindow( HWND hwnd,  BOOL restore )
    1780 {
    1781     return ShowWindow( hwnd, restore ? SW_RESTORE : SW_SHOWMINIMIZED );
     1779VOID WINAPI SwitchToThisWindow( HWND hwnd,  BOOL restore )
     1780{
     1781    ShowWindow( hwnd, restore ? SW_RESTORE : SW_SHOWMINIMIZED );
    17821782}
    17831783//******************************************************************************

  • trunk/src/user32/winkeyboard.cpp

    r9922 r9974  
    1 /* $Id: winkeyboard.cpp,v 1.41 2003-03-17 17:59:34 sandervl Exp $ */
     1/* $Id: winkeyboard.cpp,v 1.42 2003-04-02 12:58:02 sandervl Exp $ */
    22/*
    33 * Win32 <-> PM key translation
    … …  
    18751875//******************************************************************************
    18761876//******************************************************************************
    1877 BOOL WIN32API ActivateKeyboardLayout(HKL hkl, UINT fuFlags)
     1877HKL WIN32API ActivateKeyboardLayout(HKL hkl, UINT fuFlags)
    18781878{
    18791879  dprintf(("not implemented\n"));
    1880   return(TRUE);
     1880  return NULL;
    18811881}
    18821882/*****************************************************************************
Note: See TracChangeset for help on using the changeset viewer.