From 2899e2232750915f4ff37c0ac178fce1b5858fe0 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Sat, 31 Jul 1999 17:24:28 +0000 Subject: [PATCH] Compile fixes for wxTreeCtrl (we don't speak about linking or - dear - even running) distrib updates git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- distrib/msw/copy_src.bat | 89 ++++++++++++++++++++++++++++++++++++++- distrib/msw/tmake/g95.t | 5 +++ include/wx/msw/treectrl.h | 1 + src/msw/treectrl.cpp | 4 +- 4 files changed, 97 insertions(+), 2 deletions(-) diff --git a/distrib/msw/copy_src.bat b/distrib/msw/copy_src.bat index f804709bb1..15f2352211 100755 --- a/distrib/msw/copy_src.bat +++ b/distrib/msw/copy_src.bat @@ -1,5 +1,5 @@ echo -------- -echo This script will copy the wxMSW release files into ~/wxmsw_dist +echo This script will copy the wxMSW release files into \wxmsw_dist echo -------- echo @@ -149,6 +149,93 @@ md \wxmsw_dist\wxMSW\src\xpm copy *.* \wxmsw_dist\wxMSW\src\xpm cd .. +cd .. + +echo Utils dir.. + +cd utils +md \wxmsw_dist\wxMSW\utils + +echo wxGLCanvas.. + +cd glcanvas +md \wxmsw_dist\wxMSW\utils\glcanvas +copy .\docs\notes.txt \wxmsw_dist\wxMSW\utils\glcanvas\NOTES.txt + +md \wxmsw_dist\wxMSW\utils\glcanvas\win +copy .\win\glcanvas.cpp \wxmsw_dist\wxMSW\utils\glcanvas\win +copy .\win\glcanvas.h \wxmsw_dist\wxMSW\utils\glcanvas\win +copy .\win\makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\win + +md \wxmsw_dist\wxMSW\utils\glcanvas\samples +md \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube +md \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +md \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin + +cd samples\cube +copy Makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube +copy cube.rc \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube +copy cube.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube +copy cube.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube +copy mondrian.ico \wxmsw_dist\wxMSW\utils\glcanvas\samples\cube +cd .. + +cd isosurf +copy Makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +copy isosurf.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +copy isosurf.rc \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +copy isosurf.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +copy isosurf.dat.gz \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +copy mondrian.ico \wxmsw_dist\wxMSW\utils\glcanvas\samples\isosurf +cd .. + +cd penguin +copy Makefile.* \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy penguin.rc \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy penguin.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy penguin.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy trackball.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy trackball.c \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy lw.h \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy lw.cpp \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy penguin.lwo \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +copy mondrian.ico \wxmsw_dist\wxMSW\utils\glcanvas\samples\penguin +cd ..\..\.. + +echo DialogEd.. + +cd dialoged\src +md \wxmsw_dist\wxMSW\utils\dialoged +md \wxmsw_dist\wxMSW\utils\dialoged\src +copy Makefile.* \wxmsw_dist\wxMSW\utils\dialoged\src +copy dialoged.def \wxmsw_dist\wxMSW\utils\dialoged\src +copy dialoged.rc \wxmsw_dist\wxMSW\utils\dialoged\src +copy dialoged.ico \wxmsw_dist\wxMSW\utils\dialoged\src +copy dialoged.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy dlghndlr.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy edlist.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy edtree.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy reseditr.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy reswrite.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy symbtabl.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy winprop.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy winstyle.cpp \wxmsw_dist\wxMSW\utils\dialoged\src +copy dialoged.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy dlghndlr.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy edlist.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy edtree.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy reseditr.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy symbtabl.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy winprop.h \wxmsw_dist\wxMSW\utils\dialoged\src +copy winstyle.h \wxmsw_dist\wxMSW\utils\dialoged\src + +cd bitmaps +md \wxmsw_dist\wxMSW\utils\dialoged\src\bitmaps +copy *.bmp \wxmsw_dist\wxMSW\utils\dialoged\src\bitmaps +copy *.ico \wxmsw_dist\wxMSW\utils\dialoged\src\bitmaps +cd ..\..\.. + + cd .. echo Samples dir.. diff --git a/distrib/msw/tmake/g95.t b/distrib/msw/tmake/g95.t index bebd32bbff..d685da66fa 100644 --- a/distrib/msw/tmake/g95.t +++ b/distrib/msw/tmake/g95.t @@ -248,14 +248,19 @@ $(COMMDIR)/lex_yy.c: $(COMMDIR)/doslex.c clean: -erase *.o + -erase *.bak -erase core -erase ..\common\y_tab.c -erase ..\common\lex_yy.c -erase ..\common\*.o + -erase ..\common\*.bak -erase ..\generic\*.o + -erase ..\generic\*.bak -erase ..\html\*.o -erase ..\png\*.o + -erase ..\png\*.bak -erase ..\zlib\*.o + -erase ..\zlib\*.bak -erase ..\jpeg\*.o -erase ..\..\lib\libwx.a diff --git a/include/wx/msw/treectrl.h b/include/wx/msw/treectrl.h index 66871a4891..313018797d 100644 --- a/include/wx/msw/treectrl.h +++ b/include/wx/msw/treectrl.h @@ -21,6 +21,7 @@ #endif #include "wx/textctrl.h" +#include "wx/dynarray.h" #ifdef __GNUWIN32__ // Cygwin windows.h defines these identifiers diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp index c3eb0e1d4f..cd68918437 100644 --- a/src/msw/treectrl.cpp +++ b/src/msw/treectrl.cpp @@ -195,10 +195,12 @@ bool wxTreeCtrl::Create(wxWindow *parent, if ( m_windowStyle & wxTR_LINES_AT_ROOT ) wstyle |= TVS_LINESATROOT; +#ifndef __GNUWIN32__ // we emulate the multiple selection tree controls by using checkboxes: set // up the image list we need for this if we do have multiple selections if ( m_windowStyle & wxTR_MULTIPLE ) - wstyle |= TVS_CHECKBOXES; + wstyle |= TVS_CHECKBOXES; +#endif // Create the tree control. if ( !MSWCreateControl(WC_TREEVIEW, wstyle) )