Changeset 985 for trunk/src

Timestamp:

Sep 19, 1999, 8:33:32 PM (26 years ago)

Author:

sandervl

Message:

Dialog fontsize & background fixes

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (2 diffs)
• win32dlg.cpp (modified) (5 diffs)
• win32wbase.cpp (modified) (4 diffs)
• winmenu.cpp (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.1 1999-09-15 23:18:55 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.2 1999-09-19 18:33:31 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -280 +280 @@
     case WM_ERASEBACKGROUND:
     {
+        if(win32wnd->MsgEraseBackGround(0)) {
+                goto RunDefWndProc;
+        }
         break;
     }

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.1 1999-09-15 23:19:00 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.2 1999-09-19 18:33:31 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -70 +70 @@
         /* The font height must be negative as it is a point size */
         /* (see CreateFont() documentation in the Windows SDK).   */
-#if 0
-        hUserFont = CreateFontA(dlgInfo.pointSize, 0, 0, 0,
-                            dlgInfo.weight, dlgInfo.italic, FALSE,
-                            FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
-                            FF_DONTCARE, DEFAULT_DLGFONT);
-#else
-        hUserFont = CreateFontW(dlgInfo.pointSize, 0, 0, 0,
+        hUserFont = CreateFontW(dlgInfo.pointSize*2, 0, 0, 0,
                             dlgInfo.weight, dlgInfo.italic, FALSE,
                             FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
                             FF_DONTCARE, (LPCWSTR)dlgInfo.faceName );
-#endif
         if (hUserFont)
         {
@@ -925 +918 @@
 }
 //******************************************************************************
+//TODO:
 //******************************************************************************
 HWND Win32Dialog::getNextDlgTabItem(HWND hwndCtrl, BOOL fPrevious)
@@ -931 +925 @@
 }
 //******************************************************************************
+//TODO
 //******************************************************************************
 Win32BaseWindow *Win32Dialog::getDlgItem(int id)
@@ -1003 +998 @@
     wndClass.cbWndExtra    = 0;
     wndClass.hCursor       = (HCURSOR)IDC_ARROWA;
-    wndClass.hbrBackground = LTGRAY_BRUSH;
+    wndClass.hbrBackground = GetSysColorBrush(COLOR_BTNFACE);
     wndClass.lpszClassName = DIALOG_CLASS_NAMEA;
 

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.2 1999-09-17 18:49:53 dengert Exp $ */
+/* $Id: win32wbase.cpp,v 1.3 1999-09-19 18:33:32 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1020 +1020 @@
 
     if (hdcErase == 0)
-        hdcErase = O32_GetDC(OS2Hwnd);
+        hdcErase = GetDC(Win32Hwnd);
 
     if(isIcon)
@@ -1027 +1027 @@
         rc = SendInternalMessageA(WM_ERASEBKGND, hdcErase, 0);
     if (hdc == 0)
-        O32_ReleaseDC(OS2Hwnd, hdcErase);
+        ReleaseDC(Win32Hwnd, hdcErase);
     return (rc);
 }
@@ -1465 +1465 @@
 {
     dprintf(("Win32BaseWindow::SetIcon %x", hIcon));
-    return OSLibWinSetIcon(OS2HwndFrame, hIcon);
+    if(OSLibWinSetIcon(OS2HwndFrame, hIcon) == TRUE) {
+        SendInternalMessageA(WM_SETICON, hIcon, 0);
+        return TRUE;
+    }
+    return FALSE;
 }
 //******************************************************************************

trunk/src/user32/winmenu.cpp

@@ -1 @@
-/* $Id: winmenu.cpp,v 1.2 1999-09-16 15:14:18 phaller Exp $ */
+/* $Id: winmenu.cpp,v 1.3 1999-09-19 18:33:32 sandervl Exp $ */
 
 /*
@@ -236 +236 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTION2(HMENU,GetSystemMenu,HWND,hSystemWindow,
-                                  BOOL,bRevert)
+HMENU WIN32API GetSystemMenu(HWND hSystemWindow, BOOL bRevert)
 {
   dprintf(("USER32: GetSystemMenu not implemented correctly."));