--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-26  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/makefile.gnu: Tidy up.
+
+	* standalone/wxwin/splittree.cpp: Fix wxRemotelyScrolledTreeCtrl for
+	wxWindows 2.4.0 on Linux/GTK. Patch contributed by Julian Smart.
+
 2003-03-25  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/symbols.h,

--- a/host/tools/configtool/standalone/wxwin/makefile.gnu
+++ b/host/tools/configtool/standalone/wxwin/makefile.gnu
@@ -4,16 +4,15 @@
 
 # Usage:
 #   cd emptydir
-#   make -f /path/to/this/makefile WXDIR=/path/to/wx/installation ECOSSRCDIR=/path/to/ecos/tools/src OSTYPE=$OSTYPE
+#   make -f /path/to/this/makefile WXDIR=/path/to/wx/installation INSTALLDIR=/path/to/ecos/tools [ ECOSSRCDIR=/path/to/ecos/tools/src ] [ TCLDIR=/path/to/tcl/installation ] [ OSTYPE=cygwin ] [ DEBUG=1 ]
 
-TCLDIR=TCLDIR_not_defined
+INSTALLDIR=INSTALLDIR_not_defined
 WXDIR=WXDIR_not_defined
-ECOSSRCDIR=ECOSSRCDIR_not_defined
 
 CTBUILDDIR=$(shell pwd)
+ECOSSRCDIR=$(INSTALLDIR)/src
 CTDIR=$(ECOSSRCDIR)/tools/configtool/standalone/wxwin
-INSTALLDIR=$(ECOSSRCDIR)/..
-LEVEL=release
+TCLDIR=TCLDIR_use_system
 USEEXPERIMENTALCODE=1
 
 EXTRACPPFLAGS=\
@@ -37,10 +36,10 @@ else
   EXTRAOBJECTS=
 endif
 
-ifneq "$(LEVEL)" "debug"
+ifeq "$(DEBUG)" ""
   CPPDEBUGOPTIONS=-O2
 else
-  CPPDEBUGOPTIONS=-D__WXDEBUG__ -ggdb
+  CPPDEBUGOPTIONS=-ggdb
 endif
 
 OBJECTS = \

--- a/host/tools/configtool/standalone/wxwin/splittree.cpp
+++ b/host/tools/configtool/standalone/wxwin/splittree.cpp
@@ -78,9 +78,9 @@ END_EVENT_TABLE()
 wxRemotelyScrolledTreeCtrl::wxRemotelyScrolledTreeCtrl(wxWindow* parent, wxWindowID id, const wxPoint& pt,
                                                        const wxSize& sz, long style):
     wxTreeCtrl(parent, id, pt, sz, style
-#if wxVERSON_NUMBER > 2301
+#if wxVERSION_NUMBER > 2301
 	       & ~wxTR_ROW_LINES
-#endif	       
+#endif
 	       )
 {
     m_companionWindow = NULL;
@@ -115,7 +115,10 @@ void wxRemotelyScrolledTreeCtrl::SetScro
     if (IsKindOf(CLASSINFO(wxGenericTreeCtrl)))
     {
         wxGenericTreeCtrl* win = (wxGenericTreeCtrl*) this;
-        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, 0, noUnitsX, 0, xPos, 0, noRefresh);
+        // Pass TRUE for noRefresh so that it doesn't
+        // draw part of the tree as if the scroll view is
+        // at zero vertically.
+        win->wxGenericTreeCtrl::SetScrollbars(pixelsPerUnitX, pixelsPerUnitY, noUnitsX, 0, xPos, 0, /* noRefresh */ TRUE);
         
         ecScrolledWindow* scrolledWindow = GetScrolledWindow();
         if (scrolledWindow)