Changeset 996 for trunk/src/user32/win32wbase.cpp

Timestamp:

Sep 21, 1999, 10:24:05 AM (26 years ago)

Author:

sandervl

Message:

Edgar Buerkle's fixes for GetDesktopWindow, icons + WM_TIMER support

File:

• trunk/src/user32/win32wbase.cpp (modified) (4 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.4 1999-09-20 19:17:58 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.5 1999-09-21 08:24:05 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -801 +801 @@
 
     return SendInternalMessageA(WM_MOVE, 0, MAKELONG((USHORT)x, (USHORT)y));
+}
+//******************************************************************************
+//******************************************************************************
+ULONG Win32BaseWindow::MsgTimer(ULONG TimerID)
+{
+  // TODO: call TIMERPROC if not NULL
+  return SendInternalMessageA(WM_TIMER, TimerID, 0);
 }
 //******************************************************************************
@@ -1089 +1096 @@
          SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
          return GetSysColorBrush(COLOR_BTNFACE);
-        
+
     //SvL: Set background color to default dialog color if window is dialog
     case WM_CTLCOLORDLG:
     case WM_CTLCOLORSTATIC:
-         if(IsDialog()) {
-                SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE));
-                SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
-                return GetSysColorBrush(COLOR_BTNFACE);
-         }
-         //no break
+     if(IsDialog()) {
+            SetBkColor((HDC)wParam, GetSysColor(COLOR_BTNFACE));
+            SetTextColor((HDC)wParam, GetSysColor(COLOR_WINDOWTEXT));
+            return GetSysColorBrush(COLOR_BTNFACE);
+     }
+     //no break
 
     case WM_CTLCOLORMSGBOX:
@@ -1479 +1486 @@
     dprintf(("Win32BaseWindow::SetIcon %x", hIcon));
     if(OSLibWinSetIcon(OS2HwndFrame, hIcon) == TRUE) {
-        SendInternalMessageA(WM_SETICON, hIcon, 0);
-        return TRUE;
+    SendInternalMessageA(WM_SETICON, hIcon, 0);
+    return TRUE;
     }
     return FALSE;