CmdUI: whitespace cleanup

EVR Sync: Aspect Ratio shown with ":"
Updated AUTHORS and Changelog

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

2 files changed, 91 insertions, 88 deletions

diff --git a/src/ui/CmdUI/CmdUI.cpp b/src/ui/CmdUI/CmdUI.cpp
index 1e441d9f8..6d720e8d5 100644
--- a/src/ui/CmdUI/CmdUI.cpp
+++ b/src/ui/CmdUI/CmdUI.cpp
@@ -1,4 +1,4 @@
-/* 

+/*

  *	Copyright (C) 2003-2006 Gabest

  *	http://www.gabest.org

  *

@@ -6,15 +6,15 @@
  *  it under the terms of the GNU General Public License as published by

  *  the Free Software Foundation; either version 2, or (at your option)

  *  any later version.

- *   

+ *

  *  This Program is distributed in the hope that it will be useful,

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  *  GNU General Public License for more details.

- *   

+ *

  *  You should have received a copy of the GNU General Public License

  *  along with GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

  *  http://www.gnu.org/copyleft/gpl.html

  *

  */

@@ -79,83 +79,83 @@ void CCmdUIDialog::OnKickIdle()
 

 void CCmdUIDialog::OnInitMenuPopup(CMenu *pPopupMenu, UINT /*nIndex*/, BOOL /*bSysMenu*/)

 {

-    ASSERT(pPopupMenu != NULL);

-    // Check the enabled state of various menu items.

-

-    CCmdUI state;

-    state.m_pMenu = pPopupMenu;

-    ASSERT(state.m_pOther == NULL);

-    ASSERT(state.m_pParentMenu == NULL);

-

-    // Determine if menu is popup in top-level menu and set m_pOther to

-    // it if so (m_pParentMenu == NULL indicates that it is secondary popup).

-    HMENU hParentMenu;

-    if (AfxGetThreadState()->m_hTrackingMenu == pPopupMenu->m_hMenu)

-        state.m_pParentMenu = pPopupMenu;    // Parent == child for tracking popup.

-    else if ((hParentMenu = ::GetMenu(m_hWnd)) != NULL)

-    {

-        CWnd* pParent = this;

-           // Child windows don't have menus--need to go to the top!

-        if (pParent != NULL &&

-           (hParentMenu = ::GetMenu(pParent->m_hWnd)) != NULL)

-        {

-           int nIndexMax = ::GetMenuItemCount(hParentMenu);

-           for (int nIndex = 0; nIndex < nIndexMax; nIndex++)

-           {

-            if (::GetSubMenu(hParentMenu, nIndex) == pPopupMenu->m_hMenu)

-            {

-                // When popup is found, m_pParentMenu is containing menu.

-                state.m_pParentMenu = CMenu::FromHandle(hParentMenu);

-                break;

-            }

-           }

-        }

-    }

-

-    state.m_nIndexMax = pPopupMenu->GetMenuItemCount();

-    for (state.m_nIndex = 0; state.m_nIndex < state.m_nIndexMax;

-      state.m_nIndex++)

-    {

-        state.m_nID = pPopupMenu->GetMenuItemID(state.m_nIndex);

-        if (state.m_nID == 0)

-           continue; // Menu separator or invalid cmd - ignore it.

-

-        ASSERT(state.m_pOther == NULL);

-        ASSERT(state.m_pMenu != NULL);

-        if (state.m_nID == (UINT)-1)

-        {

-           // Possibly a popup menu, route to first item of that popup.

-           state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);

-           if (state.m_pSubMenu == NULL ||

-            (state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||

-            state.m_nID == (UINT)-1)

-           {

-            continue;       // First item of popup can't be routed to.

-           }

-           state.DoUpdate(this, TRUE);   // Popups are never auto disabled.

-        }

-        else

-        {

-           // Normal menu item.

-           // Auto enable/disable if frame window has m_bAutoMenuEnable

-           // set and command is _not_ a system command.

-           state.m_pSubMenu = NULL;

-           state.DoUpdate(this, FALSE);

-        }

-

-        // Adjust for menu deletions and additions.

-        UINT nCount = pPopupMenu->GetMenuItemCount();

-        if (nCount < state.m_nIndexMax)

-        {

-           state.m_nIndex -= (state.m_nIndexMax - nCount);

-           while (state.m_nIndex < nCount &&

-            pPopupMenu->GetMenuItemID(state.m_nIndex) == state.m_nID)

-           {

-            state.m_nIndex++;

-           }

-        }

-        state.m_nIndexMax = nCount;

-    }

+	ASSERT(pPopupMenu != NULL);

+	// Check the enabled state of various menu items.

+

+	CCmdUI state;

+	state.m_pMenu = pPopupMenu;

+	ASSERT(state.m_pOther == NULL);

+	ASSERT(state.m_pParentMenu == NULL);

+

+	// Determine if menu is popup in top-level menu and set m_pOther to

+	// it if so (m_pParentMenu == NULL indicates that it is secondary popup).

+	HMENU hParentMenu;

+	if (AfxGetThreadState()->m_hTrackingMenu == pPopupMenu->m_hMenu)

+		state.m_pParentMenu = pPopupMenu;    // Parent == child for tracking popup.

+	else if ((hParentMenu = ::GetMenu(m_hWnd)) != NULL)

+	{

+		CWnd* pParent = this;

+		// Child windows don't have menus--need to go to the top!

+		if (pParent != NULL &&

+			(hParentMenu = ::GetMenu(pParent->m_hWnd)) != NULL)

+		{

+			int nIndexMax = ::GetMenuItemCount(hParentMenu);

+			for (int nIndex = 0; nIndex < nIndexMax; nIndex++)

+			{

+				if (::GetSubMenu(hParentMenu, nIndex) == pPopupMenu->m_hMenu)

+				{

+					// When popup is found, m_pParentMenu is containing menu.

+					state.m_pParentMenu = CMenu::FromHandle(hParentMenu);

+					break;

+				}

+			}

+		}

+	}

+

+	state.m_nIndexMax = pPopupMenu->GetMenuItemCount();

+	for (state.m_nIndex = 0; state.m_nIndex < state.m_nIndexMax;

+			state.m_nIndex++)

+	{

+		state.m_nID = pPopupMenu->GetMenuItemID(state.m_nIndex);

+		if (state.m_nID == 0)

+			continue; // Menu separator or invalid cmd - ignore it.

+

+		ASSERT(state.m_pOther == NULL);

+		ASSERT(state.m_pMenu != NULL);

+		if (state.m_nID == (UINT)-1)

+		{

+			// Possibly a popup menu, route to first item of that popup.

+			state.m_pSubMenu = pPopupMenu->GetSubMenu(state.m_nIndex);

+			if (state.m_pSubMenu == NULL ||

+					(state.m_nID = state.m_pSubMenu->GetMenuItemID(0)) == 0 ||

+					state.m_nID == (UINT)-1)

+			{

+				continue;		// First item of popup can't be routed to.

+			}

+			state.DoUpdate(this, TRUE);		// Popups are never auto disabled.

+		}

+		else

+		{

+			// Normal menu item.

+			// Auto enable/disable if frame window has m_bAutoMenuEnable

+			// set and command is _not_ a system command.

+			state.m_pSubMenu = NULL;

+			state.DoUpdate(this, FALSE);

+		}

+

+		// Adjust for menu deletions and additions.

+		UINT nCount = pPopupMenu->GetMenuItemCount();

+		if (nCount < state.m_nIndexMax)

+		{

+			state.m_nIndex -= (state.m_nIndexMax - nCount);

+			while (state.m_nIndex < nCount &&

+					pPopupMenu->GetMenuItemID(state.m_nIndex) == state.m_nID)

+			{

+				state.m_nIndex++;

+			}

+		}

+		state.m_nIndexMax = nCount;

+	}

 }

 

 // CCmdUIPropertyPage

