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

Timestamp:

Oct 30, 1999, 8:40:49 PM (26 years ago)

Author:

cbratschi

Message:

button, static, scroll and dialog fixes

File:

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

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.8 1999-10-30 10:55:16 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.9 1999-10-30 18:40:49 cbratschi Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -202 +202 @@
 BOOL WIN32API MapDialogRect(HWND hwndDlg, LPRECT rect)
 {
-  Win32Dialog *dialog;
-
-    dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwndDlg);
-    if(!dialog || !dialog->IsDialog()) {
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwndDlg);
+    if(!window) {
         dprintf(("MapDialogRect, window %x not found", hwndDlg));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -211 +211 @@
     }
     dprintf(("USER32: MapDialogRect\n"));
-    return dialog->MapDialogRect(rect);
+    return window->MapDialogRect(rect);
 }
 //******************************************************************************
@@ -218 +218 @@
 {
     dprintf(("USER32:  IsDlgButtonChecked\n"));
-    //CB: get button state
+
     return (BOOL)SendDlgItemMessageA(hwnd, id,BM_GETCHECK,0,0);
 }
@@ -225 +225 @@
 HWND WIN32API GetNextDlgTabItem(HWND hwndDlg, HWND hwndCtrl, BOOL fPrevious)
 {
-  Win32Dialog *dialog;
-
-    dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwndDlg);
-    if(!dialog || !dialog->IsDialog()) {
+  Win32BaseWindow *window;
+
+    window = (Win32BaseWindow*)Win32BaseWindow::GetWindowFromHandle(hwndDlg);
+    if(!window) {
         dprintf(("GetNextDlgTabItem, window %x not found", hwndDlg));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -234 +234 @@
     }
     dprintf(("USER32:  GetNextDlgTabItem\n"));
-    return dialog->getNextDlgTabItem(hwndCtrl, fPrevious);
+    return window->getNextDlgTabItem(hwndCtrl, fPrevious);
 }
 //******************************************************************************
@@ -251 +251 @@
     dlgcontrol = window->FindWindowById(id);
     if(dlgcontrol) {
-        dprintf(("USER32: GetDlgItem %x %d returned %x\n", hwnd, id, dlgcontrol->getWindowHandle()));
+        dprintf(("USER32: GetDlgItem %x %d returned %x\n", hwnd, id, dlgcontrol->getWindowHandle()));
         return dlgcontrol->getWindowHandle();
     }
@@ -369 +369 @@
 HWND WIN32API GetNextDlgGroupItem( HWND hwnd, HWND hwndCtrl, BOOL fPrevious)
 {
-  Win32Dialog *dialog;
-
-    dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwnd);
-    if(!dialog || !dialog->IsDialog()) {
+  Win32BaseWindow *window;
+
+    window = Win32BaseWindow::GetWindowFromHandle(hwnd);
+    if(!window) {
         dprintf(("GetNextDlgGroupItem, window %x not found", hwnd));
         SetLastError(ERROR_INVALID_WINDOW_HANDLE);
@@ -378 +378 @@
     }
     dprintf(("USER32:  GetNextDlgGroupItem\n"));
-    return dialog->getNextDlgGroupItem(hwndCtrl, fPrevious);
+    return window->getNextDlgGroupItem(hwndCtrl, fPrevious);
 }
 /***********************************************************************