Kaydet (Commit) a37d99eb authored tarafından Aurimas Fišeras's avatar Aurimas Fišeras Kaydeden (comit) Andras Timar

Revert "Cleaning: remove use of old edt1 from dlg.h (Windows)"

This commit introduced fdo#74295.

This reverts commit e9fd9c25.

Change-Id: I884c25aee137819810bdbc76ad85f2b580b2d626
Reviewed-on: https://gerrit.libreoffice.org/10429Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst 8952061d
...@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd) ...@@ -584,7 +584,7 @@ void SAL_CALL CWinFileOpenImpl::InitControlLabel(HWND hWnd)
// Our approach is to align all static text controls with the // Our approach is to align all static text controls with the
// static text control "File name" of the FileOpen dialog, // static text control "File name" of the FileOpen dialog,
// all checkboxes and all list/comboboxes will be left aligned with // all checkboxes and all list/comboboxes will be left aligned with
// the standard combobox cmb13 (defined in MS platform sdk dlgs.h) // the standard combobox edt1 (defined in MS platform sdk dlgs.h)
// and all push buttons will be left aligned with the standard // and all push buttons will be left aligned with the standard
// "OK" button // "OK" button
...@@ -689,6 +689,8 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const ...@@ -689,6 +689,8 @@ void CWinFileOpenImpl::EnlargeStdControlLabels() const
HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2); HWND hFilterBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc2);
HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3); HWND hFileNameBoxLabel = GetDlgItem(m_hwndFileOpenDlg, stc3);
HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13); HWND hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, cmb13);
if (!hFileNameBox)
hFileNameBox = GetDlgItem(m_hwndFileOpenDlg, edt1); // under Win98 it is edt1 instead of cmb13
HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1); HWND hFilterBox = GetDlgItem(m_hwndFileOpenDlg, cmb1);
HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK); HWND hOkButton = GetDlgItem(m_hwndFileOpenDlg, IDOK);
...@@ -983,11 +985,15 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName() ...@@ -983,11 +985,15 @@ void SAL_CALL CWinFileOpenImpl::InitialSetDefaultName()
// open dialog (reason: see above setDefaultName) // open dialog (reason: see above setDefaultName)
if (m_bInitialSelChanged && m_defaultName.getLength()) if (m_bInitialSelChanged && m_defaultName.getLength())
{ {
// from W2k there is a combobox instead sal_Int32 edt1Id = edt1;
// under W2k the there is a combobox instead
// of an edit field for the file name edit field // of an edit field for the file name edit field
// So the control id of this box is cmb13 and not // the control id of this box is cmb13 and not
// edt1 as before // edt1 as before so we must use this id
HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, cmb13); edt1Id = cmb13;
HWND hwndEdt1 = GetDlgItem(m_hwndFileOpenDlg, edt1Id);
SetWindowText(hwndEdt1, reinterpret_cast<LPCTSTR>(m_defaultName.getStr())); SetWindowText(hwndEdt1, reinterpret_cast<LPCTSTR>(m_defaultName.getStr()));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment