Small changes

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

diff --git a/distrib/msw/generic.rsp b/distrib/msw/generic.rsp
index 8c108c03d62e6366f42387550449801bef8090ae..e8e34f79ac8c483f3951ed1e6d1f7d68c193aca3 100644 (file)
--- a/distrib/msw/generic.rsp
+++ b/distrib/msw/generic.rsp
@@ -311,6 +311,7 @@ samples/mdi/bitmaps/*.xbm
 samples/minimal/*.cpp
 samples/minimal/*.h
 samples/minimal/*.def
 samples/minimal/*.cpp
 samples/minimal/*.h
 samples/minimal/*.def

+samples/minimal/Makefile.in

 samples/minimal/makefile*
 samples/minimal/*.xbm
 samples/minimal/*.xpm
 samples/minimal/makefile*
 samples/minimal/*.xbm
 samples/minimal/*.xpm

diff --git a/distrib/msw/makefile.rsp b/distrib/msw/makefile.rsp
new file mode 100644 (file)
index 0000000..5ea9d41
--- /dev/null
+++ b/distrib/msw/makefile.rsp
@@ -0,0 +1,43 @@
+samples/bombs/Makefile.in
+samples/checklst/Makefile.in
+samples/config/Makefile.in
+samples/controls/Makefile.in
+samples/db/Makefile.in
+samples/dde/Makefile.in
+samples/dialogs/Makefile.in
+samples/dnd/Makefile.in
+samples/docview/Makefile.in
+samples/docvwmdi/Makefile.in
+samples/dynamic/Makefile.in
+samples/forty/Makefile.in
+samples/fractal/Makefile.in
+samples/grid/Makefile.in
+samples/help/Makefile.in
+samples/image/Makefile.in
+samples/internat/Makefile.in
+samples/layout/Makefile.in
+samples/listctrl/Makefile.in
+samples/mdi/Makefile.in
+samples/memcheck/Makefile.in
+samples/minifram/Makefile.in
+samples/minimal/Makefile.in
+samples/notebook/Makefile.in
+samples/png/Makefile.in
+samples/printing/Makefile.in
+samples/proplist/Makefile.in
+samples/resource/Makefile.in
+samples/sashtest/Makefile.in
+samples/splitter/Makefile.in
+samples/tab/Makefile.in
+samples/thread/Makefile.in
+samples/toolbar/Makefile.in
+samples/treectrl/Makefile.in
+samples/typetest/Makefile.in
+samples/validate/Makefile.in
+samples/wxpoem/Makefile.in
+samples/wxsocket/Makefile.in
+src/Makefile.in
+utils/ogl/samples/ogledit/Makefile.in
+utils/ogl/samples/studio/Makefile.in
+utils/ogl/src/Makefile.in
+

diff --git a/distrib/msw/tardist b/distrib/msw/tardist
index 44062e55a7c7726fe603dc13608e80bd1bc0b5e7..5d1b17da2862f084e7d0a0da6f53ea243826023a 100644 (file)
--- a/distrib/msw/tardist
+++ b/distrib/msw/tardist
@@ -33,19 +33,19 @@ rm -f $2/glcanvas.tar.gz
 echo Tarring...
 
 ### Generic
 echo Tarring...
 
 ### Generic

-ls `cat $1/distrib/msw/generic.rsp` > /tmp/wxgen.txt
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgen.txt

 tar cvf $2/wx200gen.tar -T /tmp/wxgen.txt
 gzip $2/wx200gen.tar
 mv $2/wx200gen.tar.gz $2/wx200gen.tgz
 
 ### wxGTK
 tar cvf $2/wx200gen.tar -T /tmp/wxgen.txt
 gzip $2/wx200gen.tar
 mv $2/wx200gen.tar.gz $2/wx200gen.tgz
 
 ### wxGTK

-ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp` > /tmp/wxgtk.txt
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/gtk.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxgtk.txt

 tar cvf $2/wx200gtk.tar -T /tmp/wxgtk.txt
 gzip $2/wx200gtk.tar
 mv $2/wx200gtk.tar.gz $2/wx200gtk.tgz
 
 ### wxMotif
 tar cvf $2/wx200gtk.tar -T /tmp/wxgtk.txt
 gzip $2/wx200gtk.tar
 mv $2/wx200gtk.tar.gz $2/wx200gtk.tgz
 
 ### wxMotif

-ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp` > /tmp/wxmotif.txt
+ls `cat $1/distrib/msw/generic.rsp $1/distrib/msw/motif.rsp $1/distrib/msw/makefile.rsp` > /tmp/wxmotif.txt

 tar cvf $2/wx200mot.tar -T /tmp/wxmotif.txt
 gzip $2/wx200mot.tar
 mv $2/wx200mot.tar.gz $2/wx200mot.tgz
 tar cvf $2/wx200mot.tar -T /tmp/wxmotif.txt
 gzip $2/wx200mot.tar
 mv $2/wx200mot.tar.gz $2/wx200mot.tgz

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index 7b251945a5dd7ef14e88c349e4f41429c5ba5e4a..cefcaf86fd954d9d74a94f419f0dbd32316e8f92 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -351,9 +351,9 @@ the front when the dialog box is popped up.
 
 \membersection{::wxFileSelector}\label{wxfileselector}
 
 
 \membersection{::wxFileSelector}\label{wxfileselector}
 

-\func{wxString}{wxFileSelector}{\param{const wxString\& }{message}, \param{const wxString\& }{default\_path = NULL},\\
-  \param{const wxString\& }{default\_filename = NULL}, \param{const wxString\& }{default\_extension = NULL},\\
-  \param{const wxString\& }{wildcard = ``*.*''}, \param{int }{flags = 0}, \param{wxWindow *}{parent = NULL},\\
+\func{wxString}{wxFileSelector}{\param{const wxString\& }{message}, \param{const wxString\& }{default\_path = ""},\\
+  \param{const wxString\& }{default\_filename = ""}, \param{const wxString\& }{default\_extension = ""},\\
+  \param{const wxString\& }{wildcard = ``*.*''}, \param{int }{flags = 0}, \param{wxWindow *}{parent = ""},\\

   \param{int}{ x = -1}, \param{int}{ y = -1}}
 
 Pops up a file selector box. In Windows, this is the common file selector
   \param{int}{ x = -1}, \param{int}{ y = -1}}
 
 Pops up a file selector box. In Windows, this is the common file selector


@@ -384,7 +384,7 @@ The application must check for a NULL return value (the user pressed
 Cancel). For example:
 
 \begin{verbatim}
 Cancel). For example:
 
 \begin{verbatim}

-const wxString\& s = wxFileSelector("Choose a file to open");
+const wxString& s = wxFileSelector("Choose a file to open");

 if (s)
 {
   ...
 if (s)
 {
   ...

diff --git a/docs/motif/install.txt b/docs/motif/install.txt
index 59b5efa404cb0ddb2198e10b20c989f14d1afba3..e59a709afbd63df52f661f94cdd64890c42c8a00 100644 (file)
--- a/docs/motif/install.txt
+++ b/docs/motif/install.txt
@@ -72,6 +72,9 @@ COMPILING USING CONFIGURE
   either edit the makefile to hard-wire the flags, or place wx-config
   where it will be found by the makefile.
 
   either edit the makefile to hard-wire the flags, or place wx-config
   where it will be found by the makefile.
 

+- If switching between wxMotif and wxGTK, you should remove the
+  config.cache file manually before running configure again.
+

 COMPILING USING MAKEFILES
 =========================
 
 COMPILING USING MAKEFILES
 =========================
 

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index 11547d87e62d273e02f0ade3f89a1c41efa766ea..061374546bba7d5291ce30a3a048fb62f64fa4fb 100644 (file)
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -140,7 +140,8 @@ bool wxTreeCtrl::Create(wxWindow *parent, wxWindowID id,
 
     m_windowId = (id == -1) ? NewControlId() : id;
 
 
     m_windowId = (id == -1) ? NewControlId() : id;
 

-    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES;
+    DWORD wstyle = WS_VISIBLE | WS_CHILD | WS_TABSTOP | TVS_HASLINES | TVS_SHOWSELALWAYS ;
+

 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;
 
     bool want3D;
     WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D) ;