Patch #952359 from ABX: contrib updates after wxHashTable and
other recent changes. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27299 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
47ca35dd35
commit
99940d1bab
@ -489,7 +489,7 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
|
||||
{
|
||||
wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, -1 );
|
||||
|
||||
int rootid = pTree->AppendItem( (long)0, label, 0);
|
||||
const wxTreeItemId rootid = pTree->AppendItem( (long)0, label, 0);
|
||||
|
||||
if ( label[0] != 'X' )
|
||||
{
|
||||
|
@ -33,6 +33,7 @@
|
||||
#include "../../../include/wx/gizmos/ledctrl.h"
|
||||
#include "wx/sizer.h"
|
||||
#include "wx/panel.h"
|
||||
#include "wx/numdlg.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// private classes
|
||||
|
@ -1080,7 +1080,7 @@ wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& t
|
||||
void wxPropertyValidatorRegistry::ClearRegistry(void)
|
||||
{
|
||||
BeginFind();
|
||||
wxNode *node;
|
||||
wxHashTable::Node *node;
|
||||
while ((node = Next()) != NULL)
|
||||
{
|
||||
delete (wxPropertyValidator *)node->GetData();
|
||||
|
@ -215,7 +215,7 @@ bool wxResourceTable::DeleteResource(const wxString& name)
|
||||
// See if any resource has this as its child; if so, delete from
|
||||
// parent's child list.
|
||||
BeginFind();
|
||||
wxNode *node = Next();
|
||||
wxHashTable::Node *node = Next();
|
||||
while (node != NULL)
|
||||
{
|
||||
wxItemResource *parent = (wxItemResource *)node->GetData();
|
||||
@ -309,10 +309,10 @@ bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
|
||||
void wxResourceTable::ClearTable()
|
||||
{
|
||||
BeginFind();
|
||||
wxNode *node = Next();
|
||||
wxHashTable::Node *node = Next();
|
||||
while (node)
|
||||
{
|
||||
wxNode *next = Next();
|
||||
wxHashTable::Node *next = Next();
|
||||
wxItemResource *item = (wxItemResource *)node->GetData();
|
||||
delete item;
|
||||
delete node;
|
||||
|
@ -68,7 +68,7 @@ bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
|
||||
bool wxr2xml::ParseResources()
|
||||
{
|
||||
m_table.BeginFind();
|
||||
wxNode *node;
|
||||
wxHashTable::Node *node;
|
||||
|
||||
node = m_table.Next();
|
||||
while (node)
|
||||
|
Loading…
Reference in New Issue
Block a user