--- a/host/tools/configtool/ChangeLog
+++ b/host/tools/configtool/ChangeLog
@@ -1,3 +1,15 @@
+2003-05-14  John Dallaway  <jld@ecoscentric.com>
+
+	* standalone/wxwin/admindlg.cpp,
+	  standalone/wxwin/buildoptionsdlg.cpp,
+	  standalone/wxwin/configtool.cpp,
+	  standalone/wxwin/configtoolview.cpp,
+	  standalone/wxwin/pacakgesdlg.cpp,
+	  standalone/wxwin/runtestsdlg.cpp: Minor changes to allow building
+	against current wxWindows CVS sources. [ contributed by Julian Smart ]
+
+	* standalone/wxwin/makefile.gnu: Remove msgdlgex.cpp from the build.
+
 2003-05-02  John Dallaway  <jld@ecoscentric.com>
 
 	* standalone/wxwin/appsettings.cpp: Don't use "." in the PATH to

--- a/host/tools/configtool/standalone/wxwin/admindlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/admindlg.cpp
@@ -343,7 +343,7 @@ void ecAdminDialog::OnRemove(wxCommandEv
     {
         // remove the version node
         
-        const wxTreeItemId hParentItem = treeCtrl->GetParent (hTreeItem);
+        const wxTreeItemId hParentItem = treeCtrl->GetItemParent (hTreeItem);
         wxASSERT (hParentItem && hParentItem.IsOk() );
         if (RemovePackageVersion (hTreeItem) && ! treeCtrl->ItemHasChildren (hParentItem)) // if the only version was deleted
         {
@@ -386,7 +386,7 @@ bool ecAdminDialog::RemovePackageVersion
 {
     wxTreeCtrl* treeCtrl = (wxTreeCtrl*) FindWindow( ecID_ADMIN_DIALOG_TREE) ;
 
-    const wxTreeItemId hParentItem = treeCtrl->GetParent (hTreeItem);
+    const wxTreeItemId hParentItem = treeCtrl->GetItemParent (hTreeItem);
     wxASSERT (hParentItem);
 
     ecAdminItemData* data = (ecAdminItemData*) treeCtrl->GetItemData (hParentItem);

--- a/host/tools/configtool/standalone/wxwin/buildoptionsdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/buildoptionsdlg.cpp
@@ -318,7 +318,7 @@ void ecBuildOptionsDialog::Redisplay (wx
     wxListBox* listBox = (wxListBox*) FindWindow( ecID_BUILD_OPTIONS_FLAGS );
     
     wxString strEdit;
-    bool bRedraw=(listBox->Number() != ar.GetCount());
+    bool bRedraw=(listBox->GetCount() != ar.GetCount());
     if(!bRedraw)
     {
         for(int i=0;i<ar.GetCount();i++){

--- a/host/tools/configtool/standalone/wxwin/configtool.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtool.cpp
@@ -581,7 +581,7 @@ bool ecApp::LoadBitmapResource(wxBitmap&
         wxInputStream* stream = file->GetStream();
         
         wxImage image(* stream, bitmapType);
-        bitmap = image.ConvertToBitmap();
+        bitmap = wxBitmap(image);
         
         delete file;
     }

--- a/host/tools/configtool/standalone/wxwin/configtoolview.cpp
+++ b/host/tools/configtool/standalone/wxwin/configtoolview.cpp
@@ -469,7 +469,7 @@ ecConfigItem *ecConfigToolView::DoFind(c
         if (0==hv)
         {
             // we want to record the highest unexpanded item
-            for(hv=wxGetApp().GetTreeCtrl()->GetParent(h);hv;hv=wxGetApp().GetTreeCtrl()->GetParent(hv))
+            for(hv=wxGetApp().GetTreeCtrl()->GetItemParent(h);hv;hv=wxGetApp().GetTreeCtrl()->GetItemParent(hv))
             {
                 if (!wxGetApp().GetTreeCtrl()->IsExpanded( hv))
                 {

--- a/host/tools/configtool/standalone/wxwin/makefile.gnu
+++ b/host/tools/configtool/standalone/wxwin/makefile.gnu
@@ -79,7 +79,6 @@ OBJECTS = \
  $(CTBUILDDIR)/licensedlg.o \
  $(CTBUILDDIR)/mainwin.o \
  $(CTBUILDDIR)/mltwin.o \
- $(CTBUILDDIR)/msgdlgex.o \
  $(CTBUILDDIR)/outputwin.o \
  $(CTBUILDDIR)/packagesdlg.o \
  $(CTBUILDDIR)/platformeditordlg.o \
@@ -193,9 +192,6 @@ clean:
 $(CTBUILDDIR)/mltwin.o: $(CTDIR)/mltwin.cpp $(CTDIR)/mltwin.h
 	$(CC) $(CPPDEBUGOPTIONS) -c $(EXTRACPPFLAGS) $(CPPFLAGS) -o $@ $<
 
-$(CTBUILDDIR)/msgdlgex.o: $(CTDIR)/msgdlgex.cpp $(CTDIR)/msgdlgex.h
-	$(CC) $(CPPDEBUGOPTIONS) -c $(EXTRACPPFLAGS) $(CPPFLAGS) -o $@ $<
-
 $(CTBUILDDIR)/outputwin.o: $(CTDIR)/outputwin.cpp $(CTDIR)/outputwin.h
 	$(CC) $(CPPDEBUGOPTIONS) -c $(EXTRACPPFLAGS) $(CPPFLAGS) -o $@ $<
 

--- a/host/tools/configtool/standalone/wxwin/packagesdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/packagesdlg.cpp
@@ -765,7 +765,7 @@ bool ecPackagesDialog::IsAdded(const wxS
 static int ecPositionInStringList(const wxStringList& list, const wxString& item)
 {
     int i;
-    for (i = 0 ; i < list.Number(); i++)
+    for (i = 0 ; i < list.GetCount(); i++)
         if (list[i] == item)
             return i;
         else
@@ -1070,7 +1070,7 @@ void ecPackagesDialog::UpdateAddRemoveBu
 void ecPackagesDialog::ClearSelections(wxListBox& lbox)
 {
     int i;
-    for (i = 0; i < lbox.Number(); i++)
+    for (i = 0; i < lbox.GetCount(); i++)
     {
         lbox.Deselect(i);
     }

--- a/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
+++ b/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp
@@ -650,7 +650,7 @@ void ecRunTestsDialog::Populate(const wx
 
     checkListBox->Append(test);
     if (select)
-        checkListBox->Check(checkListBox->Number() - 1, TRUE);
+        checkListBox->Check(checkListBox->GetCount() - 1, TRUE);
 }
 
 
@@ -737,7 +737,7 @@ void ecRunTestsExecutablesDialog::OnChec
         return;
 
     int i;
-    int n = checkList->Number();
+    int n = checkList->GetCount();
     for (i = 0; i < n; i++)
         checkList->Check(i, TRUE);
 }
@@ -749,7 +749,7 @@ void ecRunTestsExecutablesDialog::OnUnch
         return;
 
     int i;
-    int n = checkList->Number();
+    int n = checkList->GetCount();
     for (i = 0; i < n; i++)
         checkList->Check(i, FALSE);
 }
@@ -784,7 +784,7 @@ void ecRunTestsExecutablesDialog::OnAdd(
             if (-1 == checkList->FindString(paths[i]))
             {
                 checkList->Append(paths[i]);
-                checkList->Check(checkList->Number()-1, TRUE);
+                checkList->Check(checkList->GetCount()-1, TRUE);
             }
             else
                 err = TRUE;
@@ -855,7 +855,7 @@ void ecRunTestsExecutablesDialog::AddFro
             if (-1 == checkList->FindString(path))
             {
                 checkList->Append(path);
-                checkList->Check(checkList->Number()-1, TRUE);
+                checkList->Check(checkList->GetCount()-1, TRUE);
             }       
             
             success = dir.GetNext(& filename);
@@ -922,7 +922,7 @@ void ecRunTestsExecutablesDialog::OnUpda
         return;
 
     // If there were no unchecked items, we can disable the check all button
-    event.Enable( checkList->Number() != SelectedTestCount() );
+    event.Enable( checkList->GetCount() != SelectedTestCount() );
 }
 
 void ecRunTestsExecutablesDialog::OnUpdateUncheckAll(wxUpdateUIEvent& event)
@@ -938,7 +938,7 @@ int ecRunTestsExecutablesDialog::Selecte
 
     int selCount = 0;
     int i;
-    int n = checkList->Number();
+    int n = checkList->GetCount();
     for (i = 0; i < n; i++)
     {
         if (checkList->IsChecked(i))
@@ -957,7 +957,7 @@ wxString ecRunTestsExecutablesDialog::Se
         return str;
 
     int i;
-    for (i=0; i < checkList->Number(); i++)
+    for (i=0; i < checkList->GetCount(); i++)
     {
         if (checkList->IsChecked(i))
         {