tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-23 22:04:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/NN---/x64'

Browse Source
This commit is contained in:
Don Ho 2015-10-13 14:01:39 +02:00
commit bb2f771cba
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/WinControls/OpenSaveFileDialog/FileDialog.cpp
View File

@ -374,7 +374,7 @@ UINT_PTR CALLBACK FileDialog::OFNHookProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
// Don't touch the following 3 lines, they are cursed !!! // Don't touch the following 3 lines, they are cursed !!!
oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWLP_WNDPROC); oldProc = (WNDPROC)::GetWindowLongPtr(hFileDlg, GWLP_WNDPROC);
if ((long)oldProc > 0) if (oldProc)
::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc); ::SetWindowLongPtr(hFileDlg, GWLP_WNDPROC, (LONG_PTR)fileDlgProc);
return FALSE; return FALSE;

6
PowerEditor/src/WinControls/shortcut/shortcut.h
View File

@ -137,7 +137,8 @@ public:
return !(a == b); return !(a == b);
}; };
virtual int doDialog() { virtual INT_PTR doDialog()
{
return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUT_DLG), _hParent, dlgProc, (LPARAM)this); return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUT_DLG), _hParent, dlgProc, (LPARAM)this);
}; };
@ -230,7 +231,8 @@ public:
generic_string toString() const; generic_string toString() const;
generic_string toString(int index) const; generic_string toString(int index) const;
int doDialog() { INT_PTR doDialog()
{
return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUTSCINT_DLG), _hParent, dlgProc, (LPARAM)this); return ::DialogBoxParam(_hInst, MAKEINTRESOURCE(IDD_SHORTCUTSCINT_DLG), _hParent, dlgProc, (LPARAM)this);
}; };