Changeset 1094 for trunk/src/user32


Ignore:
Timestamp:
Sep 29, 1999, 11:31:18 AM (26 years ago)
Author:
dengert
Message:

caret blinking and recreation

Location:
trunk/src/user32
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/caret.cpp

    r1088 r1094  
    1 /* $Id: caret.cpp,v 1.3 1999-09-28 18:31:24 dengert Exp $ */
     1/* $Id: caret.cpp,v 1.4 1999-09-29 09:31:18 dengert Exp $ */
    22
    33/*
    … …  
    262262   CURSORINFO cursorInfo;
    263263
    264    if ((hwndCaret == hwndFocus) &&
     264   if ((hwndFocus != 0) && (hwndCaret == hwndFocus) &&
    265265       !WinQueryCursorInfo (HWND_DESKTOP, &cursorInfo))
    266266   {
     267      dprintf(("recreateCaret for %x", hwndFocus));
     268
    267269      CreateCaret (hwndCaret, hbmCaret, CaretWidth, CaretHeight);
    268270      SetCaretPos (CaretPosX, CaretPosY);

  • trunk/src/user32/pmwindow.cpp

    r1093 r1094  
    1 /* $Id: pmwindow.cpp,v 1.12 1999-09-29 09:16:31 sandervl Exp $ */
     1/* $Id: pmwindow.cpp,v 1.13 1999-09-29 09:31:18 dengert Exp $ */
    22/*
    33 * Win32 Window Managment Code for OS/2
    … …  
    3030#include <thread.h>
    3131#include <wprocess.h>
     32#include <caret.h>
    3233
    3334HMQ  hmq = 0;                             /* Message queue handle         */
    … …  
    413414        }
    414415        if((ULONG)mp2 == TRUE) {
    415                 rc = win32wnd->MsgSetFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
     416                HWND hwndFocusWin32 = Win32BaseWindow::OS2ToWin32Handle(hwndFocus);
     417                recreateCaret (hwndFocusWin32);
     418                rc = win32wnd->MsgSetFocus(hwndFocusWin32);
    416419        }
    417420        else    rc = win32wnd->MsgKillFocus(Win32BaseWindow::OS2ToWin32Handle(hwndFocus));
    … …  
    748751
    749752    case WM_TIMER:
    750         win32wnd->MsgTimer((ULONG)mp1);
     753        if (mp2) win32wnd->MsgTimer((ULONG)mp1);
    751754        goto RunDefWndProc;
    752755

  • trunk/src/user32/timer.cpp

    r1066 r1094  
    1 /* $Id: timer.cpp,v 1.3 1999-09-26 16:09:04 dengert Exp $ */
     1/* $Id: timer.cpp,v 1.4 1999-09-29 09:31:18 dengert Exp $ */
    22
    33/*
    … …  
    7474
    7575    if (i == NB_TIMERS)  /* no matching timer found */
    76         return (TRUE);   /* eat message */
     76        return (FALSE);  /* forward message */
    7777
    7878    pMsg->mp1 = MPFROMLONG (pTimer->id);
     79    pMsg->mp2 = MPFROMLONG (TRUE);   /* mark for Win32 */
    7980    if (!pTimer->proc)
    8081        return (FALSE);  /* forward message */
Note: See TracChangeset for help on using the changeset viewer.