Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Felix Münchhalfen
wine
Commits
8305ad50
Commit
8305ad50
authored
26 years ago
by
Eric Kohl
Committed by
Alexandre Julliard
26 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Added WM_[G/S]ETFONT handling.
parent
19ba7199
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dlls/comctl32/progress.c
+22
-8
22 additions, 8 deletions
dlls/comctl32/progress.c
include/progress.h
+1
-0
1 addition, 0 deletions
include/progress.h
with
23 additions
and
8 deletions
dlls/comctl32/progress.c
+
22
−
8
View file @
8305ad50
...
...
@@ -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 @@ static void PROGRESS_CoercePos(WND *wndPtr)
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 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
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 @@ LRESULT WINAPI ProgressWindowProc(HWND32 hwnd, UINT32 message,
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
);
...
...
This diff is collapsed.
Click to expand it.
include/progress.h
+
1
−
0
View file @
8305ad50
...
...
@@ -18,6 +18,7 @@ typedef struct
INT32
Step
;
/* Step to use on PMB_STEPIT */
COLORREF
ColorBar
;
/* Bar color */
COLORREF
ColorBk
;
/* Background color */
HFONT32
hFont
;
/* Handle to font (not unused) */
}
PROGRESS_INFO
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment