Changeset 8301 for trunk/src

Timestamp:

Apr 24, 2002, 10:56:17 AM (23 years ago)

Author:

sandervl

Message:

PF: listbox fix when button clicked outside control (rollup dropdown); minimize fixes (activation + z-order)

Location:

trunk/src/user32

Files:

• combo.cpp (modified) (2 diffs)
• listbox.cpp (modified) (2 diffs)
• oslibwin.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/combo.cpp

@@ -1 @@
-/* $Id: combo.cpp,v 1.33 2001-02-17 20:16:31 sandervl Exp $ */
+/* $Id: combo.cpp,v 1.34 2002-04-24 08:56:16 sandervl Exp $ */
 /*
  * Combo controls
@@ -1272 +1272 @@
    return TRUE;
 }
+
+#ifdef __WIN32OS2__
+/***********************************************************************
+ *           COMBO_RollupListbox
+ *
+ * @@PF Odin specific function. 
+ */
+BOOL COMBO_RollupListbox( LPHEADCOMBO lphc)
+{
+   if(lphc->wState & CBF_DROPPED)
+   {
+       CBRollUp( lphc, FALSE, FALSE);
+       return TRUE;
+   }
+   return FALSE;
+}
+#endif
 
 /***********************************************************************

trunk/src/user32/listbox.cpp

@@ -1 @@
-/* $Id: listbox.cpp,v 1.27 2001-07-09 18:10:44 sandervl Exp $ */
+/* $Id: listbox.cpp,v 1.28 2002-04-24 08:56:16 sandervl Exp $ */
 /*
  * Listbox controls
@@ -2040 +2040 @@
         ReleaseCapture();
         LISTBOX_SetSelection( hwnd, pDescr, pDescr->lphc->droppedIndex, FALSE, FALSE );
+#ifdef __WIN32OS2__
+        COMBO_RollupListbox(pDescr->lphc);
+ 
+       /* @@PF Previous code is all wrong here. Here we are supposed to close
+         and only close dropdown, instead flip, flips it. This happens because
+         previous code did not pay attention to the fact that combobox can be
+         closed with SendMessage by application, as MFC apps do     
+         COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE ); */
+#else
         COMBO_FlipListbox( pDescr->lphc, FALSE, FALSE );
-
+#endif
         return 0;
       } else

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.117 2002-03-27 10:56:24 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.118 2002-04-24 08:56:17 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -542 +542 @@
 BOOL OSLibWinMinimizeWindow(HWND hwnd)
 {
-  return WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_MINIMIZE);
+ /* @@PF The reason for this weird minimize algorithm is that we are not fully
+    using PM for minimization. I.e. we respect all PM messages yet we do mess
+    so much with some messages that minimization is based partly on vodoo. 
+    That is if you try minimize and deactivate in one call it will fail.
+    Here we deactivate yourselves and give focus to next window that is
+    on desktop, this func also works with MDI */
+
+    BOOL rc;
+
+    rc = WinSetWindowPos(hwnd, 0, 0, 0, 0, 0, SWP_MINIMIZE);
+    if (rc) {
+        rc = WinSetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, SWP_DEACTIVATE | SWP_ZORDER);
+    }
+    return (rc);
 }
 //******************************************************************************

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.322 2002-04-07 21:37:34 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.323 2002-04-24 08:56:17 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2319 +2319 @@
     else OSLibWinMinimizeWindow(getOS2FrameWindowHandle());
 
-    if(!(swp & SWP_NOACTIVATE)) {
+    if(!(swp & SWP_NOACTIVATE) && (!(getStyle() & WS_MINIMIZE))) {
         OSLibWinSetActiveWindow(OS2HwndFrame);
     }