@@ -176,9 +176,12 @@ LRESULT CCmdUIPropertyPage::DefWindowProc(UINT message, WPARAM wParam, LPARAM lP
 	{

 		switch(HIWORD(wParam))

 		{

-			case BN_CLICKED: case CBN_SELCHANGE: case EN_CHANGE:

-				SetModified();

-			default:;

+		case BN_CLICKED:

+		case CBN_SELCHANGE:

+		case EN_CHANGE:

+			SetModified();

+		default:

+			;

 		}

 	}

 

diff --git a/src/ui/CmdUI/CmdUI.h b/src/ui/CmdUI/CmdUI.h
index 1f57f574f..6b58d31f1 100644
--- a/src/ui/CmdUI/CmdUI.h
+++ b/src/ui/CmdUI/CmdUI.h
@@ -1,4 +1,4 @@
-/* 

+/*

  *	Copyright (C) 2003-2006 Gabest

  *	http://www.gabest.org

  *

@@ -6,15 +6,15 @@
  *  it under the terms of the GNU General Public License as published by

  *  the Free Software Foundation; either version 2, or (at your option)

  *  any later version.

- *   

+ *

  *  This Program is distributed in the hope that it will be useful,

  *  but WITHOUT ANY WARRANTY; without even the implied warranty of

  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

  *  GNU General Public License for more details.

- *   

+ *

  *  You should have received a copy of the GNU General Public License

  *  along with GNU Make; see the file COPYING.  If not, write to

- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. 

+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.

  *  http://www.gnu.org/copyleft/gpl.html

  *

  */