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

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

Revision: 1014
          http://modplug.svn.sourceforge.net/modplug/?rev=1014&view=rev
Author:   saga-games
Date:     2011-09-03 19:42:29 +0000 (Sat, 03 Sep 2011)
Log Message:
-----------
[Imp] Shortcuts are not processed anymore when a message box is shown.
[Mod] OpenMPT: Version is now 1.20.00.17

Modified Paths:
--------------
    trunk/OpenMPT/common/Reporting.cpp
    trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
    trunk/OpenMPT/mptrack/version.h

Modified: trunk/OpenMPT/common/Reporting.cpp
===================================================================
--- trunk/OpenMPT/common/Reporting.cpp	2011-09-03 19:18:19 UTC (rev 1013)
+++ trunk/OpenMPT/common/Reporting.cpp	2011-09-03 19:42:29 UTC (rev 1014)
@@ -22,10 +22,17 @@
 UINT Reporting::Notification(CString text, CString caption, UINT flags /* = MB_OK*/, HWND parent /* = NULL*/)
 //-----------------------------------------------------------------------------------------------------------
 {
-	if(parent == NULL && CMainFrame::GetMainFrame() != nullptr)
+	CMainFrame *pMainFrm = CMainFrame::GetMainFrame();
+
+	if(pMainFrm != nullptr && pMainFrm->GetInputHandler() != nullptr)
 	{
-		parent = CMainFrame::GetMainFrame()->m_hWnd;
+		pMainFrm->GetInputHandler()->Bypass(true);
 	}
 
 	return ::MessageBox(parent, text, caption, flags);
+
+	if(pMainFrm != nullptr && pMainFrm->GetInputHandler() != nullptr)
+	{
+		pMainFrm->GetInputHandler()->Bypass(false);
+	}
 };

Modified: trunk/OpenMPT/mptrack/AbstractVstEditor.cpp
===================================================================
--- trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-09-03 19:18:19 UTC (rev 1013)
+++ trunk/OpenMPT/mptrack/AbstractVstEditor.cpp	2011-09-03 19:42:29 UTC (rev 1014)
@@ -355,7 +355,7 @@
 				return false;
 
 			if(!m_pVstPlugin->isInstrument() || pModDoc->GetSoundFile()->GetModSpecifications().instrumentsMax == 0 ||
-				Reporting::Notification(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), MB_YESNO | MB_ICONQUESTION) == IDNO)
+				Reporting::Notification(_T("You need to assign an instrument to this plugin before you can play notes from here.\nCreate a new instrument and assign this plugin to the instrument?"), MB_YESNO | MB_ICONQUESTION, this->m_hWnd) == IDNO)
 			{
 				return false;
 			} else

Modified: trunk/OpenMPT/mptrack/version.h
===================================================================
--- trunk/OpenMPT/mptrack/version.h	2011-09-03 19:18:19 UTC (rev 1013)
+++ trunk/OpenMPT/mptrack/version.h	2011-09-03 19:42:29 UTC (rev 1014)
@@ -15,7 +15,7 @@
 #define VER_MAJORMAJOR				1
 #define VER_MAJOR					20
 #define VER_MINOR					00
-#define VER_MINORMINOR				16
+#define VER_MINORMINOR				17
 
 //Creates version number from version parts that appears in version string.
 //For example MAKE_VERSION_NUMERIC(1,17,02,28) gives version number of 

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