Changeset 9217 for trunk/src


Ignore:
Timestamp:
Sep 6, 2002, 2:31:42 PM (23 years ago)
Author:
sandervl
Message:

fixed caret bug in edit control; removed obsolete code in createcaret

Location:
trunk/src/user32
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/user32/caret.cpp

    r5935 r9217  
    1 /* $Id: caret.cpp,v 1.18 2001-06-09 14:50:16 sandervl Exp $ */
     1/* $Id: caret.cpp,v 1.19 2002-09-06 12:31:40 sandervl Exp $ */
    22
    33/*
     
    6666       if (!wnd) return (FALSE);
    6767
    68        wnd->SetFakeOpen32();
    69 
    7068       rc = O32_CreateCaret (wnd->getOS2WindowHandle(), hBmp, width, height);
    7169       if (rc)
     
    7876       }
    7977
    80        wnd->RemoveFakeOpen32();
    8178       RELEASE_WNDOBJ(wnd);
    8279       return (rc);
  • trunk/src/user32/edit.cpp

    r9023 r9217  
    1 /* $Id: edit.cpp,v 1.46 2002-08-17 10:33:54 sandervl Exp $ */
     1/* $Id: edit.cpp,v 1.47 2002-09-06 12:31:40 sandervl Exp $ */
    22/*
    33 *      Edit control
     
    32733273         */
    32743274        FillRect(dc, &rc, brush);
     3275        ShowCaret(hwnd);
    32753276        return -1;
    32763277}
  • trunk/src/user32/win32wbase.cpp

    r9143 r9217  
    1 /* $Id: win32wbase.cpp,v 1.337 2002-08-27 09:30:50 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.338 2002-09-06 12:31:41 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
     
    716716#endif
    717717
    718     fakeWinBase.hwndThis     = OS2Hwnd;
    719     fakeWinBase.pWindowClass = windowClass;
    720 
    721718    //Set icon from window or class
    722719    if (hIcon)
  • trunk/src/user32/win32wbase.h

    r9101 r9217  
    1 /* $Id: win32wbase.h,v 1.144 2002-08-23 15:06:01 sandervl Exp $ */
     1/* $Id: win32wbase.h,v 1.145 2002-09-06 12:31:42 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
     
    1717
    1818#include <win32class.h>
    19 #include "open32wbase.h"
    2019#include <gen_object.h>
    2120#include <win32wndchild.h>
     
    519518
    520519public:
    521          void SetFakeOpen32()    { WinSetDAXData (OS2Hwnd, &fakeWinBase); }
    522          void RemoveFakeOpen32() { WinSetDAXData (OS2Hwnd, NULL); }
    523 
    524          fakeOpen32WinBaseClass fakeWinBase;
    525520
    526521         VOID  AdjustMaximizedRect(LPRECT rect);
Note: See TracChangeset for help on using the changeset viewer.