Changeset 11819


Ignore:
Timestamp:
Oct 9, 1999, 8:16:58 PM (26 years ago)
Author:
sandervl
Message:

Desktop window lookup bugfix

Location:
tags/trunk/src/user32
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified tags/trunk/src/user32/Makefile

    r11783 r11819  
    1 # $Id: Makefile,v 1.27 1999-10-08 18:39:33 sandervl Exp $
     1# $Id: Makefile,v 1.28 1999-10-09 18:16:56 sandervl Exp $
    22
    33#
    … …  
    105105pmframe.obj: pmframe.cpp win32class.h win32wbase.h pmframe.h win32wndchild.h
    106106win32class.obj: win32class.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h
    107 win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h
     107win32wbase.obj:   win32wbase.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h dc.h pmframe.h win32wdesktop.h
    108108win32wnd.obj:   win32wnd.cpp win32class.h win32wbase.h win32wnd.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h  $(PDWIN32_INCLUDE)\winres.h oslibres.h win32wndhandle.h oslibdos.h oslibmenu.h
    109109win32dlg.obj:   win32dlg.cpp win32class.h win32wbase.h win32dlg.h gen_object.h heapshared.h oslibwin.h win32wndchild.h oslibmsg.h

  • TabularUnified tags/trunk/src/user32/win32wbase.cpp

    r11798 r11819  
    1 /* $Id: win32wbase.cpp,v 1.32 1999-10-09 09:45:27 sandervl Exp $ */
     1/* $Id: win32wbase.cpp,v 1.33 1999-10-09 18:16:57 sandervl Exp $ */
    22/*
    33 * Win32 Window Base Class for OS/2
    … …  
    3939#include "dc.h"
    4040#include "pmframe.h"
     41#include "win32wdesktop.h"
    4142
    4243#define HAS_DLGFRAME(style,exStyle) \
    … …  
    25302531 Win32BaseWindow *window;
    25312532
     2533   if(hwnd == NULL && windowDesktop)
     2534        return windowDesktop;
     2535
    25322536   if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
    25332537        return window;
    … …  
    25902594                return window->getWindowHandle();
    25912595        }
    2592         else  return hwnd;    //OS/2 window handle
     2596        window = GetWindowFromOS2FrameHandle(hwnd);
     2597        if(window) {
     2598                return window->getWindowHandle();
     2599        } 
     2600        else    return hwnd;    //OS/2 window handle
    25932601}
    25942602//******************************************************************************

  • TabularUnified tags/trunk/src/user32/win32wdesktop.h

    r11604 r11819  
    1 /* $Id: win32wdesktop.h,v 1.1 1999-09-23 10:33:59 sandervl Exp $ */
     1/* $Id: win32wdesktop.h,v 1.2 1999-10-09 18:16:57 sandervl Exp $ */
    22/*
    33 * Win32 Desktop Window for OS/2
    … …  
    3131#define DESKTOP_CLASS_NAMEA    "#32769"  /* Desktop */
    3232#define DESKTOP_CLASS_NAMEW   L"#32769"  /* Desktop */
     33#undef DESKTOP_CLASS_ATOM
    3334#define DESKTOP_CLASS_ATOM       32769   /* Desktop */
    3435

  • TabularUnified tags/trunk/src/user32/window.cpp

    r11748 r11819  
    1 /* $Id: window.cpp,v 1.11 1999-10-07 09:28:02 sandervl Exp $ */
     1/* $Id: window.cpp,v 1.12 1999-10-09 18:16:57 sandervl Exp $ */
    22/*
    33 * Win32 window apis for OS/2
    … …  
    405405        return 0;
    406406    }
    407     dprintf(("GetTopWindow %x", hwnd));
    408407    return window->GetTopWindow();
    409408}
    … …  
    591590{
    592591    HWND hwnd;
    593 //    dprintf(("USER32:  GetFocus\n"));
    594592
    595593    hwnd = OSLibWinQueryFocus(OSLIB_HWND_DESKTOP);
    596     return Win32BaseWindow::OS2ToWin32Handle(hwnd);
     594    dprintf(("USER32: GetFocus %x\n", hwnd));
     595    hwnd = Win32BaseWindow::OS2ToWin32Handle(hwnd);
     596    return hwnd;   
    597597}
    598598//******************************************************************************

  • TabularUnified tags/trunk/src/user32/winprop.cpp

    r11783 r11819  
    1 /* $Id: winprop.cpp,v 1.2 1999-10-08 18:39:35 sandervl Exp $ */
     1/* $Id: winprop.cpp,v 1.3 1999-10-09 18:16:58 sandervl Exp $ */
    22/*
    33 * Win32 Property apis for OS/2
    … …  
    1313#include <misc.h>
    1414#include "win32wbase.h"
     15
     16#undef DEBUG
    1517
    1618//******************************************************************************
Note: See TracChangeset for help on using the changeset viewer.