commit 8305ad50ea413828dd2b4b56e413875885ee1e46
author Eric Kohl <ekohl@abo.rhein-zeitung.de> Sun Jan 24 19:09:24 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Jan 24 19:09:24 1999 +0000
tree fc892aa808868fc98b2bf75b8df09d4dc666001f
parent 19ba7199ac97ea2074065c89c48841743b4da922

Added WM_[G/S]ETFONT handling.

dlls/comctl32/progress.c

diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c
index c704968..3a99d3f 100644
--- a/dlls/comctl32/progress.c
+++ b/dlls/comctl32/progress.c
@@ -3,8 +3,6 @@
  *
  * Copyright 1997 Dimitrie O. Paun
  *
- * TODO:
- *   - I do not know what to to on WM_[SG]ET_FONT
  */
 
 #include "windows.h"
@@ -165,6 +163,24 @@
     infoPtr->CurVal = infoPtr->MaxVal;
 }
 
+
+/***********************************************************************
+ *           PROGRESS_SetFont
+ * Set new Font for progress bar
+ */
+static HFONT32
+PROGRESS_SetFont (WND *wndPtr, WPARAM32 wParam, LPARAM lParam)
+{
+  PROGRESS_INFO *infoPtr = PROGRESS_GetInfoPtr(wndPtr); 
+  HFONT32 hOldFont = infoPtr->hFont;
+
+  infoPtr->hFont = (HFONT32)wParam;
+  if (LOWORD(lParam))
+    PROGRESS_Refresh (wndPtr);
+  return hOldFont;
+}
+
+
 /***********************************************************************
  *           ProgressWindowProc
  */
@@ -194,6 +210,7 @@
       infoPtr->Step=10;
       infoPtr->ColorBar=CLR_DEFAULT;
       infoPtr->ColorBk=CLR_DEFAULT;
+      infoPtr->hFont=(HANDLE32)NULL;
       TRACE(progress, "Progress Ctrl creation, hwnd=%04x\n", hwnd);
       break;
     
@@ -208,14 +225,11 @@
       return 1;
 	
     case WM_GETFONT:
-      FIXME (progress, "WM_GETFONT - empty message!\n");
-      /* FIXME: What do we need to do? */
-      break;
+      return (LRESULT)infoPtr->hFont;
 
     case WM_SETFONT:
-      FIXME (progress, "WM_SETFONT - empty message!\n");
-      /* FIXME: What do we need to do? */
-      break;
+      return PROGRESS_SetFont (wndPtr, wParam, lParam);
+/*      break; */
 
     case WM_PAINT:
       PROGRESS_Paint (wndPtr);