diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 1f20d480b5..652c0392d8 100644
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -184,15 +184,15 @@ samples/makefile*
 samples/configure
 samples/configure.in
 
-samples/animate/*.cpp
-samples/animate/*.h
-samples/animate/*.def
-samples/animate/makefile*
-samples/animate/*.xbm
-samples/animate/*.xpm
-samples/animate/*.ico
-samples/animate/*.rc
-samples/animate/*.pro
+samples/access/*.cpp
+samples/access/*.h
+samples/access/*.def
+samples/access/makefile*
+samples/access/*.xbm
+samples/access/*.xpm
+samples/access/*.ico
+samples/access/*.rc
+samples/access/*.pro
 
 samples/artprov/*.cpp
 samples/artprov/*.h
@@ -296,6 +296,19 @@ samples/dialup/*.ico
 samples/dialup/*.txt
 samples/dialup/*.pro
 
+samples/display/*.cpp
+samples/display/*.h
+samples/display/makefile*
+samples/display/*.rc
+samples/display/*.def
+samples/display/*.bmp
+samples/display/*.xpm
+samples/display/*.xbm
+samples/display/*.png
+samples/display/*.ico
+samples/display/*.txt
+samples/display/*.pro
+
 samples/db/*.cpp
 samples/db/*.h
 samples/db/*.def
diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 39adcbbb59..72e01745ed 100644
--- a/distrib/msw/makefile.rsp
+++ b/distrib/msw/makefile.rsp
@@ -2,6 +2,7 @@ Makefile.in
 src/regex/Makefile.in
 locale/Makefile
 samples/Makefile.in
+samples/access/Makefile.in
 samples/artprov/Makefile.in
 samples/calendar/Makefile.in
 samples/caret/Makefile.in
@@ -68,6 +69,7 @@ samples/typetest/Makefile.in
 samples/validate/Makefile.in
 samples/wizard/Makefile.in
 samples/dialup/Makefile.in
+samples/display/Makefile.in
 samples/font/Makefile.in
 samples/menu/Makefile.in
 samples/memcheck/Makefile.in
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index 032eee584e..5913b441de 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -255,6 +255,7 @@ xpmdecod.cpp	Common
 zipstrm.cpp	Common	Base
 zstream.cpp	Common	Base
 
+access.cpp	MSW
 gsocket.c	MSW	Socket,Base
 gsockmsw.c	MSW	Socket,Base
 accel.cpp	MSW
@@ -754,6 +755,7 @@ htmprint.cpp	HTML
 
 arrimpl.cpp	WXH	Base
 listimpl.cpp	WXH	Base
+access.h	WXH
 accel.h	WXH
 access.h	WXH
 app.h	WXH	Base
@@ -1257,6 +1259,7 @@ region.h	MGLH
 toplevel.h	MGLH
 window.h	MGLH
 
+access.h	MSWH
 accel.h	MSWH
 app.h	MSWH
 bitmap.h	MSWH
diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 4da35d8d9f..c9cc4f8cdf 100644
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -22,6 +22,9 @@ src/regex/regex.dsw
 
 samples/samples.dsw
 
+samples/access/access.dsp
+samples/access/access.dsw
+
 samples/artprov/artprov.dsp
 samples/artprov/artprov.dsw
 
@@ -57,6 +60,9 @@ samples/dialogs/dialogsUniv.dsw
 samples/dialup/dialup.dsp
 samples/dialup/dialup.dsw
 
+samples/display/display.dsp
+samples/display/display.dsw
+
 samples/dnd/dnd.dsp
 samples/dnd/dnd.dsw
 
diff --git a/docs/changes.txt b/docs/changes.txt
index 7e7e6f3d6b..7c1c1ce7e4 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -92,7 +92,7 @@ wxMSW:
 - fixed wxStaticText best size calculation (was wrong by '&' width)
 - fixed calling wxFrame::Maximize(FALSE) before the window is shown
 
-wxMotif
+wxMotif:
 
 - made wxFileDialog behaviour with complex wildcards more sensible (it still
   does not support all the features other ports do); refer to wxFileDialog
@@ -103,6 +103,11 @@ wxMotif
   with Motif 1.x compatibility
 - implemented wxToggleButton
 
+wxUniv:
+
+- Controls in toolbars now supported.
+
+
 OLD CHANGES
 ===========
 
diff --git a/include/wx/window.h b/include/wx/window.h
index 398d332d46..ce771ed7d2 100644
--- a/include/wx/window.h
+++ b/include/wx/window.h
@@ -1213,7 +1213,7 @@ inline int NewControlId() { return wxWindowBase::NewControlId(); }
 class WXDLLEXPORT wxWindowAccessible: public wxAccessible
 {
 public:
-    wxWindowAccessible(wxWindow* win): wxAccessible(win) {}
+    wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); }
     virtual ~wxWindowAccessible() {};
 
 // Overridables