Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
84412cb0
Commit
84412cb0
authored
May 22, 2010
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winhlp32: Get rid of the shadow window, it's ugly and causes z-order issues.
parent
821cd38e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
33 deletions
+1
-33
string.c
programs/winhlp32/string.c
+0
-1
winhelp.c
programs/winhlp32/winhelp.c
+1
-31
winhelp.h
programs/winhlp32/winhelp.h
+0
-1
No files found.
programs/winhlp32/string.c
View file @
84412cb0
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
const
char
MAIN_WIN_CLASS_NAME
[]
=
"MS_WINHELP"
;
const
char
MAIN_WIN_CLASS_NAME
[]
=
"MS_WINHELP"
;
const
char
BUTTON_BOX_WIN_CLASS_NAME
[]
=
"WHButtonBox"
;
const
char
BUTTON_BOX_WIN_CLASS_NAME
[]
=
"WHButtonBox"
;
const
char
SHADOW_WIN_CLASS_NAME
[]
=
"WHShadow"
;
const
char
HISTORY_WIN_CLASS_NAME
[]
=
"WHHistory"
;
const
char
HISTORY_WIN_CLASS_NAME
[]
=
"WHHistory"
;
const
char
STRING_BUTTON
[]
=
"BUTTON"
;
const
char
STRING_BUTTON
[]
=
"BUTTON"
;
...
...
programs/winhlp32/winhelp.c
View file @
84412cb0
...
@@ -570,7 +570,6 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win)
...
@@ -570,7 +570,6 @@ static void WINHELP_DeleteWindow(WINHELP_WINDOW* win)
WINHELP_DeleteButtons
(
win
);
WINHELP_DeleteButtons
(
win
);
if
(
win
->
page
)
WINHELP_DeletePageLinks
(
win
->
page
);
if
(
win
->
page
)
WINHELP_DeletePageLinks
(
win
->
page
);
if
(
win
->
hShadowWnd
)
DestroyWindow
(
win
->
hShadowWnd
);
if
(
win
->
hHistoryWnd
)
DestroyWindow
(
win
->
hHistoryWnd
);
if
(
win
->
hHistoryWnd
)
DestroyWindow
(
win
->
hHistoryWnd
);
DeleteObject
(
win
->
hBrush
);
DeleteObject
(
win
->
hBrush
);
...
@@ -843,7 +842,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
...
@@ -843,7 +842,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
if
(
bPopup
)
if
(
bPopup
)
{
{
DWORD
mask
=
SendMessage
(
hTextWnd
,
EM_GETEVENTMASK
,
0
,
0
);
DWORD
mask
=
SendMessage
(
hTextWnd
,
EM_GETEVENTMASK
,
0
,
0
);
RECT
rect
;
win
->
font_scale
=
Globals
.
active_win
->
font_scale
;
win
->
font_scale
=
Globals
.
active_win
->
font_scale
;
WINHELP_SetupText
(
hTextWnd
,
win
,
wpage
->
relative
);
WINHELP_SetupText
(
hTextWnd
,
win
,
wpage
->
relative
);
...
@@ -853,17 +851,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
...
@@ -853,17 +851,6 @@ BOOL WINHELP_CreateHelpWindow(WINHELP_WNDPAGE* wpage, int nCmdShow, BOOL remembe
SendMessage
(
hTextWnd
,
EM_SETEVENTMASK
,
0
,
mask
|
ENM_REQUESTRESIZE
);
SendMessage
(
hTextWnd
,
EM_SETEVENTMASK
,
0
,
mask
|
ENM_REQUESTRESIZE
);
SendMessage
(
hTextWnd
,
EM_REQUESTRESIZE
,
0
,
0
);
SendMessage
(
hTextWnd
,
EM_REQUESTRESIZE
,
0
,
0
);
SendMessage
(
hTextWnd
,
EM_SETEVENTMASK
,
0
,
mask
);
SendMessage
(
hTextWnd
,
EM_SETEVENTMASK
,
0
,
mask
);
GetWindowRect
(
win
->
hMainWnd
,
&
rect
);
win
->
hShadowWnd
=
CreateWindowEx
(
WS_EX_TOOLWINDOW
,
SHADOW_WIN_CLASS_NAME
,
""
,
WS_POPUP
|
WS_VISIBLE
,
rect
.
left
+
SHADOW_DX
,
rect
.
top
+
SHADOW_DY
,
rect
.
right
-
rect
.
left
,
rect
.
bottom
-
rect
.
top
,
Globals
.
active_win
->
hMainWnd
,
0
,
Globals
.
hInstance
,
NULL
);
SetWindowPos
(
win
->
hMainWnd
,
win
->
hShadowWnd
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
);
}
}
else
else
{
{
...
@@ -1198,16 +1185,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara
...
@@ -1198,16 +1185,6 @@ static LRESULT CALLBACK WINHELP_HistoryWndProc(HWND hWnd, UINT msg, WPARAM wPara
return
DefWindowProc
(
hWnd
,
msg
,
wParam
,
lParam
);
return
DefWindowProc
(
hWnd
,
msg
,
wParam
,
lParam
);
}
}
/***********************************************************************
*
* WINHELP_ShadowWndProc
*/
static
LRESULT
CALLBACK
WINHELP_ShadowWndProc
(
HWND
hWnd
,
UINT
msg
,
WPARAM
wParam
,
LPARAM
lParam
)
{
if
(
WINHELP_CheckPopup
(
hWnd
,
msg
,
wParam
,
lParam
,
NULL
))
return
0
;
return
WINHELP_CheckPopup
(
hWnd
,
msg
,
wParam
,
lParam
,
NULL
)
?
0L
:
DefWindowProc
(
hWnd
,
msg
,
wParam
,
lParam
);
}
/**************************************************************************
/**************************************************************************
* cb_KWBTree
* cb_KWBTree
*
*
...
@@ -1629,7 +1606,7 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search)
...
@@ -1629,7 +1606,7 @@ BOOL WINHELP_CreateIndexWindow(BOOL is_search)
*/
*/
static
BOOL
WINHELP_RegisterWinClasses
(
void
)
static
BOOL
WINHELP_RegisterWinClasses
(
void
)
{
{
WNDCLASSEX
class_main
,
class_button_box
,
class_
shadow
,
class_
history
;
WNDCLASSEX
class_main
,
class_button_box
,
class_history
;
class_main
.
cbSize
=
sizeof
(
class_main
);
class_main
.
cbSize
=
sizeof
(
class_main
);
class_main
.
style
=
CS_HREDRAW
|
CS_VREDRAW
;
class_main
.
style
=
CS_HREDRAW
|
CS_VREDRAW
;
...
@@ -1652,19 +1629,12 @@ static BOOL WINHELP_RegisterWinClasses(void)
...
@@ -1652,19 +1629,12 @@ static BOOL WINHELP_RegisterWinClasses(void)
class_button_box
.
hbrBackground
=
(
HBRUSH
)(
COLOR_BTNFACE
+
1
);
class_button_box
.
hbrBackground
=
(
HBRUSH
)(
COLOR_BTNFACE
+
1
);
class_button_box
.
lpszClassName
=
BUTTON_BOX_WIN_CLASS_NAME
;
class_button_box
.
lpszClassName
=
BUTTON_BOX_WIN_CLASS_NAME
;
class_shadow
=
class_main
;
class_shadow
.
lpfnWndProc
=
WINHELP_ShadowWndProc
;
class_shadow
.
cbWndExtra
=
0
;
class_shadow
.
hbrBackground
=
(
HBRUSH
)(
COLOR_3DDKSHADOW
+
1
);
class_shadow
.
lpszClassName
=
SHADOW_WIN_CLASS_NAME
;
class_history
=
class_main
;
class_history
=
class_main
;
class_history
.
lpfnWndProc
=
WINHELP_HistoryWndProc
;
class_history
.
lpfnWndProc
=
WINHELP_HistoryWndProc
;
class_history
.
lpszClassName
=
HISTORY_WIN_CLASS_NAME
;
class_history
.
lpszClassName
=
HISTORY_WIN_CLASS_NAME
;
return
(
RegisterClassEx
(
&
class_main
)
&&
return
(
RegisterClassEx
(
&
class_main
)
&&
RegisterClassEx
(
&
class_button_box
)
&&
RegisterClassEx
(
&
class_button_box
)
&&
RegisterClassEx
(
&
class_shadow
)
&&
RegisterClassEx
(
&
class_history
));
RegisterClassEx
(
&
class_history
));
}
}
...
...
programs/winhlp32/winhelp.h
View file @
84412cb0
...
@@ -76,7 +76,6 @@ typedef struct tagWinHelp
...
@@ -76,7 +76,6 @@ typedef struct tagWinHelp
HLPFILE_PAGE
*
page
;
HLPFILE_PAGE
*
page
;
HWND
hMainWnd
;
HWND
hMainWnd
;
HWND
hShadowWnd
;
HWND
hHistoryWnd
;
HWND
hHistoryWnd
;
WNDPROC
origRicheditWndProc
;
WNDPROC
origRicheditWndProc
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment