Update of /cvsroot/audacity/audacity-src/src/widgets
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv20559
Modified Files:
treebook.cpp treebook.h
Log Message:
Fix assertion in AudacityApp::InitTempDir() when requesting a temporary
directory from the user
Index: treebook.h
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/treebook.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- treebook.h 6 Jun 2006 23:45:46 -0000 1.2
+++ treebook.h 17 Sep 2006 05:46:18 -0000 1.3
@@ -119,9 +119,9 @@
bool FindItemRecursively(const wxTreeItemId& idParent,
wxTreeItemIdValue* cookie,
int nPage,
- wxTreeItemId* foundid);
- wxTreeItemId FindItemByPageNum(const wxTreeItemId& parent,int nPage);
- wxTreeItemId FindItemByPageNum(int nPage) { return
FindItemByPageNum(GetRootItem(), nPage); }
+ wxTreeItemId* foundid) const;
+ wxTreeItemId FindItemByPageNum(const wxTreeItemId& parent,int nPage)
const;
+ wxTreeItemId FindItemByPageNum(int nPage) const { return
FindItemByPageNum(GetRootItem(), nPage); }
void SelectByPageNum(int nPage);
protected:
Index: treebook.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/widgets/treebook.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- treebook.cpp 17 Jun 2006 17:02:12 -0000 1.5
+++ treebook.cpp 17 Sep 2006 05:46:18 -0000 1.6
@@ -299,14 +299,14 @@
//
----------------------------------------------------------------------------
bool wxTreebook::SetPageText(size_t n, const wxString& strText)
{
- m_list->SetItemText(n, strText);
+ m_list->SetItemText(FindItemByPageNum(n), strText);
return true;
}
wxString wxTreebook::GetPageText(size_t n) const
{
- return m_list->GetItemText(n);
+ return m_list->GetItemText(FindItemByPageNum(n));
}
//
----------------------------------------------------------------------------
@@ -463,7 +463,7 @@
bool wxTreebook::FindItemRecursively(const wxTreeItemId& idParent,
wxTreeItemIdValue* cookie,
int nPage,
- wxTreeItemId* foundid)
+ wxTreeItemId* foundid) const
{
wxTreeItemIdValue temp;
wxTreeItemId id = cookie ? GetTreeCtrl()->GetNextChild(idParent, *cookie) :
GetTreeCtrl()->GetFirstChild(idParent, temp);
@@ -487,7 +487,7 @@
return FALSE;
}
-wxTreeItemId wxTreebook::FindItemByPageNum(const wxTreeItemId& parent,int
nPage)
+wxTreeItemId wxTreebook::FindItemByPageNum(const wxTreeItemId& parent,int
nPage) const
{
wxTreeItemId id;
FindItemRecursively(parent,NULL,nPage,&id);
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
