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

Timestamp:

Oct 28, 2001, 11:38:14 AM (24 years ago)

Author:

sandervl

Message:

setwindowlong fix for dialogs

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.70 2001-06-15 14:07:22 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.71 2001-10-28 10:38:13 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -1083 +1083 @@
     dialogFlags |= DF_END;
     idResult = retval;
+
     return TRUE;
 }
 //******************************************************************************
 //******************************************************************************
-LONG Win32Dialog::SetWindowLongA(int index, ULONG value, BOOL fUnicode)
+LONG Win32Dialog::SetWindowLong(int index, ULONG value, BOOL fUnicode)
 {
     LONG oldval;
@@ -1096 +1097 @@
     case DWL_DLGPROC:
     {
-    //Note: Type of SetWindowLong determines new window proc type
+        //Note: Type of SetWindowLong determines new window proc type
         //      UNLESS the new window proc has already been registered
         //      (use the old type in that case)
         //      (VERIFIED in NT 4, SP6)
         WINDOWPROCTYPE type = WINPROC_GetProcType((HWINDOWPROC)value);
-    if(type == WIN_PROC_INVALID) {
-        type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
-    }
+        if(type == WIN_PROC_INVALID) {
+            type = (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A;
+        }
         oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, type, WIN_PROC_WINDOW);
@@ -1117 +1118 @@
         return oldval;
     default:
-        return Win32BaseWindow::SetWindowLongA(index, value);
-    }
-}
-//******************************************************************************
-//******************************************************************************
-ULONG Win32Dialog::GetWindowLongA(int index, BOOL fUnicode)
+        return Win32BaseWindow::SetWindowLong(index, value, fUnicode);
+    }
+}
+//******************************************************************************
+//******************************************************************************
+ULONG Win32Dialog::GetWindowLong(int index, BOOL fUnicode)
 {
     dprintf2(("Win32Dialog::GetWindowLongA %x %d", getWindowHandle(), index));
@@ -1134 +1135 @@
         return userDlgData;
     default:
-        return Win32BaseWindow::GetWindowLongA(index);
+        return Win32BaseWindow::GetWindowLong(index, fUnicode);
     }
 }