don't include winsock.h directly, this doesn't work (patch 565655)

[wxWidgets.git] / src / msw / window.cpp

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 001ff1f48b4599108d86bc68f6dc2c37bcbf9a24..e762e88e84693d3b6405a720b7aa54cc09b0b300 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1164,10 +1164,16 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 break;
         }
 
+        // to make the dialog navigation work with the nested panels we must
+        // use this style but, unfortunately, it hangs NT4 in some situations
+        // so we shouldn't use it -- even though it means that keyboard accels
+        // in, e.g. wxWizard, don't work
+#if 0
         if ( flags & wxTAB_TRAVERSAL )
         {
             *exstyle |= WS_EX_CONTROLPARENT;
         }
+#endif // 0
     }
 
     return style;