Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -r926b1177cffa2face218fabb3d8af71910d1b8e5 -r8068e0c351055554340ac9755d1bc846893bf2b8
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 926b1177cffa2face218fabb3d8af71910d1b8e5)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 8068e0c351055554340ac9755d1bc846893bf2b8)
@@ -26,6 +26,8 @@
 #include "StringHelpers.h"
 #include "FileSupport.h"
 #include "TRecentPathsTools.h"
+#include "resource.h"
+#include "shortcuts.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
@@ -61,7 +63,7 @@
 	{
 	case WM_ERASEBKGND:
 		return (LRESULT)0;
-		break;
+
 	case WM_PAINT:
 		CWnd* pWnd=CWnd::FromHandle(hwnd);
 		CPaintDC dc(pWnd);
@@ -95,7 +97,7 @@
 
 		CallWindowProc(pfWndProc, hwnd, WM_PAINT, (WPARAM)memdc.GetSafeHdc(), 0);
 		return 0;
-		break;
+
 	}
 
 	return CallWindowProc(pfWndProc, hwnd, uMsg, wParam, lParam);
@@ -120,7 +122,7 @@
 LRESULT CALLBACK CustomWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
 	int iID=GetDlgCtrlID(hwnd);
-	WNDPROC pfOld=NULL;
+	WNDPROC pfOld=nullptr;
 	switch(iID)
 	{
 	case IDC_TOGGLE_BUTTON:
@@ -147,11 +149,11 @@
 /////////////////////////////////////////////////////////////////////////////
 // CFolderDialog dialog
 
-CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=NULL*/)
+CFolderDialog::CFolderDialog(CWnd* /*pParent*/ /*=nullptr*/)
 				:ictranslate::CLanguageDialog()
 {
-	m_hImages=NULL;
-	m_hLargeImages=NULL;
+	m_hImages=nullptr;
+	m_hLargeImages=nullptr;
 	m_bIgnoreUpdate=false;
 	m_bIgnoreTreeRefresh=false;
 }
@@ -578,7 +580,7 @@
 {
 	// currently selected item
 	HTREEITEM hItem=m_ctlTree.GetSelectedItem();
-	if (hItem == NULL)
+	if (hItem == nullptr)
 		return;
 
 	// insert child item
@@ -874,7 +876,7 @@
 
 	// edit item
 	m_ctlShortcuts.SetFocus();
-	if (m_ctlShortcuts.EditLabel(iIndex) == NULL)
+	if (m_ctlShortcuts.EditLabel(iIndex) == nullptr)
 	{
 		TRACE("Couldn't edit shortcut list's item label\n");
 		return;
@@ -912,7 +914,7 @@
 	NMLVDISPINFO* pdi = (NMLVDISPINFO*)pNMHDR;
 
 	// editing has been cancelled - delete item
-	if (pdi->item.pszText == NULL)
+	if (pdi->item.pszText == nullptr)
 	{
 		m_ctlShortcuts.DeleteItem(pdi->item.iItem);
 		m_bdData.cvShortcuts.erase(m_bdData.cvShortcuts.begin() + pdi->item.iItem);