#include "wx/bookctrl.h"
#include "wx/scrolwin.h"
#include "wx/textwrapper.h"
+#include "wx/testing.h"
#if wxUSE_DISPLAY
#include "wx/display.h"
extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
+wxModalDialogHook *wxModalDialogHook::ms_instance = NULL;
+
// ----------------------------------------------------------------------------
// XTI
// ----------------------------------------------------------------------------
widthMax = wxSystemSettings::GetMetric( wxSYS_SCREEN_X ) - 25;
}
- // '&' is used as accel mnemonic prefix in the wxWidgets controls but in
- // the static messages created by CreateTextSizer() (used by wxMessageBox,
- // for example), we don't want this special meaning, so we need to quote it
- wxString text(message);
- text.Replace(wxT("&"), wxT("&&"));
-
- return wrapper.CreateSizer(text, widthMax);
+ return wrapper.CreateSizer(message, widthMax);
}
#endif // wxUSE_STATTEXT
bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
{
- // for most platforms, Esc key is used to close the dialogs
- return event.GetKeyCode() == WXK_ESCAPE &&
- event.GetModifiers() == wxMOD_NONE;
+ // For most platforms, Esc key is used to close the dialogs.
+ //
+ // Notice that we intentionally don't check for modifiers here, Shift-Esc,
+ // Alt-Esc and so on still close the dialog, typically.
+ return event.GetKeyCode() == WXK_ESCAPE;
}
void wxDialogBase::OnCharHook(wxKeyEvent& event)
{
- if ( event.GetKeyCode() == WXK_ESCAPE )
+ if ( IsEscapeKey(event) )
{
if ( SendCloseButtonClickEvent() )
{