Style patch part1. based on newly released astyle 1.24.

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

1 files changed, 163 insertions, 157 deletions

diff --git a/src/apps/mplayerc/ComPropertySheet.cpp b/src/apps/mplayerc/ComPropertySheet.cpp
index 70b2ea4b5..1418b2ada 100644
--- a/src/apps/mplayerc/ComPropertySheet.cpp
+++ b/src/apps/mplayerc/ComPropertySheet.cpp
@@ -32,54 +32,60 @@
 

 class CComPropertyPageSite : public CUnknown, public IPropertyPageSite

 {

-	IComPropertyPageDirty* m_pPPD;

+    IComPropertyPageDirty* m_pPPD;

 

 public:

-	CComPropertyPageSite(IComPropertyPageDirty* pPPD) : CUnknown(NAME("CComPropertyPageSite"), NULL), m_pPPD(pPPD) {}

-

-	DECLARE_IUNKNOWN

-	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv)

-	{

-		return 

-			QI(IPropertyPageSite)

-			__super::NonDelegatingQueryInterface(riid, ppv);

-	}

-

-	// IPropertyPageSite

-	STDMETHODIMP OnStatusChange(DWORD flags)

-	{

-		if(m_pPPD)

-		{

-			if(flags&PROPPAGESTATUS_DIRTY) m_pPPD->OnSetDirty(true); 

-			if(flags&PROPPAGESTATUS_CLEAN) m_pPPD->OnSetDirty(false);

-		}

-		return S_OK;

-	}

-	STDMETHODIMP GetLocaleID(LCID* pLocaleID)

-	{

-		CheckPointer(pLocaleID, E_POINTER);

-		*pLocaleID = ::GetUserDefaultLCID();

-		return S_OK;

-	}

-	STDMETHODIMP GetPageContainer(IUnknown** ppUnk) {return E_NOTIMPL;}

-	STDMETHODIMP TranslateAccelerator(LPMSG pMsg) {return E_NOTIMPL;}

+    CComPropertyPageSite(IComPropertyPageDirty* pPPD) : CUnknown(NAME("CComPropertyPageSite"), NULL), m_pPPD(pPPD) {}

+

+    DECLARE_IUNKNOWN

+    STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv)

+    {

+        return

+            QI(IPropertyPageSite)

+            __super::NonDelegatingQueryInterface(riid, ppv);

+    }

+

+    // IPropertyPageSite

+    STDMETHODIMP OnStatusChange(DWORD flags)

+    {

+        if(m_pPPD)

+        {

+            if(flags&PROPPAGESTATUS_DIRTY) m_pPPD->OnSetDirty(true);

+            if(flags&PROPPAGESTATUS_CLEAN) m_pPPD->OnSetDirty(false);

+        }

+        return S_OK;

+    }

+    STDMETHODIMP GetLocaleID(LCID* pLocaleID)

+    {

+        CheckPointer(pLocaleID, E_POINTER);

+        *pLocaleID = ::GetUserDefaultLCID();

+        return S_OK;

+    }

+    STDMETHODIMP GetPageContainer(IUnknown** ppUnk)

+    {

+        return E_NOTIMPL;

+    }

+    STDMETHODIMP TranslateAccelerator(LPMSG pMsg)

+    {

+        return E_NOTIMPL;

+    }

 };

 

 // CComPropertySheet

 

 IMPLEMENT_DYNAMIC(CComPropertySheet, CPropertySheet)

 CComPropertySheet::CComPropertySheet(UINT nIDCaption, CWnd* pParentWnd, UINT iSelectPage)

-	: CPropertySheet(nIDCaption, pParentWnd, iSelectPage)

+    : CPropertySheet(nIDCaption, pParentWnd, iSelectPage)

 {

-	m_pSite = DNew CComPropertyPageSite(this);

-	m_size.SetSize(0, 0);

+    m_pSite = DNew CComPropertyPageSite(this);

+    m_size.SetSize(0, 0);

 }

 

 CComPropertySheet::CComPropertySheet(LPCTSTR pszCaption, CWnd* pParentWnd, UINT iSelectPage)

