Changeset 22135 for trunk/src


Ignore:
Timestamp:
Jul 25, 2017, 11:59:20 PM (8 years ago)
Author:
dmik
Message:

user32: Make r22134 actually work.

It would not due to using a virtual function from the base destructor
(which always calls the base version instead of the derived).

Location:
trunk/src/user32
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/user32/win32wbase.cpp

    r22134 r22135  
    123123  fDirtyUpdateRegion = FALSE;
    124124  fWindowLocked    = FALSE;
     125  fFakeWindow      = FALSE;
    125126
    126127  state            = STATE_INIT;
    … …  
    220221    }
    221222
    222     if (!isFakeWindow()) {   
     223    if (!isFakeWindow()) {
    223224        OSLibWinSetVisibleRegionNotify(OS2Hwnd, FALSE);
    224225        OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
    … …  
    14481449//******************************************************************************
    14491450BOOL Win32BaseWindow::isDesktopWindow()
    1450 {
    1451   return FALSE;
    1452 }
    1453 //******************************************************************************
    1454 //******************************************************************************
    1455 BOOL Win32BaseWindow::isFakeWindow()
    14561451{
    14571452  return FALSE;

  • trunk/src/user32/win32wbase.h

    r21916 r22135  
    180180virtual  BOOL   isMDIChild();
    181181virtual  BOOL   isDesktopWindow();
    182 virtual  BOOL   isFakeWindow();
     182         BOOL   isFakeWindow()                  { return fFakeWindow; }
    183183
    184184         BOOL   fHasParentDC()                  { return fParentDC; };
    … …  
    423423                 fIsDragDropActive:1,
    424424                 fDirtyUpdateRegion:1,
    425                  fWindowLocked:1;
     425                 fWindowLocked:1,
     426                 fFakeWindow:1;
    426427
    427428        ULONG   state;

  • trunk/src/user32/win32wfake.cpp

    r22003 r22135  
    9494    if (!fInited)  init();
    9595
     96    fFakeWindow = TRUE;
     97
    9698    OS2Hwnd = OS2HwndFrame = hwndOS2;
    9799
    … …  
    220222    OSLibWinQueryWindowClientRect(OS2Hwnd, &rectClient);
    221223    getWindowRect();
    222     return TRUE;
    223 }
    224 //******************************************************************************
    225 //******************************************************************************
    226 BOOL Win32FakeWindow::isFakeWindow()
    227 {
    228224    return TRUE;
    229225}

  • trunk/src/user32/win32wfake.h

    r21916 r22135  
    2424virtual  PRECT  getWindowRect();
    2525
    26 virtual  BOOL   isFakeWindow();
    27 
    2826static Win32FakeWindow *GetWindowFromOS2Handle(HWND hwnd);
    2927static void     init();
Note: See TracChangeset for help on using the changeset viewer.