Changeset 3513 for trunk/src

Timestamp:

May 10, 2000, 3:14:44 PM (25 years ago)

Author:

sandervl

Message:

Get/SetForegroundWindow fixes/changes

Location:

trunk/src/user32

Files:

• oslibwin.cpp (modified) (2 diffs)
• oslibwin.h (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)
• window.cpp (modified) (3 diffs)

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.75 2000-05-03 18:35:51 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.76 2000-05-10 13:14:42 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -329 +329 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibWinQueryActiveWindow()
+HWND OSLibWinQueryActiveWindow()
 {
   return WinQueryActiveWindow(HWND_DESKTOP);

trunk/src/user32/oslibwin.h

@@ -1 @@
-/* $Id: oslibwin.h,v 1.42 2000-05-03 18:35:52 sandervl Exp $ */
+/* $Id: oslibwin.h,v 1.43 2000-05-10 13:14:43 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -214 +214 @@
 BOOL  OSLibWinIsWindowEnabled(HWND hwnd);
 BOOL  OSLibWinIsWindowVisible(HWND hwnd);
-BOOL  OSLibWinQueryActiveWindow();
+HWND  OSLibWinQueryActiveWindow();
 
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.185 2000-05-09 18:56:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.186 2000-05-10 13:14:43 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2695 +2695 @@
 }
 //******************************************************************************
+//TODO: Not be 100% correct; should return active window of current thread
+//      or NULL when there is none -> WinQueryActiveWindow just returns
+//      the current active window
 //******************************************************************************
 HWND Win32BaseWindow::GetActiveWindow()

trunk/src/user32/window.cpp

@@ -1 @@
-/* $Id: window.cpp,v 1.66 2000-05-09 18:56:59 sandervl Exp $ */
+/* $Id: window.cpp,v 1.67 2000-05-10 13:14:44 sandervl Exp $ */
 /*
  * Win32 window apis for OS/2
@@ -775 +775 @@
     dprintf((" SetForegroundWindow %x", hwnd));
 
-    return SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER );
+    return SetWindowPos( hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);
 }
 //******************************************************************************
@@ -1422 +1422 @@
 HWND WIN32API GetForegroundWindow(void)
 {
-    dprintf(("USER32:  GetForegroundWindow"));
-    return Win32BaseWindow::OS2ToWin32Handle(O32_GetForegroundWindow());
+ HWND hwnd;
+
+    hwnd = Win32BaseWindow::OS2ToWin32Handle(OSLibWinQueryActiveWindow());
+    dprintf(("USER32: GetForegroundWindow returned %x", hwnd));
+    return hwnd;
 }
 //******************************************************************************