Changeset 21720 for branches/gcc-kmk/src/user32/window.cpp
- Timestamp:
- Oct 19, 2011, 11:26:02 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/gcc-kmk/src/user32/window.cpp
r21347 r21720 39 39 #include "pmwindow.h" 40 40 #include "oslibmsg.h" 41 #include <win \winpos.h>42 #include <win \win.h>41 #include <win/winpos.h> 42 #include <win/win.h> 43 43 #include <heapstring.h> 44 44 #include <winuser32.h> … … 155 155 } 156 156 HWND hwnd = window->getWindowHandle(); 157 157 158 158 // set myself as last active popup / window 159 159 window->setLastActive( hwnd ); 160 160 161 161 RELEASE_WNDOBJ(window); 162 162 return hwnd; … … 262 262 } 263 263 HWND hwnd = window->getWindowHandle(); 264 264 265 265 // set myself as last active popup / window 266 266 window->setLastActive( hwnd ); 267 267 268 268 RELEASE_WNDOBJ(window); 269 269 return hwnd; … … 300 300 } 301 301 hwndActive = window->SetActiveWindow(); 302 302 303 303 // check last active popup window 304 304 if (hwndActive) … … 308 308 dprintf(("support for last active popup incorrectly implemented")); 309 309 } 310 310 311 311 RELEASE_WNDOBJ(window); 312 312 return hwndActive; … … 561 561 if ((nCmdShow == SW_RESTORE) && (window->getStyle() & WS_MINIMIZE) && fOS2Look ) 562 562 { 563 dprintf(("ShowWindow: Initiating OS/2 PM restore")); 563 dprintf(("ShowWindow: Initiating OS/2 PM restore")); 564 564 ret = OSLibWinRestoreWindow(window->getOS2FrameWindowHandle()); 565 565 } 566 else 566 else 567 567 ret = window->ShowWindow(nCmdShow); 568 568 RELEASE_WNDOBJ(window); … … 720 720 ret = TRUE; 721 721 722 if(dwStyle & WS_CHILD) 722 if(dwStyle & WS_CHILD) 723 723 { 724 724 //check visibility of parents … … 762 762 //else no child -> no parent (GetParent returns owner otherwise!) 763 763 } 764 else 765 if (type == GA_ROOT) 764 else 765 if (type == GA_ROOT) 766 766 { 767 767 hwndAncestor = window->GetTopParent(); 768 768 } 769 769 else 770 if (type == GA_ROOTOWNER) 771 { 772 if(hwnd != GetDesktopWindow()) 770 if (type == GA_ROOTOWNER) 771 { 772 if(hwnd != GetDesktopWindow()) 773 773 { 774 774 hwndAncestor = hwnd; … … 804 804 TEB *teb; 805 805 806 dprintf(("SetFocus %x", hwnd)); 806 dprintf(("SetFocus %x", hwnd)); 807 807 teb = GetThreadTEB(); 808 808 if(teb == NULL) { … … 929 929 lpThreadInfo->hwndActive = GetActiveWindow(); 930 930 if(lpThreadInfo->hwndActive) { 931 if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 931 if(dwThreadId != GetWindowThreadProcessId(lpThreadInfo->hwndActive, NULL)) 932 932 {//this thread doesn't own the active window (TODO: correct??) 933 933 lpThreadInfo->hwndActive = 0; … … 980 980 windowDesktop->addRef(); 981 981 window = windowDesktop; 982 } 982 } 983 983 else window = Win32BaseWindow::GetWindowFromHandle(hwnd); 984 984 985 985 if(!window) { 986 986 dprintf(("GetWindowRect, window %x not found", hwnd)); … … 1104 1104 * InternalGetWindowText (USER32.326) 1105 1105 */ 1106 int WIN32API InternalGetWindowText(HWND hwnd, 1106 int WIN32API InternalGetWindowText(HWND hwnd, 1107 1107 LPWSTR lpString, 1108 1108 INT nMaxCount ) … … 1274 1274 windowDesktop->addRef(); 1275 1275 wndfrom = windowDesktop; 1276 } 1276 } 1277 1277 else { 1278 1278 wndfrom = Win32BaseWindow::GetWindowFromHandle(hwndFrom); … … 1288 1288 windowDesktop->addRef(); 1289 1289 wndto = windowDesktop; 1290 } 1290 } 1291 1291 else { 1292 1292 wndto = Win32BaseWindow::GetWindowFromHandle(hwndTo); … … 1887 1887 { 1888 1888 // WND *wndPtr = WIN_FindWndPtr(hwndChild); 1889 1889 1890 1890 // WINPOS_ShowIconTitle( wndPtr, FALSE ); 1891 1891 1892 1892 SetWindowPos( hwndChild, 0, x + (xspacing - GetSystemMetrics(SM_CXICON)) / 2, 1893 1893 y - yspacing - GetSystemMetrics(SM_CYICON)/2, 0, 0, … … 2003 2003 2004 2004 owner = Win32BaseWindow::GetWindowFromHandle(hWnd); 2005 if(!owner) 2005 if(!owner) 2006 2006 { 2007 2007 dprintf(("GetLastActivePopup, window %x not found", hWnd)); … … 2013 2013 if (!IsWindow( hwndRetVal )) 2014 2014 hwndRetVal = owner->getWindowHandle(); 2015 2015 2016 2016 RELEASE_WNDOBJ(owner); 2017 2017 2018 2018 return hwndRetVal; 2019 2019 } … … 2036 2036 } 2037 2037 RELEASE_WNDOBJ(window); 2038 2038 2039 2039 return dwThreadId; 2040 2040 } … … 2220 2220 } 2221 2221 //****************************************************************************** 2222 //The GetWindowModuleFileName function retrieves the full path and file name of 2222 //The GetWindowModuleFileName function retrieves the full path and file name of 2223 2223 //the module associated with the specified window handle. 2224 2224 //******************************************************************************
Note:
See TracChangeset
for help on using the changeset viewer.