Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Patch #952359 from ABX: contrib updates after wxHashTable and

Browse Source 
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:
Mattia Barbon
2004-05-15 17:38:29 +00:00
parent 47ca35dd35
commit 99940d1bab
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/samples/fl/fl_demo2.cpp
View File

@@ -489,7 +489,7 @@ wxTreeCtrl* MyFrame::CreateTreeCtrl( const wxString& label )
{ {
wxTreeCtrl* pTree = new wxTreeCtrl( mpInternalFrm, -1 ); 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' ) if ( label[0] != 'X' )
{ {

1
contrib/samples/gizmos/led/led.cpp
View File

@@ -33,6 +33,7 @@
#include "../../../include/wx/gizmos/ledctrl.h" #include "../../../include/wx/gizmos/ledctrl.h"
#include "wx/sizer.h" #include "wx/sizer.h"
#include "wx/panel.h" #include "wx/panel.h"
#include "wx/numdlg.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// private classes // private classes

2
contrib/src/deprecated/prop.cpp
View File

@@ -1080,7 +1080,7 @@ wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& t
void wxPropertyValidatorRegistry::ClearRegistry(void) void wxPropertyValidatorRegistry::ClearRegistry(void)
{ {
BeginFind(); BeginFind();
wxNode *node; wxHashTable::Node *node;
while ((node = Next()) != NULL) while ((node = Next()) != NULL)
{ {
delete (wxPropertyValidator *)node->GetData(); delete (wxPropertyValidator *)node->GetData();

6
contrib/src/deprecated/resource.cpp
View File

@@ -215,7 +215,7 @@ bool wxResourceTable::DeleteResource(const wxString& name)
// See if any resource has this as its child; if so, delete from // See if any resource has this as its child; if so, delete from
// parent's child list. // parent's child list.
BeginFind(); BeginFind();
wxNode *node = Next(); wxHashTable::Node *node = Next();
while (node != NULL) while (node != NULL)
{ {
wxItemResource *parent = (wxItemResource *)node->GetData(); wxItemResource *parent = (wxItemResource *)node->GetData();
@@ -309,10 +309,10 @@ bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
void wxResourceTable::ClearTable() void wxResourceTable::ClearTable()
{ {
BeginFind(); BeginFind();
wxNode *node = Next(); wxHashTable::Node *node = Next();
while (node) while (node)
{ {
wxNode *next = Next(); wxHashTable::Node *next = Next();
wxItemResource *item = (wxItemResource *)node->GetData(); wxItemResource *item = (wxItemResource *)node->GetData();
delete item; delete item;
delete node; delete node;

2
contrib/utils/convertrc/wxr2xml.cpp
View File

@@ -68,7 +68,7 @@ bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
bool wxr2xml::ParseResources() bool wxr2xml::ParseResources()
{ {
m_table.BeginFind(); m_table.BeginFind();
wxNode *node; wxHashTable::Node *node;
node = m_table.Next(); node = m_table.Next();
while (node) while (node)