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
fd018cc9
Commit
fd018cc9
authored
Feb 26, 2000
by
Jim Aston
Committed by
Alexandre Julliard
Feb 26, 2000
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This reverts Matts patch. The messaging needs double checking.
parent
916f9756
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
48 additions
and
22 deletions
+48
-22
propsheet.c
dlls/comctl32/propsheet.c
+48
-22
No files found.
dlls/comctl32/propsheet.c
View file @
fd018cc9
...
...
@@ -1080,45 +1080,49 @@ static int PROPSHEET_CreatePage(HWND hwndParent,
*/
static
BOOL
PROPSHEET_ShowPage
(
HWND
hwndDlg
,
int
index
,
PropSheetInfo
*
psInfo
)
{
PSHNOTIFY
psn
;
HWND
hwndTabCtrl
;
if
(
index
==
psInfo
->
active_page
)
{
if
(
GetTopWindow
(
hwndDlg
)
!=
psInfo
->
proppage
[
index
].
hwndPage
)
{
if
(
GetTopWindow
(
hwndDlg
)
!=
psInfo
->
proppage
[
index
].
hwndPage
)
SetWindowPos
(
psInfo
->
proppage
[
index
].
hwndPage
,
HWND_TOP
,
0
,
0
,
0
,
0
,
SWP_NOSIZE
|
SWP_NOMOVE
);
return
TRUE
;
}
/* Synchronize current selection with tab control */
hwndTabCtrl
=
GetDlgItem
(
hwndDlg
,
IDC_TABCONTROL
);
SendMessageA
(
hwndTabCtrl
,
TCM_SETCURSEL
,
index
,
0
);
return
TRUE
;
}
if
(
psInfo
->
proppage
[
index
].
hwndPage
==
0
)
{
LPCPROPSHEETPAGEA
ppshpage
;
PSHNOTIFY
psn
;
ppshpage
=
(
LPCPROPSHEETPAGEA
)
psInfo
->
proppage
[
index
].
hpage
;
PROPSHEET_CreatePage
(
hwndDlg
,
index
,
psInfo
,
ppshpage
);
}
psn
.
hdr
.
hwndFrom
=
hwndDlg
;
psn
.
hdr
.
code
=
PSN_SETACTIVE
;
psn
.
hdr
.
idFrom
=
0
;
psn
.
lParam
=
0
;
psn
.
hdr
.
hwndFrom
=
hwndDlg
;
psn
.
hdr
.
code
=
PSN_SETACTIVE
;
psn
.
hdr
.
idFrom
=
0
;
psn
.
lParam
=
0
;
/* Send the notification before showing the page. */
SendMessageA
(
psInfo
->
proppage
[
index
].
hwndPage
,
WM_NOTIFY
,
0
,
(
LPARAM
)
&
psn
);
/* Send the notification before showing the page. */
SendMessageA
(
psInfo
->
proppage
[
index
].
hwndPage
,
WM_NOTIFY
,
0
,
(
LPARAM
)
&
psn
);
/*
* TODO: check return value.
*/
/*
* TODO: check return value.
*/
}
if
(
psInfo
->
active_page
!=
-
1
)
ShowWindow
(
psInfo
->
proppage
[
psInfo
->
active_page
].
hwndPage
,
SW_HIDE
);
ShowWindow
(
psInfo
->
proppage
[
index
].
hwndPage
,
SW_SHOW
);
if
(
!
(
psInfo
->
ppshheader
->
dwFlags
&
PSH_WIZARD
))
{
HWND
hwndTabCtrl
;
/* Synchronize current selection with tab control */
hwndTabCtrl
=
GetDlgItem
(
hwndDlg
,
IDC_TABCONTROL
);
SendMessageA
(
hwndTabCtrl
,
TCM_SETCURSEL
,
index
,
0
);
}
psInfo
->
active_page
=
index
;
psInfo
->
activeValid
=
TRUE
;
...
...
@@ -1517,6 +1521,27 @@ static BOOL PROPSHEET_SetCurSel(HWND hwndDlg,
hwndPage
=
psInfo
->
proppage
[
index
].
hwndPage
;
/*
* Notify the new page if it's already created.
* If not it will get created and notified in PROPSHEET_ShowPage.
*/
if
(
hwndPage
)
{
int
result
;
PSHNOTIFY
psn
;
psn
.
hdr
.
code
=
PSN_SETACTIVE
;
psn
.
hdr
.
hwndFrom
=
hwndDlg
;
psn
.
hdr
.
idFrom
=
0
;
psn
.
lParam
=
0
;
result
=
SendMessageA
(
hwndPage
,
WM_NOTIFY
,
0
,
(
LPARAM
)
&
psn
);
/*
* TODO: check return value.
*/
}
/*
* Display the new page.
*/
PROPSHEET_ShowPage
(
hwndDlg
,
index
,
psInfo
);
...
...
@@ -2110,7 +2135,8 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
PROPSHEET_SetCurSel
(
hwnd
,
idx
,
psInfo
->
proppage
[
idx
].
hpage
);
SendMessageA
(
hwndTabCtrl
,
TCM_SETCURSEL
,
psInfo
->
active_page
,
0
);
if
(
!
(
psInfo
->
ppshheader
->
dwFlags
&
PSH_WIZARD
))
SendMessageA
(
hwndTabCtrl
,
TCM_SETCURSEL
,
psInfo
->
active_page
,
0
);
if
(
!
HIWORD
(
psInfo
->
ppshheader
->
pszCaption
)
&&
psInfo
->
ppshheader
->
hInstance
)
...
...
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