X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7d616e99ed03d6bcefea61cf099b6bdb3f3457d4..e340b786a8830d79beac196f452f1380143e5df7:/src/generic/scrlwing.cpp

diff --git a/src/generic/scrlwing.cpp b/src/generic/scrlwing.cpp
index 9b69452533..00dac29274 100644
--- a/src/generic/scrlwing.cpp
+++ b/src/generic/scrlwing.cpp
@@ -25,10 +25,6 @@
     #pragma hdrstop
 #endif
 
-#ifdef __VMS
-#define XtDisplay XTDISPLAY
-#endif
-
 #include "wx/scrolwin.h"
 
 #ifndef WX_PRECOMP
@@ -1342,7 +1338,8 @@ void wxScrollHelper::HandleOnChildFocus(wxChildFocusEvent& event)
     while ( win->GetParent() != m_targetWindow )
     {
         win = win->GetParent();
-        wxCHECK_RET( win, "incorrectly sent wxChildFocusEvent - not our child" );
+        if ( !win )
+            return; // event is not from a child of the target window
     }
 
     // if the child is not fully visible, try to scroll it into view: