From d25953f46e02a5330b8d3676f1666cf59a709a94 Mon Sep 17 00:00:00 2001 From: Christian List Date: Fri, 30 Apr 2004 15:51:27 +0000 Subject: [PATCH] PATCH: [ 941982 ] Fix VS6 compilation Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h --- Src/Common/MessageBoxDialog.cpp | 2 +- Src/Common/MessageBoxDialog.h | 2 +- Src/readme.txt | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Src/Common/MessageBoxDialog.cpp b/Src/Common/MessageBoxDialog.cpp index e51eeb2d8..1d28a5dfa 100644 --- a/Src/Common/MessageBoxDialog.cpp +++ b/Src/Common/MessageBoxDialog.cpp @@ -394,7 +394,7 @@ void CMessageBoxDialog::ResetMessageBoxes ( ) * displaying the dialog. Otherwise the message box will be displayed in * the normal way. */ -INT_PTR CMessageBoxDialog::DoModal ( ) +int CMessageBoxDialog::DoModal ( ) { // Check whether the result may be retrieved from the registry. if ( ( m_nStyle & MB_DONT_DISPLAY_AGAIN ) || diff --git a/Src/Common/MessageBoxDialog.h b/Src/Common/MessageBoxDialog.h index 5b40014ef..737d02171 100644 --- a/Src/Common/MessageBoxDialog.h +++ b/Src/Common/MessageBoxDialog.h @@ -159,7 +159,7 @@ public: // Methods for handling common window functions. // Method for displaying the dialog. - virtual INT_PTR DoModal ( ); + virtual int DoModal ( ); // Method for closing the dialog. void EndDialog ( int nResult ); diff --git a/Src/readme.txt b/Src/readme.txt index 4e00ef2a1..9cc5874fe 100644 --- a/Src/readme.txt +++ b/Src/readme.txt @@ -1,3 +1,7 @@ +2004-04-30 Christian + PATCH: [ 941982 ] Fix VS6 compilation + Src/Common: MessageBoxDialog.cpp MessageBoxDialog.h + 2004-04-29 Kimmo PATCH: [ 943149 ] Contributors fix Src: Merge.cpp Merge.rc -- 2.11.0