Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

コンボボックスのサブクラス化に関連するクラッシュバグの修正 #1481

Merged
merged 2 commits into from
Dec 12, 2020
Merged

コンボボックスのサブクラス化に関連するクラッシュバグの修正 #1481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df44223
CBS_DROPDOWNLISTであるコンボボックスをサブクラス化しないようにする
kengoide Dec 9, 2020
e726726
レビュー指摘に対応: assertを除去
kengoide Dec 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sakura_core/dlg/CDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,8 +808,8 @@ LRESULT CALLBACK SubEditProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam,

void CDialog::SetComboBoxDeleter(HWND hwndCtl, CRecent* pRecent)
{
assert(pRecent);

if (!pRecent || (::GetWindowLongPtr(hwndCtl, GWL_STYLE) & 0b11) == CBS_DROPDOWNLIST)
return;
COMBOBOXINFO info = { sizeof(COMBOBOXINFO) };
if (!::GetComboBoxInfo(hwndCtl, &info))
return;
Expand Down
5 changes: 5 additions & 0 deletions sakura_core/dlg/CDialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ class CDialog

void ResizeItem( HWND hTarget, const POINT& ptDlgDefalut, const POINT& ptDlgNew, const RECT& rcItemDefault, EAnchorStyle anchor, bool bUpdate = true);
void GetItemClientRect( int wID, RECT& rc );

//! @brief コンボボックスに履歴削除・単語削除の機能を追加する
//!
//! @param hwndCtl コンボボックスのハンドル。CBS_DROPDOWNLISTスタイルのコンボボックスには対応していません。
//! @param pRecent 紐づけるCRecentへのポインタ。nullptrは指定できません。
static void SetComboBoxDeleter( HWND hwndCtl, CRecent* pRecent );
public:

Expand Down
3 changes: 0 additions & 3 deletions sakura_core/dlg/CDlgOpenFile_CommonFileDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,6 @@ UINT_PTR CALLBACK OFNHookProc(

/* ビューモードの初期値セット */
::CheckDlgButton( pData->m_hwndOpenDlg, chx1, pData->m_bViewMode );

CDialog::SetComboBoxDeleter(pData->m_hwndComboMRU, &pData->m_cRecentFile);
CDialog::SetComboBoxDeleter(pData->m_hwndComboOPENFOLDER, &pData->m_cRecentFolder);
}
break;

Expand Down