Changeset 1391 for trunk/src/user32/win32dlg.cpp

Timestamp:

Oct 21, 1999, 2:19:29 PM (26 years ago)

Author:

sandervl

Message:

wm_adjustwindowpos & combobox fixes

File:

• trunk/src/user32/win32dlg.cpp (modified) (3 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.18 1999-10-17 20:18:45 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.19 1999-10-21 12:19:27 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -20 +20 @@
 #include "oslibmsg.h"
 #include "win32wdesktop.h"
+#include "controls.h"
 
 #define DEFAULT_DLGFONT "9.WarpSans"
@@ -770 +771 @@
         if (hwndCurFocus)
         {
-#if 0
-            WND *wnd = WIN_FindWndPtr( hwndFocus );
-
-            if( wnd )
+            Win32BaseWindow *wndFocus = Win32BaseWindow::GetWindowFromHandle(hwndFocus);
+
+            if(wndFocus)
             {
                 /* always make combo box hide its listbox control */
-                if( WIDGETS_IsControl( wnd, BIC32_COMBO ) )
-                    SendMessageA( hwndFocus, CB_SHOWDROPDOWN, FALSE, 0 );
+                if( WIDGETS_IsControl( wndFocus, COMBOBOX_CONTROL ) )
+                    wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
                 else
-                if( WIDGETS_IsControl( wnd, BIC32_EDIT ) &&
-                    WIDGETS_IsControl( wnd->parent, BIC32_COMBO ))
-                    SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
+                if( WIDGETS_IsControl( wndFocus, EDIT_CONTROL ) &&
+                    WIDGETS_IsControl( wndFocus->getParent(), COMBOBOX_CONTROL ))
+                    wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
             }
-#endif
         }
         return DefWindowProcA( msg, wParam, lParam );