[Winmerge-svn] SF.net SVN: winmerge: [3565] trunk/Src

[<ki...@us...>]

Revision: 3565
          http://svn.sourceforge.net/winmerge/?rev=3565&view=rev
Author:   kimmov
Date:     2006-09-15 13:55:54 -0700 (Fri, 15 Sep 2006)

Log Message:
-----------
PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/Common/MessageBoxDialog.cpp
    trunk/Src/Common/MessageBoxDialog.h

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-09-15 20:43:06 UTC (rev 3564)
+++ trunk/Src/Changes.txt	2006-09-15 20:55:54 UTC (rev 3565)
@@ -5,6 +5,8 @@
 2006-09-15 Kimmo
  BUG: [ 1558839 ] ShellExtension does not compile as 64-bit
   ShellExtension: WinMergeShell.cpp WinMergeShell.h
+ PATCH: [ 1558893 ] Fix incompatible prototype in MessageBoxDialog
+  Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h
 
 2006-09-13 Kimmo
  BUG: [ 1547247 ] WinMerge ANSI target does not compile with VS2005

Modified: trunk/Src/Common/MessageBoxDialog.cpp
===================================================================
--- trunk/Src/Common/MessageBoxDialog.cpp	2006-09-15 20:43:06 UTC (rev 3564)
+++ trunk/Src/Common/MessageBoxDialog.cpp	2006-09-15 20:55:54 UTC (rev 3565)
@@ -394,7 +394,7 @@
  *	displaying the dialog. Otherwise the message box will be displayed in
  *	the normal way.
  */
-int CMessageBoxDialog::DoModal ( )
+INT_PTR CMessageBoxDialog::DoModal ( )
 {
 	// Check whether the result may be retrieved from the registry.
 	if ( ( m_nStyle & MB_DONT_DISPLAY_AGAIN ) ||

Modified: trunk/Src/Common/MessageBoxDialog.h
===================================================================
--- trunk/Src/Common/MessageBoxDialog.h	2006-09-15 20:43:06 UTC (rev 3564)
+++ trunk/Src/Common/MessageBoxDialog.h	2006-09-15 20:55:54 UTC (rev 3565)
@@ -159,7 +159,7 @@
 	// Methods for handling common window functions.
 
 	// Method for displaying the dialog.
-	virtual int DoModal ( );
+	virtual INT_PTR DoModal ( );
 
 	// Method for closing the dialog.
 	void EndDialog ( int nResult );


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