diff --git a/samples/help/demo.cpp b/samples/help/demo.cpp
index 210283ab95..2dc35fa01c 100644
--- a/samples/help/demo.cpp
+++ b/samples/help/demo.cpp
@@ -33,6 +33,10 @@
 #   include "wx/image.h"
 #   include "wx/help.h"
 
+#if wxUSE_TOOLTIPS
+#   include "wx/tooltip.h"
+#endif
+
 // define this to 1 to use HTML help even under Windows (by default, Windows
 // version will use WinHelp).
 // Please also see samples/html/helpview.
@@ -405,6 +409,8 @@ void MyFrame::OnContextHelp(wxHelpEvent& event)
     wxString msg;
     msg.Printf(wxT("We should now display help for window %d"), event.GetId());
     wxMessageBox(msg);
+    //wxToolTip::Enable(TRUE);
+    //SetToolTip(msg);
 }
 
 void MyFrame::OnHtmlHelp(wxCommandEvent& event)
diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index dbac074afc..014c0747bb 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2384,6 +2384,12 @@ bool wxWindow::MSWCreate(int id,
 
             return FALSE;
         }
+        if (extendedStyle != 0)
+        {
+            ::SetWindowLong(GetHwnd(), GWL_EXSTYLE, extendedStyle);
+            ::SetWindowPos(GetHwnd(), NULL, 0, 0, 0, 0,
+                SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE);
+        }
 
         // ::SetWindowLong(GWL_EXSTYLE) doesn't work for the dialogs, so try
         // to take care of (at least some) extended style flags ourselves