変数の型変更をもとに戻す

sakura-editor · May 4, 2020 · cb41fc4 · cb41fc4
1 parent ba87ad3
commit cb41fc4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/sakura_core/dlg/CDlgJump.cpp b/sakura_core/dlg/CDlgJump.cpp
@@ -69,9 +69,9 @@ int CDlgJump::DoModal(
 BOOL CDlgJump::OnNotify(NMHDR* pNMHDR)
 {
 	NM_UPDOWN*		pMNUD;
-	UINT_PTR		idCtrl;
+	int				idCtrl;
 	int				nData;
-	idCtrl = pNMHDR->idFrom;
+	idCtrl = (int)pNMHDR->idFrom;
 	pMNUD  = (NM_UPDOWN*)pNMHDR;
 /* スピンコントロールの処理 */
 	switch( idCtrl ){

diff --git a/sakura_core/dlg/CDlgPluginOption.cpp b/sakura_core/dlg/CDlgPluginOption.cpp
@@ -333,9 +333,9 @@ BOOL CDlgPluginOption::OnInitDialog( HWND hwndDlg, WPARAM wParam, LPARAM lParam
 
 BOOL CDlgPluginOption::OnNotify(NMHDR* pNMHDR)
 {
-	UINT_PTR		idCtrl;
+	int			idCtrl;
 
-	idCtrl = pNMHDR->idFrom;
+	idCtrl = (int)pNMHDR->idFrom;
 	switch( idCtrl ){
 	case IDC_LIST_PLUGIN_OPTIONS:
 		switch( pNMHDR->code ){

diff --git a/sakura_core/dlg/CDlgPrintSetting.cpp b/sakura_core/dlg/CDlgPrintSetting.cpp
@@ -188,9 +188,9 @@ BOOL CDlgPrintSetting::OnNotify(NMHDR* pNMHDR)
 {
 	CDlgInput1		cDlgInput1;
 	NM_UPDOWN*		pMNUD;
-	UINT_PTR		idCtrl;
+	int				idCtrl;
 	BOOL			bSpinDown;
-	idCtrl = pNMHDR->idFrom;
+	idCtrl = (int)pNMHDR->idFrom;
 	pMNUD  = (NM_UPDOWN*)pNMHDR;
 	if( pMNUD->iDelta < 0 ){
 		bSpinDown = FALSE;

diff --git a/sakura_core/outline/CDlgFuncList.cpp b/sakura_core/outline/CDlgFuncList.cpp
@@ -2100,14 +2100,12 @@ BOOL CDlgFuncList::OnBnClicked( int wID )
 
 BOOL CDlgFuncList::OnNotify(NMHDR* pNMHDR)
 {
-//	UINT_PTR		idCtrl;
 	NM_LISTVIEW*	pnlv;
 	HWND			hwndList;
 	HWND			hwndTree;
 	NM_TREEVIEW*	pnmtv;
 //	int				nLineTo;
 
-//	idCtrl = pNMHDR->idFrom;
 	pnlv = (NM_LISTVIEW*)pNMHDR;
 
 	CEditView* pcEditView=(CEditView*)m_lParam;