Changeset 2204 for trunk/src/user32/windlgmsg.cpp

Timestamp:

Dec 26, 1999, 6:30:20 PM (26 years ago)

Author:

cbratschi

Message:

non-client fixes, DefWndProc enhancements, several other bugs fixed

File:

• trunk/src/user32/windlgmsg.cpp (modified) (12 diffs)

trunk/src/user32/windlgmsg.cpp

@@ -1 @@
-/* $Id: windlgmsg.cpp,v 1.2 1999-10-08 21:30:52 cbratschi Exp $ */
+/* $Id: windlgmsg.cpp,v 1.3 1999-12-26 17:30:20 cbratschi Exp $ */
 /*
  * Win32 dialog message APIs for OS/2
@@ -16 +16 @@
 #include <os2win.h>
 #include <misc.h>
+#include <string.h>
+#include <ctype.h>
 #include "win32wbase.h"
 #include "win32dlg.h"
@@ -55 +57 @@
     return 0;
 }
-//TODO
-#if 0
 /***********************************************************************
  *           DIALOG_IsAccelerator
@@ -64 +64 @@
     HWND hwndControl = hwnd;
     HWND hwndNext;
-    WND *wndPtr;
+    Win32BaseWindow *win32wnd;
     BOOL RetVal = FALSE;
     INT dlgCode;
@@ -82 +82 @@
         do
         {
-            wndPtr = WIN_FindWndPtr( hwndControl );
-            if ( (wndPtr != NULL) &&
-                 ((wndPtr->dwStyle & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) )
+            win32wnd = Win32BaseWindow::GetWindowFromHandle(hwndControl);
+            if ( (win32wnd != NULL) &&
+                 ((win32wnd->getStyle() & (WS_VISIBLE | WS_DISABLED)) == WS_VISIBLE) )
             {
-                dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 );
-                if ( (dlgCode & (DLGC_BUTTON | DLGC_STATIC)) &&
-                     (wndPtr->text!=NULL))
+              dlgCode = SendMessageA( hwndControl, WM_GETDLGCODE, 0, 0 );
+              if (dlgCode & (DLGC_BUTTON | DLGC_STATIC))
+              {
+                INT textLen = win32wnd->GetWindowTextLength();
+
+                if (textLen > 0)
                 {
                     /* find the accelerator key */
-                    LPSTR p = wndPtr->text - 2;
+                    char* text;
+                    LPSTR p;
+
+                    text = (char*)malloc(textLen+1);
+                    win32wnd->GetWindowTextA(text,textLen);
+                    p = text - 2;
                     do
                     {
@@ -102 +110 @@
                     {
                         if ((dlgCode & DLGC_STATIC) ||
-                            (wndPtr->dwStyle & 0x0f) == BS_GROUPBOX )
+                            (win32wnd->getStyle() & 0x0f) == BS_GROUPBOX )
                         {
                             /* set focus to the control */
@@ -115 +123 @@
                             /* send command message as from the control */
                             SendMessageA( hwndDlg, WM_COMMAND,
-                                MAKEWPARAM( LOWORD(wndPtr->wIDmenu),
+                                MAKEWPARAM( LOWORD(win32wnd->getWindowId()),
                                     BN_CLICKED ),
                                 (LPARAM)hwndControl );
@@ -126 +134 @@
                         }
                         RetVal = TRUE;
-            WIN_ReleaseWndPtr(wndPtr);
+                        free(text);
                         break;
                     }
+                    free(text);
                 }
+              }
         hwndNext = GetWindow( hwndControl, GW_CHILD );
             }
@@ -136 +146 @@
         hwndNext = 0;
         }
-            WIN_ReleaseWndPtr(wndPtr);
         if (!hwndNext)
         {
@@ -163 +172 @@
     return RetVal;
 }
-#endif
 /***********************************************************************
  *           DIALOG_IsDialogMessage
@@ -251 +259 @@
         /* drop through */
 
-//TODO:
-#if 0
     case WM_SYSCHAR:
         if (DIALOG_IsAccelerator( hwnd, hwndDlg, wParam ))
@@ -260 +266 @@
         }
         break;
-#endif
     }