-	: CPropertySheet(pszCaption, pParentWnd, iSelectPage)

+    : CPropertySheet(pszCaption, pParentWnd, iSelectPage)

 {

-	m_pSite = DNew CComPropertyPageSite(this);

-	m_size.SetSize(0, 0);

+    m_pSite = DNew CComPropertyPageSite(this);

+    m_size.SetSize(0, 0);

 }

 

 CComPropertySheet::~CComPropertySheet()

@@ -88,144 +94,144 @@ CComPropertySheet::~CComPropertySheet()
 

 int CComPropertySheet::AddPages(CComPtr<ISpecifyPropertyPages> pSPP)

 {

-	if(!pSPP) return(0);

+    if(!pSPP) return(0);

 

-	CAUUID caGUID;

-	caGUID.pElems = NULL;

-	if(FAILED(pSPP->GetPages(&caGUID)))

-		return(0);

+    CAUUID caGUID;

+    caGUID.pElems = NULL;

+    if(FAILED(pSPP->GetPages(&caGUID)))

+        return(0);

 

-	IUnknown* lpUnk = NULL;

-	if(FAILED(pSPP.QueryInterface(&lpUnk)))

-		return(0);

+    IUnknown* lpUnk = NULL;

+    if(FAILED(pSPP.QueryInterface(&lpUnk)))

+        return(0);

 

-	m_spp.AddTail(pSPP);

+    m_spp.AddTail(pSPP);

 

-	CComQIPtr<ISpecifyPropertyPages2> pSPP2 = pSPP;

-	CComQIPtr<IPersist> pPersist = pSPP;

+    CComQIPtr<ISpecifyPropertyPages2> pSPP2 = pSPP;

+    CComQIPtr<IPersist> pPersist = pSPP;

 

-	ULONG nPages = 0;

-	for(ULONG i = 0; i < caGUID.cElems; i++)

-	{

-		CComPtr<IPropertyPage> pPage;

+    ULONG nPages = 0;

+    for(ULONG i = 0; i < caGUID.cElems; i++)

+    {

+        CComPtr<IPropertyPage> pPage;

 

-		HRESULT hr = E_FAIL;

+        HRESULT hr = E_FAIL;

 

-		if(FAILED(hr) && !pPage && pSPP2)

-		{

-			hr = pSPP2->CreatePage(caGUID.pElems[i], &pPage);

-		}

+        if(FAILED(hr) && !pPage && pSPP2)

+        {

+            hr = pSPP2->CreatePage(caGUID.pElems[i], &pPage);

+        }

 

-		if(FAILED(hr) && !pPage)

-		{

-			hr = pPage.CoCreateInstance(caGUID.pElems[i]);

-		}

+        if(FAILED(hr) && !pPage)

+        {

+            hr = pPage.CoCreateInstance(caGUID.pElems[i]);

+        }

 

-		if(FAILED(hr) && !pPage && pPersist)

-		{

-			hr = LoadExternalPropertyPage(pPersist, caGUID.pElems[i], &pPage);

-		}

+        if(FAILED(hr) && !pPage && pPersist)

+        {

+            hr = LoadExternalPropertyPage(pPersist, caGUID.pElems[i], &pPage);

+        }

 

-		if(SUCCEEDED(hr))

-		{

-			if(AddPage(pPage, lpUnk))

-				nPages++;

-		}

-	}

+        if(SUCCEEDED(hr))

+        {

+            if(AddPage(pPage, lpUnk))

+                nPages++;

+        }

+    }

 

-	if(caGUID.pElems) CoTaskMemFree(caGUID.pElems);

-	lpUnk->Release();

+    if(caGUID.pElems) CoTaskMemFree(caGUID.pElems);

+    lpUnk->Release();

 

-	return(nPages);

+    return(nPages);

 }

 

 bool CComPropertySheet::AddPage(IPropertyPage* pPage, IUnknown* pUnk)

 {

-	if(!pPage || !pUnk) return false;

-

-	HRESULT hr;

-	hr = pPage->SetPageSite(m_pSite);

-	hr = pPage->SetObjects(1, &pUnk);

-	PROPPAGEINFO ppi;

-	hr = pPage->GetPageInfo(&ppi);

-	m_size.cx = max(m_size.cx, ppi.size.cx);

-	m_size.cy = max(m_size.cy, ppi.size.cy);

-	CAutoPtr<CComPropertyPage> p(DNew CComPropertyPage(pPage));

-	__super::AddPage(p);

-	m_pages.AddTail(p);

-

-	return true;

+    if(!pPage || !pUnk) return false;

+

+    HRESULT hr;

+    hr = pPage->SetPageSite(m_pSite);

+    hr = pPage->SetObjects(1, &pUnk);

+    PROPPAGEINFO ppi;

+    hr = pPage->GetPageInfo(&ppi);

+    m_size.cx = max(m_size.cx, ppi.size.cx);

+    m_size.cy = max(m_size.cy, ppi.size.cy);

+    CAutoPtr<CComPropertyPage> p(DNew CComPropertyPage(pPage));

+    __super::AddPage(p);

+    m_pages.AddTail(p);

+

+    return true;

 }

 

 void CComPropertySheet::OnActivated(CPropertyPage* pPage)

 {

-	if(!pPage) return;

-

-	CRect bounds(30000,30000,-30000,-30000);

-

-	CRect wr, cr;

-	GetWindowRect(wr);

-	GetClientRect(cr);

-	CSize ws = wr.Size(), cs = cr.Size();

-

-	CRect twr, tcr;

-	CTabCtrl* pTC = (CTabCtrl*)GetDlgItem(AFX_IDC_TAB_CONTROL);

-	pTC->GetWindowRect(twr);

-	pTC->GetClientRect(tcr);

-	CSize tws = twr.Size(), tcs = tcr.Size();

-

-	if(CWnd* pChild = pPage->GetWindow(GW_CHILD))

-	{

-		pChild->ModifyStyle(WS_CAPTION|WS_THICKFRAME, 0);

-		pChild->ModifyStyleEx(WS_EX_DLGMODALFRAME, WS_EX_CONTROLPARENT);

-

-		for(CWnd* pGrandChild = pChild->GetWindow(GW_CHILD); pGrandChild; pGrandChild = pGrandChild->GetNextWindow())

-		{

-			if(!(pGrandChild->GetStyle()&WS_VISIBLE)) continue;

-

-			CRect r;

-			pGrandChild->GetWindowRect(&r);

-			pChild->ScreenToClient(r);

-			bounds |= r;

-		}

-	}

-

-	bounds |= CRect(0,0,0,0);

-	bounds.SetRect(0, 0, bounds.right + max(bounds.left, 4), bounds.bottom + max(bounds.top, 4));

-

-	CRect r = CRect(CPoint(0,0), bounds.Size());

-	pTC->AdjustRect(TRUE, r);

-	r.SetRect(twr.TopLeft(), twr.TopLeft() + r.Size());

-	ScreenToClient(r);

-	pTC->MoveWindow(r);

-	pTC->ModifyStyle(TCS_MULTILINE, TCS_SINGLELINE);

-

-	CSize diff = r.Size() - tws;

-

-	if(!bounds.IsRectEmpty())

-	{

-		if(CWnd* pChild = pPage->GetWindow(GW_CHILD))

-			pChild->MoveWindow(bounds);

-		CRect r = twr;

-		pTC->AdjustRect(FALSE, r);

-		ScreenToClient(r);

-		pPage->MoveWindow(CRect(r.TopLeft(), bounds.Size()));

-	}

-

-	int _afxPropSheetButtons[] = { IDOK, IDCANCEL, ID_APPLY_NOW, IDHELP };

-	for(int i = 0; i < countof(_afxPropSheetButtons); i++)

-	{

-		if(CWnd* pWnd = GetDlgItem(_afxPropSheetButtons[i]))

-		{

-			pWnd->GetWindowRect(r);

-			ScreenToClient(r);

-			pWnd->MoveWindow(CRect(r.TopLeft() + diff, r.Size()));

-		}

-	}

-

-	MoveWindow(CRect(wr.TopLeft(), ws + diff));

-

-	Invalidate();

+    if(!pPage) return;

+

+    CRect bounds(30000,30000,-30000,-30000);

+

+    CRect wr, cr;

+    GetWindowRect(wr);

+    GetClientRect(cr);

+    CSize ws = wr.Size(), cs = cr.Size();

+

+    CRect twr, tcr;

+    CTabCtrl* pTC = (CTabCtrl*)GetDlgItem(AFX_IDC_TAB_CONTROL);

+    pTC->GetWindowRect(twr);

+    pTC->GetClientRect(tcr);

+    CSize tws = twr.Size(), tcs = tcr.Size();

+

+    if(CWnd* pChild = pPage->GetWindow(GW_CHILD))

+    {

+        pChild->ModifyStyle(WS_CAPTION|WS_THICKFRAME, 0);

+        pChild->ModifyStyleEx(WS_EX_DLGMODALFRAME, WS_EX_CONTROLPARENT);

+

+        for(CWnd* pGrandChild = pChild->GetWindow(GW_CHILD); pGrandChild; pGrandChild = pGrandChild->GetNextWindow())

+        {

+            if(!(pGrandChild->GetStyle()&WS_VISIBLE)) continue;

+

+            CRect r;

+            pGrandChild->GetWindowRect(&r);

+            pChild->ScreenToClient(r);

+            bounds |= r;

+        }

+    }

+

+    bounds |= CRect(0,0,0,0);

+    bounds.SetRect(0, 0, bounds.right + max(bounds.left, 4), bounds.bottom + max(bounds.top, 4));

+

+    CRect r = CRect(CPoint(0,0), bounds.Size());

+    pTC->AdjustRect(TRUE, r);

+    r.SetRect(twr.TopLeft(), twr.TopLeft() + r.Size());

+    ScreenToClient(r);

+    pTC->MoveWindow(r);

+    pTC->ModifyStyle(TCS_MULTILINE, TCS_SINGLELINE);

+

+    CSize diff = r.Size() - tws;

+

+    if(!bounds.IsRectEmpty())

+    {

+        if(CWnd* pChild = pPage->GetWindow(GW_CHILD))

+            pChild->MoveWindow(bounds);

+        CRect r = twr;

+        pTC->AdjustRect(FALSE, r);

+        ScreenToClient(r);

+        pPage->MoveWindow(CRect(r.TopLeft(), bounds.Size()));

+    }

+

+    int _afxPropSheetButtons[] = { IDOK, IDCANCEL, ID_APPLY_NOW, IDHELP };

+    for(int i = 0; i < countof(_afxPropSheetButtons); i++)

+    {

+        if(CWnd* pWnd = GetDlgItem(_afxPropSheetButtons[i]))

+        {

+            pWnd->GetWindowRect(r);

+            ScreenToClient(r);

+            pWnd->MoveWindow(CRect(r.TopLeft() + diff, r.Size()));

+        }

+    }

+

+    MoveWindow(CRect(wr.TopLeft(), ws + diff));

+

+    Invalidate();

 }

 

 

@@ -237,10 +243,10 @@ END_MESSAGE_MAP()
 

 BOOL CComPropertySheet::OnInitDialog()

 {

-	BOOL bResult = (BOOL)Default();//CPropertySheet::OnInitDialog();

+    BOOL bResult = (BOOL)Default();//CPropertySheet::OnInitDialog();

 

-	if (!(GetStyle() & WS_CHILD))

-		CenterWindow();

+    if (!(GetStyle() & WS_CHILD))

+        CenterWindow();

 

-	return bResult;

+    return bResult;

 }