don't use hook code for positioning message box under WinCE, it doesn't compile there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52056 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -20,11 +20,21 @@
|
|||||||
|
|
||||||
#include "wx/msgdlg.h"
|
#include "wx/msgdlg.h"
|
||||||
|
|
||||||
|
// there is no hook support under CE so we can't use the code for message box
|
||||||
|
// positioning there
|
||||||
|
#ifndef __WXWINCE__
|
||||||
|
#define wxUSE_MSGBOX_HOOK 1
|
||||||
|
#else
|
||||||
|
#define wxUSE_MSGBOX_HOOK 0
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef WX_PRECOMP
|
#ifndef WX_PRECOMP
|
||||||
#include "wx/app.h"
|
#include "wx/app.h"
|
||||||
#include "wx/utils.h"
|
#include "wx/utils.h"
|
||||||
#include "wx/dialog.h"
|
#include "wx/dialog.h"
|
||||||
#include "wx/hashmap.h"
|
#if wxUSE_MSGBOX_HOOK
|
||||||
|
#include "wx/hashmap.h"
|
||||||
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "wx/msw/private.h"
|
#include "wx/msw/private.h"
|
||||||
@@ -36,6 +46,8 @@
|
|||||||
|
|
||||||
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
|
IMPLEMENT_CLASS(wxMessageDialog, wxDialog)
|
||||||
|
|
||||||
|
#if wxUSE_MSGBOX_HOOK
|
||||||
|
|
||||||
// there can potentially be one message box per thread so we use a hash map
|
// there can potentially be one message box per thread so we use a hash map
|
||||||
// with thread ids as keys and (currently shown) message boxes as values
|
// with thread ids as keys and (currently shown) message boxes as values
|
||||||
//
|
//
|
||||||
@@ -95,6 +107,9 @@ wxMessageDialog::HookFunction(int code, WXWPARAM wParam, WXLPARAM lParam)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif // wxUSE_MSGBOX_HOOK
|
||||||
|
|
||||||
|
|
||||||
int wxMessageDialog::ShowModal()
|
int wxMessageDialog::ShowModal()
|
||||||
{
|
{
|
||||||
if ( !wxTheApp->GetTopWindow() )
|
if ( !wxTheApp->GetTopWindow() )
|
||||||
@@ -170,6 +185,7 @@ int wxMessageDialog::ShowModal()
|
|||||||
}
|
}
|
||||||
#endif // wxUSE_UNICODE
|
#endif // wxUSE_UNICODE
|
||||||
|
|
||||||
|
#if wxUSE_MSGBOX_HOOK
|
||||||
// install the hook if we need to position the dialog in a non-default way
|
// install the hook if we need to position the dialog in a non-default way
|
||||||
if ( wxStyle & wxCENTER )
|
if ( wxStyle & wxCENTER )
|
||||||
{
|
{
|
||||||
@@ -178,6 +194,7 @@ int wxMessageDialog::ShowModal()
|
|||||||
&wxMessageDialog::HookFunction, NULL, tid);
|
&wxMessageDialog::HookFunction, NULL, tid);
|
||||||
HookMap()[tid] = this;
|
HookMap()[tid] = this;
|
||||||
}
|
}
|
||||||
|
#endif // wxUSE_MSGBOX_HOOK
|
||||||
|
|
||||||
// do show the dialog
|
// do show the dialog
|
||||||
int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);
|
int msAns = MessageBox(hWnd, message.wx_str(), m_caption.wx_str(), msStyle);
|
||||||
|
Reference in New Issue
Block a user