[Amis-vcs] SF.net SVN: amis: [2376] branches/amis3

[<dan...@us...>]

Revision: 2376
          http://amis.svn.sourceforge.net/amis/?rev=2376&view=rev
Author:   daniel_weck
Date:     2008-03-02 17:08:39 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
attempt to fix the skip dialog strange error, which seems to be related to AfxWndProc message pump...the other dialogs work fine, just not this one !! ??

Modified Paths:
--------------
    branches/amis3/AmisAudio/AmisAudio.vcproj
    branches/amis3/AmisAudio/include/directshow/dx_audio_player.h
    branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h
    branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
    branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp

Modified: branches/amis3/AmisAudio/AmisAudio.vcproj
===================================================================
--- branches/amis3/AmisAudio/AmisAudio.vcproj	2008-03-03 00:59:30 UTC (rev 2375)
+++ branches/amis3/AmisAudio/AmisAudio.vcproj	2008-03-03 01:08:39 UTC (rev 2376)
@@ -40,7 +40,6 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="stlib.lib kernel32.lib gdi32.lib user32.lib"
 				ShowProgress="2"
 				OutputFile="$(OutDir)/$(ProjectName)D.dll"
 				LinkIncremental="1"

Modified: branches/amis3/AmisAudio/include/directshow/dx_audio_player.h
===================================================================
--- branches/amis3/AmisAudio/include/directshow/dx_audio_player.h	2008-03-03 00:59:30 UTC (rev 2375)
+++ branches/amis3/AmisAudio/include/directshow/dx_audio_player.h	2008-03-03 01:08:39 UTC (rev 2376)
@@ -47,6 +47,14 @@
 //#include "ambulant/lib/win32/win32_error.h"
 //#include "ambulant/lib/logger.h"
 
+/*
+#ifdef _DEBUG
+#pragma comment(lib, "msvcrtd.lib") 
+#else
+#pragma comment(lib, "msvcrt.lib") 
+#endif
+*/
+
 #ifndef AMBULANT_PLATFORM_WIN32_WCE
 #pragma comment (lib,"winmm.lib")
 #pragma comment (lib,"amstrmid.lib")

Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h	2008-03-03 00:59:30 UTC (rev 2375)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h	2008-03-03 01:08:39 UTC (rev 2376)
@@ -27,6 +27,8 @@
 #include "gui/dialogs/AmisDialogBase.h"
 #include "../resource.h"
 
+//#define TESTING
+
 namespace amis
 {
 namespace gui
@@ -34,7 +36,13 @@
 namespace dialogs
 {
 
-class SkipDialog : public AmisDialogBase
+class SkipDialog :
+#ifdef TESTING
+public CDialog
+#else
+public AmisDialogBase
+#endif
+
 {
 //friend class amis::gui::spoken::SkipDialogVoicing;
 friend class SkipDialogVoicing;

Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp	2008-03-03 00:59:30 UTC (rev 2375)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp	2008-03-03 01:08:39 UTC (rev 2376)
@@ -615,7 +615,8 @@
 	amis::util::Log::Instance()->writeMessage("Showing reading options dialog (skippability)", "CAmisApp::OnSkipInfo", "AmisGuiMFC2");
 	amis::gui::dialogs::SkipDialog skip_dialog;
 	skip_dialog.initializeData(amis::dtb::DtbWithHooks::Instance()->getCustomTestSet());
-	skip_dialog.do_modal();
+	//skip_dialog.do_modal();
+	skip_dialog.DoModal();
 	amis::dtb::DtbWithHooks::Instance()->updateCustomTestStates();
 }
 

Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp	2008-03-03 00:59:30 UTC (rev 2375)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp	2008-03-03 01:08:39 UTC (rev 2376)
@@ -38,7 +38,12 @@
 amis::gui::dialogs::SkipDialogVoicing * mpSkipDialogVoicing = NULL;
 
 SkipDialog::SkipDialog(CWnd* pParent /*=NULL*/)
-	: AmisDialogBase(SkipDialog::IDD)
+	 
+#ifdef TESTING
+	 : CDialog(SkipDialog::IDD)
+#else
+	 : AmisDialogBase(SkipDialog::IDD)
+#endif
 {
 	
 	if (Preferences::Instance()->getIsSelfVoicing() == true)
@@ -63,7 +68,7 @@
 	{
 		return CDialog::PreTranslateMessage(pMsg);
 	}
-
+#ifndef TESTING
 	if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_KEYUP)
 	{
 		CWnd* cwnd = this->GetFocus();
@@ -81,6 +86,7 @@
 			}
 		}
 	}
+#endif
 	return CDialog::PreTranslateMessage(pMsg);
 }
 
@@ -172,9 +178,16 @@
 
 void SkipDialog::OnPaint() 
 {
+#ifdef TESTING
+	CDialog::OnPaint();
+	return;
+#endif
+
 	CPaintDC dc(this); // device context for painting
 	// Let the window do its default painting...
 	CWnd::DefWindowProc( WM_PAINT, (WPARAM)dc.m_hDC, 0 );
 	//call the base class on_paint function
+#ifndef TESTING
 	on_paint();
+#endif
 }
\ No newline at end of file


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