X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/254fbd140e67b60f46d7380c6ac242110ddd7585..d6b47de61b0a03dd31d582b37a9d45f99ec1a245:/src/msw/notebook.cpp

diff --git a/src/msw/notebook.cpp b/src/msw/notebook.cpp
index e5b6a4c85a..925dee0c9a 100644
--- a/src/msw/notebook.cpp
+++ b/src/msw/notebook.cpp
@@ -42,13 +42,7 @@
 
 #include  <windowsx.h>
 
-#ifdef __GNUWIN32_OLD__
-    #include "wx/msw/gnuwin32/extra.h"
-#endif
-
-#if !(defined(__GNUWIN32_OLD__) && !defined(__CYGWIN10__))
-    #include <commctrl.h>
-#endif
+#include <commctrl.h>
 
 #include "wx/msw/winundef.h"
 
@@ -970,8 +964,9 @@ void wxNotebook::OnNavigationKey(wxNavigationKeyEvent& event)
         //
         wxWindow * const parent = GetParent();
 
-        const bool isFromParent = event.GetEventObject() == parent;
-        const bool isFromSelf = event.GetEventObject() == this;
+        // the wxObject* casts are required to avoid MinGW GCC 2.95.3 ICE
+        const bool isFromParent = event.GetEventObject() == (wxObject*) parent;
+        const bool isFromSelf = event.GetEventObject() == (wxObject*) this;
 
         if ( isFromParent || isFromSelf )
         {