Changeset 230 for trunk/include/wndproc.h

Timestamp:

Jun 27, 1999, 11:56:00 PM (26 years ago)

Author:

sandervl

Message:

Dialog window proc override bugfix

File:

• trunk/include/wndproc.h (modified) (6 diffs)

trunk/include/wndproc.h

@@ -1 @@
-/* $Id: wndproc.h,v 1.4 1999-06-26 13:21:53 sandervl Exp $ */
+/* $Id: wndproc.h,v 1.5 1999-06-27 21:56:00 sandervl Exp $ */
 
 /*
@@ -26 +26 @@
 //used in COMDLG32.DLL
 Win32WindowProc *SYSTEM CreateWindowProc(WNDPROC pUserCallback);
-LRESULT EXPENTRY_O32 WndCallback(HWND, UINT, WPARAM, LPARAM);
+LRESULT EXPENTRY_O32 OS2ToWin32Callback(HWND, UINT, WPARAM, LPARAM);
+LRESULT EXPENTRY     Win32ToOS2Callback(HWND, UINT, WPARAM, LPARAM);
 
 //Notify parent window of creation/destruction and buttondown messages (if required)
@@ -35 +36 @@
 public:
         Win32WindowProc(WNDPROC pUserCallback);
+        Win32WindowProc(WNDPROC pUserCallback, WNDPROC_O32 pOS2Callback);
         Win32WindowProc(WNDPROC pUserCallback, DLGTEMPLATE *os2dlg);
         Win32WindowProc(HINSTANCE hinst, LPCSTR lpszClassName);
@@ -40 +42 @@
 
  static WNDPROC_O32 GetOS2Callback();
+ static WNDPROC     GetWin32ToOS2Callback();
 
  static void DeleteWindow(HWND hwnd);
@@ -62 +65 @@
 
  WNDPROC        pCallback;
+ WNDPROC_O32    pOS2Callback;
  HWND           hwnd;
  DWORD          threadid;
@@ -72 +76 @@
                 Win32WindowProc  *next;
 
- friend LRESULT EXPENTRY_O32 WndCallback(HWND, UINT, WPARAM, LPARAM);
+ friend LRESULT EXPENTRY_O32 OS2ToWin32Callback(HWND, UINT, WPARAM, LPARAM);
+ friend LRESULT EXPENTRY     Win32ToOS2Callback(HWND, UINT, WPARAM, LPARAM);
 };