Index: src/ch/FolderDialog.cpp
===================================================================
diff -u -N -r68739164e349c34dcd0bcb36c6eb381f23cb8b77 -r3dbe8c6e46f558588d997795f62c8362138aeca9
--- src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 68739164e349c34dcd0bcb36c6eb381f23cb8b77)
+++ src/ch/FolderDialog.cpp	(.../FolderDialog.cpp)	(revision 3dbe8c6e46f558588d997795f62c8362138aeca9)
@@ -199,12 +199,12 @@
 	CRect rc(0, 0, 0, 0);
 
 	if (!m_ctlTitle.Create(_T(""), WS_CHILD | WS_VISIBLE, rc, this, IDC_TITLE_STATIC) ||
-		(__g_pfStatic=(WNDPROC)SetWindowLong(m_ctlTitle.GetSafeHwnd(), GWLP_WNDPROC, (LONG)CustomWindowProc)) == 0)
+		(__g_pfStatic=(WNDPROC)SetWindowLongPtr(m_ctlTitle.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
 	{
 		TRACE("Error creating control...");
 		return -1;
 	}
-	m_ctlTitle.SetFont(GetFont());
+	m_ctlTitle.SetFont(GetFont(), FALSE);
 
 	// buttons - small with bitmaps
 	if (!m_ctlLargeIcons.Create(_T(""), WS_CHILD | WS_VISIBLE | BS_OWNERDRAW, rc, this, IDC_LARGEICONS_BUTTON))
@@ -244,7 +244,7 @@
 
 	// listview
 	if (!m_ctlShortcuts.Create(WS_CHILD | WS_VISIBLE | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | LVS_EDITLABELS | WS_TABSTOP | LVS_SMALLICON | LVS_SHOWSELALWAYS, rc, this, IDC_SHORTCUT_LIST) ||
-		(__g_pfList=(WNDPROC)SetWindowLong(m_ctlShortcuts.GetSafeHwnd(), GWLP_WNDPROC, (LONG)CustomWindowProc)) == 0)
+		(__g_pfList=(WNDPROC)SetWindowLongPtr(m_ctlShortcuts.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
 	{
 		TRACE("Error creating control...");
 		return -1;
@@ -265,38 +265,38 @@
 	// combobox
 	rc.bottom=rc.top+200;
 	if (!m_ctlPath.Create(WS_CHILD | WS_VISIBLE | CBS_AUTOHSCROLL | CBS_DROPDOWN | CBS_SORT | CBS_OWNERDRAWFIXED | CBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN, rc, this, IDC_PATH_COMBOBOXEX) ||
-		(__g_pfCombo=(WNDPROC)SetWindowLong(m_ctlPath.GetSafeHwnd(), GWLP_WNDPROC, (LONG)CustomWindowProc)) == 0)
+		(__g_pfCombo=(WNDPROC)SetWindowLongPtr(m_ctlPath.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
 	{
 		TRACE("Error creating control...");
 		return -1;
 	}
 	HWND hCombo=(HWND)m_ctlPath.SendMessage(CBEM_GETCOMBOCONTROL, 0, 0);
-	if ((__g_pfBaseCombo=(WNDPROC)SetWindowLong(hCombo, GWLP_WNDPROC, (LONG)ComboWindowProc)) == 0)
+	if ((__g_pfBaseCombo=(WNDPROC)SetWindowLongPtr(hCombo, GWLP_WNDPROC, (LONG_PTR)ComboWindowProc)) == 0)
 		return -1;
 	HWND hEdit=(HWND)m_ctlPath.SendMessage(CBEM_GETEDITCONTROL, 0, 0);
-	if ((__g_pfEdit=(WNDPROC)SetWindowLong(hEdit, GWLP_WNDPROC, (LONG)EditWindowProc)) == 0)
+	if ((__g_pfEdit=(WNDPROC)SetWindowLongPtr(hEdit, GWLP_WNDPROC, (LONG_PTR)EditWindowProc)) == 0)
 		return -1;
 
 	// buttons OK & Cancel
 	rc.bottom=rc.top;
 	if (!m_ctlOk.Create(_T(""), WS_CHILD | WS_VISIBLE | BS_DEFPUSHBUTTON, rc, this, IDOK) ||
-		(__g_pfButton=(WNDPROC)SetWindowLong(m_ctlOk.GetSafeHwnd(), GWLP_WNDPROC, (LONG)CustomWindowProc)) == 0)
+		(__g_pfButton=(WNDPROC)SetWindowLongPtr(m_ctlOk.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)) == 0)
 	{
 		TRACE("Error creating control...");
 		return -1;
 	}
 	m_ctlOk.SetFont(GetFont());
 
 	if (!m_ctlCancel.Create(_T(""), WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, rc, this, IDCANCEL) ||
-		!((WNDPROC)SetWindowLong(m_ctlCancel.GetSafeHwnd(), GWLP_WNDPROC, (LONG)CustomWindowProc)))
+		!((WNDPROC)SetWindowLongPtr(m_ctlCancel.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)))
 	{
 		TRACE("Error creating control...");
 		return -1;
 	}
 	m_ctlCancel.SetFont(GetFont());
 
 	if (!m_ctlToggle.Create(_T(""), WS_CHILD | WS_VISIBLE | BS_PUSHBUTTON, rc, this, IDC_TOGGLE_BUTTON) ||
-		!((WNDPROC)SetWindowLong(m_ctlToggle.GetSafeHwnd(), GWLP_WNDPROC, (LONG)CustomWindowProc)))
+		!((WNDPROC)SetWindowLongPtr(m_ctlToggle.GetSafeHwnd(), GWLP_WNDPROC, (LONG_PTR)CustomWindowProc)))
 	{
 		TRACE("Error creating control...");
 		return -1;
@@ -953,7 +953,7 @@
  
 	// Only set the window style if the view bits have changed.
 	if ((dwStyle & LVS_TYPEMASK) != dwView) 
-		SetWindowLong(m_ctlShortcuts.GetSafeHwnd(), GWL_STYLE, (dwStyle & ~LVS_TYPEMASK) | dwView);
+		SetWindowLongPtr(m_ctlShortcuts.GetSafeHwnd(), GWL_STYLE, (dwStyle & ~LVS_TYPEMASK) | dwView);
 	m_ctlShortcuts.Arrange(LVA_ALIGNTOP);
 }