[OMPT-svn-commit] SF.net SVN: modplug:[982] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 982
          http://modplug.svn.sourceforge.net/modplug/?rev=982&view=rev
Author:   saga-games
Date:     2011-08-17 18:26:59 +0000 (Wed, 17 Aug 2011)

Log Message:
-----------
[Mod] Removed some overriden MFC function to get rid of failed assertions... Doesn't seem to change behaviour otherwise. This stuff might have been necessary on pre-VS2008, since I think that was the first version where I noticed the assertions when switching tabs using shortcuts.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/Childfrm.cpp
    trunk/OpenMPT/mptrack/Childfrm.h

Modified: trunk/OpenMPT/mptrack/Childfrm.cpp
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.cpp	2011-08-17 00:02:42 UTC (rev 981)
+++ trunk/OpenMPT/mptrack/Childfrm.cpp	2011-08-17 18:26:59 UTC (rev 982)
@@ -23,7 +23,7 @@
 
 IMPLEMENT_DYNAMIC(CViewExSplitWnd, CSplitterWnd)
 
-CWnd* CViewExSplitWnd::GetActivePane(int*, int*)	// pRow, pCol
+/*CWnd* CViewExSplitWnd::GetActivePane(int*, int*)	// pRow, pCol
 //----------------------------------------------
 {
 	// attempt to use active view of frame window
@@ -37,7 +37,7 @@
 		pView = GetFocus();
 
 	return pView;
-}
+}*/
 
 
 
@@ -93,11 +93,10 @@
 BOOL CChildFrame::OnCreateClient(LPCREATESTRUCT lpcs, CCreateContext* pContext)
 //-----------------------------------------------------------------------------
 {
-	// create a splitter with 1 row, 2 columns
+	// create a splitter with 2 rows, 1 column
 	if (!m_wndSplitter.CreateStatic(this, 2, 1)) return FALSE;
 
 	// add the first splitter pane - the default view in row 0
-	//int cy = CMainFrame::glCtrlWindowHeight;
 	int cy = CMainFrame::GetSettings().glGeneralWindowHeight;	//rewbs.varWindowSize - default to general tab.
 	if (cy <= 1) cy = (lpcs->cy*2) / 3;
 	if (!m_wndSplitter.CreateView(0, 0, pContext->m_pNewViewClass, CSize(0, cy), pContext)) return FALSE;

Modified: trunk/OpenMPT/mptrack/Childfrm.h
===================================================================
--- trunk/OpenMPT/mptrack/Childfrm.h	2011-08-17 00:02:42 UTC (rev 981)
+++ trunk/OpenMPT/mptrack/Childfrm.h	2011-08-17 18:26:59 UTC (rev 982)
@@ -70,7 +70,7 @@
 public:
 	CViewExSplitWnd() {}
 	~CViewExSplitWnd() {}
-	CWnd* GetActivePane(int* pRow = NULL, int* pCol = NULL);
+	//CWnd* GetActivePane(int* pRow = NULL, int* pCol = NULL);
 };
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.