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

Timestamp:

Dec 9, 1999, 1:54:05 AM (26 years ago)

Author:

sandervl

Message:

Unicode <-> Ascii translation changes + fixes for window procedures

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.35 1999-11-17 17:04:54 cbratschi Exp $ */
+/* $Id: win32dlg.cpp,v 1.36 1999-12-09 00:53:37 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -18 +18 @@
 #include <misc.h>
 #include <win32dlg.h>
+#include <win\winproc.h>
 #include "oslibmsg.h"
 #include "oslibwin.h"
@@ -174 +175 @@
 
     fIsDialog = TRUE;
-    Win32DlgProc = dlgProc;
+    WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)dlgProc, (isUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
 
     this->tmpParam       = param;
@@ -195 +196 @@
     if (hUserFont) DeleteObject( hUserFont );
     if (hMenu) DestroyMenu( hMenu );
+
+    WINPROC_FreeProc(Win32DlgProc, WIN_PROC_WINDOW);
 }
 //******************************************************************************
@@ -1019 +1022 @@
 //******************************************************************************
 //******************************************************************************
-LONG Win32Dialog::SetWindowLongA(int index, ULONG value)
+LONG Win32Dialog::SetWindowLongA(int index, ULONG value, BOOL fUnicode)
 {
     LONG oldval;
@@ -1027 +1030 @@
     {
     case DWL_DLGPROC:
-        oldval = (LONG)Win32DlgProc;
-        Win32DlgProc = (DLGPROC)value;
+            oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+        WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
         return oldval;
     case DWL_MSGRESULT:
@@ -1044 +1047 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32Dialog::GetWindowLongA(int index)
+ULONG Win32Dialog::GetWindowLongA(int index, BOOL fUnicode)
 {
     dprintf2(("Win32Dialog::GetWindowLongA %x %d", getWindowHandle(), index));
@@ -1050 +1053 @@
     {
     case DWL_DLGPROC:
-        return (ULONG)Win32DlgProc;
+            return (ULONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     case DWL_MSGRESULT:
         return msgResult;