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

文字コードの指定ダイアログのCPチェックの仕様を修正する #1059

Merged
merged 1 commit into from
Sep 27, 2019
+3 −8
Merged

文字コードの指定ダイアログのCPチェックの仕様を修正する #1059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions sakura_core/dlg/CDlgSetCharSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ CDlgSetCharSet::CDlgSetCharSet()
{
m_pnCharSet = NULL; // 文字コードセット
m_pbBom = NULL; // 文字コードセット
m_bCP = false;
}

/* モーダルダイアログの表示 */
Expand Down Expand Up @@ -73,11 +72,9 @@ BOOL CDlgSetCharSet::OnBnClicked( int wID )
{
switch( wID ){
case IDC_CHECK_CP:
if( !m_bCP ){
m_bCP = true;
::EnableWindow( GetItemHwnd( IDC_CHECK_CP ), FALSE );
CCodePage::AddComboCodePages( GetHwnd(), m_hwndCharSet, -1 );
}
::CheckDlgButton( GetHwnd(), IDC_CHECK_CP, TRUE );
::EnableWindow( GetItemHwnd( IDC_CHECK_CP ), FALSE );
CCodePage::AddComboCodePages( GetHwnd(), m_hwndCharSet, -1 );
return TRUE;
case IDC_BUTTON_HELP:
/* 「文字コードセット設定」のヘルプ */
Expand Down Expand Up @@ -179,7 +176,6 @@ void CDlgSetCharSet::SetData( void )
}
}
if( -1 == nCurIdx ){
m_bCP = true;
::CheckDlgButton( GetHwnd(), IDC_CHECK_CP, TRUE );
::EnableWindow( GetItemHwnd( IDC_CHECK_CP ), FALSE );
nCurIdx = CCodePage::AddComboCodePages( GetHwnd(), m_hwndCharSet, *m_pnCharSet );
Expand Down
1 change: 0 additions & 1 deletion sakura_core/dlg/CDlgSetCharSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ class CDlgSetCharSet : public CDialog

ECodeType* m_pnCharSet; // 文字コードセット
bool* m_pbBom; // BOM
bool m_bCP;

HWND m_hwndCharSet;
HWND m_hwndCheckBOM;
Expand Down