This is the mail archive of the
ecos-patches@sources.redhat.com
mailing list for the eCos project.
Allow configtool to build against current wxWindows CVS sources
- From: John Dallaway <jld at ecoscentric dot com>
- To: ecos-patches at sources dot redhat dot com
- Date: Wed, 14 May 2003 13:16:21 +0100
- Subject: Allow configtool to build against current wxWindows CVS sources
- Organization: eCosCentric Limited
Index: ChangeLog
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/ChangeLog,v
retrieving revision 1.56
diff -u -5 -r1.56 ChangeLog
--- ChangeLog 2 May 2003 13:58:08 -0000 1.56
+++ ChangeLog 14 May 2003 12:12:10 -0000
@@ -1,5 +1,17 @@
+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
look for build tools and user tools.
Index: standalone/wxwin/admindlg.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/admindlg.cpp,v
retrieving revision 1.7
diff -u -5 -r1.7 admindlg.cpp
--- standalone/wxwin/admindlg.cpp 6 Apr 2003 20:49:08 -0000 1.7
+++ standalone/wxwin/admindlg.cpp 14 May 2003 12:12:16 -0000
@@ -341,11 +341,11 @@
}
else // a version node is selected
{
// 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
{
// remove the package node
@@ -384,11 +384,11 @@
bool ecAdminDialog::RemovePackageVersion (wxTreeItemId hTreeItem)
{
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);
wxASSERT( data );
Index: standalone/wxwin/buildoptionsdlg.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/buildoptionsdlg.cpp,v
retrieving revision 1.1
diff -u -5 -r1.1 buildoptionsdlg.cpp
--- standalone/wxwin/buildoptionsdlg.cpp 1 Jun 2001 22:16:29 -0000 1.1
+++ standalone/wxwin/buildoptionsdlg.cpp 14 May 2003 12:12:16 -0000
@@ -316,11 +316,11 @@
ecUtils::Chop(strFlags,ar, wxT(' '), FALSE, FALSE);
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++){
wxString strOld = listBox->GetString(i);
Index: standalone/wxwin/configtool.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/configtool.cpp,v
retrieving revision 1.17
diff -u -5 -r1.17 configtool.cpp
--- standalone/wxwin/configtool.cpp 17 Apr 2003 14:18:40 -0000 1.17
+++ standalone/wxwin/configtool.cpp 14 May 2003 12:12:24 -0000
@@ -579,11 +579,11 @@
if (file)
{
wxInputStream* stream = file->GetStream();
wxImage image(* stream, bitmapType);
- bitmap = image.ConvertToBitmap();
+ bitmap = wxBitmap(image);
delete file;
}
#endif
Index: standalone/wxwin/configtoolview.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/configtoolview.cpp,v
retrieving revision 1.3
diff -u -5 -r1.3 configtoolview.cpp
--- standalone/wxwin/configtoolview.cpp 18 Jul 2001 11:38:40 -0000 1.3
+++ standalone/wxwin/configtoolview.cpp 14 May 2003 12:12:26 -0000
@@ -467,11 +467,11 @@
}
}
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))
{
m_expandedForFind = hv;
}
Index: standalone/wxwin/makefile.gnu
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/makefile.gnu,v
retrieving revision 1.10
diff -u -5 -r1.10 makefile.gnu
--- standalone/wxwin/makefile.gnu 24 Apr 2003 11:11:15 -0000 1.10
+++ standalone/wxwin/makefile.gnu 14 May 2003 12:12:26 -0000
@@ -77,11 +77,10 @@
$(CTBUILDDIR)/folderdlg.o \
$(CTBUILDDIR)/htmlparser.o \
$(CTBUILDDIR)/licensedlg.o \
$(CTBUILDDIR)/mainwin.o \
$(CTBUILDDIR)/mltwin.o \
- $(CTBUILDDIR)/msgdlgex.o \
$(CTBUILDDIR)/outputwin.o \
$(CTBUILDDIR)/packagesdlg.o \
$(CTBUILDDIR)/platformeditordlg.o \
$(CTBUILDDIR)/platformsdlg.o \
$(CTBUILDDIR)/propertywin.o \
@@ -189,13 +188,10 @@
$(CTBUILDDIR)/mainwin.o: $(CTDIR)/mainwin.cpp $(CTDIR)/mainwin.h
$(CC) $(CPPDEBUGOPTIONS) -c $(EXTRACPPFLAGS) $(CPPFLAGS) -o $@ $<
$(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 $@ $<
Index: standalone/wxwin/packagesdlg.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/packagesdlg.cpp,v
retrieving revision 1.4
diff -u -5 -r1.4 packagesdlg.cpp
--- standalone/wxwin/packagesdlg.cpp 28 Mar 2003 12:04:51 -0000 1.4
+++ standalone/wxwin/packagesdlg.cpp 14 May 2003 12:12:33 -0000
@@ -763,11 +763,11 @@
}
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
i ++;
return -1;
@@ -1068,11 +1068,11 @@
}
void ecPackagesDialog::ClearSelections(wxListBox& lbox)
{
int i;
- for (i = 0; i < lbox.Number(); i++)
+ for (i = 0; i < lbox.GetCount(); i++)
{
lbox.Deselect(i);
}
}
Index: standalone/wxwin/runtestsdlg.cpp
===================================================================
RCS file: /cvs/ecos/ecos/host/tools/configtool/standalone/wxwin/runtestsdlg.cpp,v
retrieving revision 1.7
diff -u -5 -r1.7 runtestsdlg.cpp
--- standalone/wxwin/runtestsdlg.cpp 1 May 2003 12:00:51 -0000 1.7
+++ standalone/wxwin/runtestsdlg.cpp 14 May 2003 12:12:37 -0000
@@ -648,11 +648,11 @@
wxASSERT( checkListBox );
checkListBox->Append(test);
if (select)
- checkListBox->Check(checkListBox->Number() - 1, TRUE);
+ checkListBox->Check(checkListBox->GetCount() - 1, TRUE);
}
/* Executables dialog
*/
@@ -735,11 +735,11 @@
wxCheckListBox* checkList = (wxCheckListBox*) FindWindow(ecID_RUN_TESTS_TEST_LIST);
if (!checkList)
return;
int i;
- int n = checkList->Number();
+ int n = checkList->GetCount();
for (i = 0; i < n; i++)
checkList->Check(i, TRUE);
}
void ecRunTestsExecutablesDialog::OnUncheckAll(wxCommandEvent& event)
@@ -747,11 +747,11 @@
wxCheckListBox* checkList = (wxCheckListBox*) FindWindow(ecID_RUN_TESTS_TEST_LIST);
if (!checkList)
return;
int i;
- int n = checkList->Number();
+ int n = checkList->GetCount();
for (i = 0; i < n; i++)
checkList->Check(i, FALSE);
}