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 d219c90534b21916a22dfd939c4f290e05dda834..e762e88e84693d3b6405a720b7aa54cc09b0b300 100644 (file)
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -1163,6 +1163,17 @@ WXDWORD wxWindowMSW::MSWGetStyle(long flags, WXDWORD *exstyle) const
                 *exstyle |= WS_EX_DLGMODALFRAME;
                 break;
         }
                 *exstyle |= WS_EX_DLGMODALFRAME;
                 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;
     }
 
     return style;


@@ -3951,6 +3962,7 @@ void wxWindowMSW::InitMouseEvent(wxMouseEvent& event,
 
     event.SetTimestamp(s_currentMsg.time);
     event.m_eventObject = this;
 
     event.SetTimestamp(s_currentMsg.time);
     event.m_eventObject = this;

+    event.SetId(GetId());

 
 #if wxUSE_MOUSEEVENT_HACK
     m_lastMouseX = x;
 
 #if wxUSE_MOUSEEVENT_HACK
     m_lastMouseX = x;