FIXED : broken "Save Thumbnail" dialog box with Vista after migration to Visual Studio 2008 (bVistaStyle set to false)

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@536 10f7b99b-c216-0410-bff0-8a66a9350fd8

1 files changed, 8 insertions, 55 deletions

diff --git a/src/apps/mplayerc/SaveThumbnailsDialog.cpp b/src/apps/mplayerc/SaveThumbnailsDialog.cpp
index c9b2e0413..6260c261b 100644
--- a/src/apps/mplayerc/SaveThumbnailsDialog.cpp
+++ b/src/apps/mplayerc/SaveThumbnailsDialog.cpp
@@ -25,7 +25,6 @@
 #include "mplayerc.h"

 #include "SaveThumbnailsDialog.h"

 

-#define CAP_SELECTION(_MIN,_VAL,_MAX)	min (max (_MIN, _VAL), _MAX)

 

 // CSaveThumbnailsDialog

 

@@ -36,32 +35,10 @@ CSaveThumbnailsDialog::CSaveThumbnailsDialog(
 	LPCTSTR lpszFilter, CWnd* pParentWnd) :

 		CFileDialog(FALSE, lpszDefExt, lpszFileName, 

 			OFN_EXPLORER|OFN_ENABLESIZING|OFN_HIDEREADONLY|OFN_OVERWRITEPROMPT|OFN_PATHMUSTEXIST, 

-			lpszFilter, pParentWnd, 0),

+			lpszFilter, pParentWnd, 0, FALSE),

 	m_rows(rows), m_cols(cols), m_width(width)

 {

-	m_pCustom.Attach (GetIFileDialogCustomize());

-

-	if (m_pCustom)

-	{

-		CString			strTmp;

-

-		strTmp.Format (_T("%d"), m_rows);

-        m_pCustom->StartVisualGroup (IDS_THUMB_ROWNUMBER, ResStr(IDS_THUMB_ROWNUMBER)); 

-		m_pCustom->AddEditBox (IDC_EDIT1, strTmp);

-        m_pCustom->EndVisualGroup();

-

-		strTmp.Format (_T("%d"), m_width);

-        m_pCustom->StartVisualGroup (IDS_THUMB_COLNUMBER, ResStr(IDS_THUMB_COLNUMBER)); 

-		m_pCustom->AddEditBox (IDC_EDIT3, strTmp);

-        m_pCustom->EndVisualGroup();

-

-		strTmp.Format (_T("%d"), m_cols);

-        m_pCustom->StartVisualGroup (IDS_THUMB_IMAGE_WIDTH, ResStr(IDS_THUMB_IMAGE_WIDTH)); 

-		m_pCustom->AddEditBox (IDC_EDIT2, strTmp);

-        m_pCustom->EndVisualGroup();

-

-	}

-	else if(m_ofn.lStructSize == sizeof(OPENFILENAME))

+	if(m_ofn.lStructSize == sizeof(OPENFILENAME))

 	{

 		SetTemplate(0, IDD_SAVETHUMBSDIALOGTEMPL);

 	}

@@ -73,17 +50,13 @@ CSaveThumbnailsDialog::CSaveThumbnailsDialog(
 

 CSaveThumbnailsDialog::~CSaveThumbnailsDialog()

 {

-	m_pCustom = NULL;

 }

 

 void CSaveThumbnailsDialog::DoDataExchange(CDataExchange* pDX)

 {

-	if (!m_pCustom)

-	{

-		DDX_Control(pDX, IDC_SPIN1, m_rowsctrl);

-		DDX_Control(pDX, IDC_SPIN2, m_colsctrl);

-		DDX_Control(pDX, IDC_SPIN3, m_widthctrl);	

-	}

+	DDX_Control(pDX, IDC_SPIN1, m_rowsctrl);

+	DDX_Control(pDX, IDC_SPIN2, m_colsctrl);

+	DDX_Control(pDX, IDC_SPIN3, m_widthctrl);	

 	__super::DoDataExchange(pDX);

 }

 

@@ -109,29 +82,9 @@ END_MESSAGE_MAP()
 

 BOOL CSaveThumbnailsDialog::OnFileNameOK()

 {

-	if (!m_pCustom)

-	{

-		m_rows = m_rowsctrl.GetPos();

-		m_cols = m_colsctrl.GetPos();

-		m_width = m_widthctrl.GetPos();

-	}

-	else

-	{

-		// Vista !

-		WCHAR*		pstrTemp;

-

-		m_pCustom->GetEditBoxText(IDC_EDIT1, &pstrTemp);

-		m_rows = CAP_SELECTION (1, _wtol (pstrTemp), 8);

-		CoTaskMemFree (pstrTemp);

-

-		m_pCustom->GetEditBoxText(IDC_EDIT2, &pstrTemp);

-		m_cols = CAP_SELECTION (1, _wtol (pstrTemp), 8);

-		CoTaskMemFree (pstrTemp);

-

-		m_pCustom->GetEditBoxText(IDC_EDIT3, &pstrTemp);

-		m_width = CAP_SELECTION (256, _wtol (pstrTemp), 2048);

-		CoTaskMemFree (pstrTemp);

-	}

+	m_rows = m_rowsctrl.GetPos();

+	m_cols = m_colsctrl.GetPos();

+	m_width = m_widthctrl.GetPos();

 

 	return __super::OnFileNameOK();

 }