Changeset 1346 for trunk/src/user32/windlg.cpp

Timestamp:

Oct 17, 1999, 10:18:47 PM (26 years ago)

Author:

sandervl

Message:

GetDlgItem fix + printfs for extra MFC messages

File:

• trunk/src/user32/windlg.cpp (modified) (2 diffs)

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.6 1999-10-12 20:16:24 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.7 1999-10-17 20:18:46 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -221 +221 @@
 }
 //******************************************************************************
-//TODO: Can be used for any parent-child pair
+//Can be used for any parent-child pair
 //******************************************************************************
 HWND WIN32API GetDlgItem(HWND hwnd, int id)
 {
-  Win32Dialog *dialog;
-  Win32BaseWindow *dlgcontrol;
-
-    dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!dialog || !dialog->IsDialog()) {
+  Win32BaseWindow *dlgcontrol, *window;
+
+    window = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
         dprintf(("GetDlgItem, window %x not found", hwnd));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
     }
-    dlgcontrol = dialog->getDlgItem(id);
+    dlgcontrol = window->FindWindowById(id);
     if(dlgcontrol) {
         dprintf(("USER32: GetDlgItem %x %d returned %x\n", hwnd, id, dlgcontrol->getWindowHandle()));