Changeset 1060 for trunk/src

Timestamp:

Sep 26, 1999, 1:09:39 PM (26 years ago)

Author:

sandervl

Message:

Set text + dialog bugfixes

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (2 diffs)
• win32wbase.cpp (modified) (2 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.3 1999-09-22 08:58:35 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.4 1999-09-26 11:09:39 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -197 +197 @@
         /* Send initialisation messages and set focus */
         hwndFocus = GetNextDlgTabItem( getWindowHandle(), 0, FALSE );
+
+#if 1
+        //TODO: SetFocus call messes things up
+        SendMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param);
+#else
+        if (SendMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param ))
+             SetFocus(hwndFocus);
+#endif
         if (dlgInfo.style & WS_VISIBLE && !(getStyle() & WS_VISIBLE))
         {

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.14 1999-09-26 10:10:01 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.15 1999-09-26 11:09:39 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -397 +397 @@
 //    shouldn't we always use a frame? -> no problems with scrollbars
 
-  if(cs->lpszName)
+  if(HIWORD(cs->lpszName))
   {
         if(isUnicode)