Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-06 06:20:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove a workaround for an early bug. The tabs will display correctly in low resolution now.

Browse source 
svn path=/trunk/; revision=30417
This commit is contained in:
Ged Murphy 2007-11-13 11:53:31 +00:00
parent b07f6eda61
commit a55222a1c5
1 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
reactos/base/applications/mstsc/connectdialog.c
View file

@ -196,12 +196,19 @@ ReLoadGeneralPage(PINFO pInfo)
static VOID static VOID
GeneralOnInit(PINFO pInfo) GeneralOnInit(HWND hwnd,
PINFO pInfo)
{ {
SetWindowLongPtrW(hwnd,
GWLP_USERDATA,
(LONG_PTR)pInfo);
pInfo->hGeneralPage = hwnd;
SetWindowPos(pInfo->hGeneralPage, SetWindowPos(pInfo->hGeneralPage,
NULL, NULL,
13, 2,
110, 22,
0, 0,
0, 0,
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@ -247,14 +254,13 @@ GeneralDlgProc(HWND hDlg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg,
GWLP_USERDATA); GWLP_USERDATA);
switch (message) switch (message)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
pInfo->hGeneralPage = hDlg; GeneralOnInit(hDlg, (PINFO)lParam);
GeneralOnInit(pInfo);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
@ -738,16 +744,23 @@ ReLoadDisplayPage(PINFO pInfo)
static VOID static VOID
DisplayOnInit(PINFO pInfo) DisplayOnInit(HWND hwnd,
PINFO pInfo)
{ {
DISPLAY_DEVICEW displayDevice; DISPLAY_DEVICEW displayDevice;
DWORD iDevNum = 0; DWORD iDevNum = 0;
BOOL GotDev = FALSE; BOOL GotDev = FALSE;
SetWindowLongPtrW(hwnd,
GWLP_USERDATA,
(LONG_PTR)pInfo);
pInfo->hDisplayPage = hwnd;
SetWindowPos(pInfo->hDisplayPage, SetWindowPos(pInfo->hDisplayPage,
NULL, NULL,
13, 2,
110, 22,
0, 0,
0, 0,
SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER);
@ -821,14 +834,13 @@ DisplayDlgProc(HWND hDlg,
WPARAM wParam, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
PINFO pInfo = (PINFO)GetWindowLongPtrW(GetParent(hDlg), PINFO pInfo = (PINFO)GetWindowLongPtrW(hDlg,
GWLP_USERDATA); GWLP_USERDATA);
switch (message) switch (message)
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
pInfo->hDisplayPage = hDlg; DisplayOnInit(hDlg, (PINFO)lParam);
DisplayOnInit(pInfo);
return TRUE; return TRUE;
case WM_DRAWITEM: case WM_DRAWITEM:
@ -968,10 +980,11 @@ OnMainCreate(HWND hwnd,
pInfo->hTab = GetDlgItem(hwnd, IDC_TAB); pInfo->hTab = GetDlgItem(hwnd, IDC_TAB);
if (pInfo->hTab) if (pInfo->hTab)
{ {
if (CreateDialogW(hInst, if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_GENERAL), MAKEINTRESOURCEW(IDD_GENERAL),
hwnd, pInfo->hTab,
(DLGPROC)GeneralDlgProc)) (DLGPROC)GeneralDlgProc,
pInfo))
{ {
WCHAR str[256]; WCHAR str[256];
ZeroMemory(&item, sizeof(TCITEM)); ZeroMemory(&item, sizeof(TCITEM));
@ -982,10 +995,11 @@ OnMainCreate(HWND hwnd,
(void)TabCtrl_InsertItem(pInfo->hTab, 0, &item); (void)TabCtrl_InsertItem(pInfo->hTab, 0, &item);
} }
if (CreateDialogW(hInst, if (CreateDialogParamW(hInst,
MAKEINTRESOURCEW(IDD_DISPLAY), MAKEINTRESOURCEW(IDD_DISPLAY),
hwnd, pInfo->hTab,
(DLGPROC)DisplayDlgProc)) (DLGPROC)DisplayDlgProc,
pInfo))
{ {
WCHAR str[256]; WCHAR str[256];
ZeroMemory(&item, sizeof(TCITEM)); ZeroMemory(&item, sizeof(TCITEM));