Added display sample to distrib file lists

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19385 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 1f20d480b555904c64becaf9ce08eef45731c67e..652c0392d84c3560ed74fee55dc99a08fe794c34 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -184,15 +184,15 @@ samples/makefile*
 samples/configure
 samples/configure.in
 
 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
 
 samples/artprov/*.cpp
 samples/artprov/*.h


@@ -296,6 +296,19 @@ samples/dialup/*.ico
 samples/dialup/*.txt
 samples/dialup/*.pro
 
 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
 samples/db/*.cpp
 samples/db/*.h
 samples/db/*.def

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
index 39adcbbb5939569eefe8ae014d0293641897f3c2..72e01745ed5f5c454894d62c114fc167d92284b1 100644 (file)
--- 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
 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
 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/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
 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 032eee584e105eebb47be686817eb25bca72644b..5913b441dea341992d5b9350afd937dfde5de0aa 100644 (file)
--- 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
 
 zipstrm.cpp    Common  Base
 zstream.cpp    Common  Base
 

+access.cpp     MSW

 gsocket.c      MSW     Socket,Base
 gsockmsw.c     MSW     Socket,Base
 accel.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
 
 arrimpl.cpp    WXH     Base
 listimpl.cpp   WXH     Base

+access.h       WXH

 accel.h        WXH
 access.h       WXH
 app.h  WXH     Base
 accel.h        WXH
 access.h       WXH
 app.h  WXH     Base


@@ -1257,6 +1259,7 @@ region.h  MGLH
 toplevel.h     MGLH
 window.h       MGLH
 
 toplevel.h     MGLH
 window.h       MGLH
 

+access.h       MSWH

 accel.h        MSWH
 app.h  MSWH
 bitmap.h       MSWH
 accel.h        MSWH
 app.h  MSWH
 bitmap.h       MSWH

diff --git a/distrib/msw/vc.rsp b/distrib/msw/vc.rsp
index 4da35d8d9f14a724e250aaca0cf79b847ea0fad0..c9cc4f8cdfd5833596214db51364ca91e6abe7dd 100644 (file)
--- a/distrib/msw/vc.rsp
+++ b/distrib/msw/vc.rsp
@@ -22,6 +22,9 @@ src/regex/regex.dsw
 
 samples/samples.dsw
 
 
 samples/samples.dsw
 

+samples/access/access.dsp
+samples/access/access.dsw
+

 samples/artprov/artprov.dsp
 samples/artprov/artprov.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/dialup/dialup.dsp
 samples/dialup/dialup.dsw
 

+samples/display/display.dsp
+samples/display/display.dsw
+

 samples/dnd/dnd.dsp
 samples/dnd/dnd.dsw
 
 samples/dnd/dnd.dsp
 samples/dnd/dnd.dsw
 

diff --git a/docs/changes.txt b/docs/changes.txt
index 7e7e6f3d6b009cfad74f6616e89bd18fa2bb7b5b..7c1c1ce7e4d54b2db13cc656e2272bcfba3b9c2d 100644 (file)
--- 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
 
 - 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
 
 - 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
 
   with Motif 1.x compatibility
 - implemented wxToggleButton
 

+wxUniv:
+
+- Controls in toolbars now supported.
+
+

 OLD CHANGES
 ===========
 
 OLD CHANGES
 ===========
 

diff --git a/include/wx/window.h b/include/wx/window.h
index 398d332d46e9495f15ebba778ab7b1cc45647c3d..ce771ed7d288fa9c8e91de3b32261091c48f7ba4 100644 (file)
--- 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:
 class WXDLLEXPORT wxWindowAccessible: public wxAccessible
 {
 public:

-    wxWindowAccessible(wxWindow* win): wxAccessible(win) {}
+    wxWindowAccessible(wxWindow* win): wxAccessible(win) { if (win) win->SetAccessible(this); }

     virtual ~wxWindowAccessible() {};
 
 // Overridables
     virtual ~wxWindowAccessible() {};
 
 // Overridables