remove unnecessary include of wx/cairo.h

[wxWidgets.git] / src / common / dlgcmn.cpp

diff --git a/src/common/dlgcmn.cpp b/src/common/dlgcmn.cpp
index d95dafd786f832ecaee0351a8096f8840e7a2c0e..9289aa2d583fa882b8624d34fbd8e3210d2de9f5 100644 (file)
--- a/src/common/dlgcmn.cpp
+++ b/src/common/dlgcmn.cpp
@@ -43,6 +43,7 @@
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
 #include "wx/textwrapper.h"
 #include "wx/bookctrl.h"
 #include "wx/scrolwin.h"
 #include "wx/textwrapper.h"

+#include "wx/testing.h"

 
 #if wxUSE_DISPLAY
 #include "wx/display.h"
 
 #if wxUSE_DISPLAY
 #include "wx/display.h"


@@ -50,6 +51,8 @@
 
 extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
 
 
 extern WXDLLEXPORT_DATA(const char) wxDialogNameStr[] = "dialog";
 

+wxModalDialogHook *wxModalDialogHook::ms_instance = NULL;
+

 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // XTI
 // ----------------------------------------------------------------------------


@@ -461,14 +464,16 @@ bool wxDialogBase::SendCloseButtonClickEvent()
 
 bool wxDialogBase::IsEscapeKey(const wxKeyEvent& event)
 {
 
 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)
 {
 }
 
 void wxDialogBase::OnCharHook(wxKeyEvent& event)
 {

-    if ( event.GetKeyCode() == WXK_ESCAPE )
+    if ( IsEscapeKey(event) )

     {
         if ( SendCloseButtonClickEvent() )
         {
     {
         if ( SendCloseButtonClickEvent() )
         {