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

diff --git a/contrib/samples/fl/fl_demo2.cpp b/contrib/samples/fl/fl_demo2.cpp
index 804b1bef143373e40c028d19b76d36109f586776..08c67c86dbabde8f79da3e25a2687e38ecd46243 100644 (file)
--- a/contrib/samples/fl/fl_demo2.cpp
+++ b/contrib/samples/fl/fl_demo2.cpp
@@ -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' )
     {

diff --git a/contrib/samples/gizmos/led/led.cpp b/contrib/samples/gizmos/led/led.cpp
index 356be602f3c6d13f3ec8998166bcc4aa7a3d0326..d1651fb0f37808982af162b2cfc35895669bbe60 100644 (file)
--- a/contrib/samples/gizmos/led/led.cpp
+++ b/contrib/samples/gizmos/led/led.cpp
@@ -33,6 +33,7 @@
 #include "../../../include/wx/gizmos/ledctrl.h"
 #include "wx/sizer.h"
 #include "wx/panel.h"
 #include "../../../include/wx/gizmos/ledctrl.h"
 #include "wx/sizer.h"
 #include "wx/panel.h"

+#include "wx/numdlg.h"

 
 // ----------------------------------------------------------------------------
 // private classes
 
 // ----------------------------------------------------------------------------
 // private classes

diff --git a/contrib/src/deprecated/prop.cpp b/contrib/src/deprecated/prop.cpp
index ae168ad1ae1dfa79e2421a05f430997a1a915d83..1abb44d20d4d3951dadcdbc79f77e0e741e926f9 100644 (file)
--- a/contrib/src/deprecated/prop.cpp
+++ b/contrib/src/deprecated/prop.cpp
@@ -1080,7 +1080,7 @@ wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& t
 void wxPropertyValidatorRegistry::ClearRegistry(void)
 {
   BeginFind();
 void wxPropertyValidatorRegistry::ClearRegistry(void)
 {
   BeginFind();

-  wxNode *node;
+  wxHashTable::Node *node;

   while ((node = Next()) != NULL)
   {
     delete (wxPropertyValidator *)node->GetData();
   while ((node = Next()) != NULL)
   {
     delete (wxPropertyValidator *)node->GetData();

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 8bdd46f0b9bcf3bbcaf38d1b94d27eee5f4bce33..7816f8356669b4f19d5b508597e86f4aad743141 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -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();
         // 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();
         while (node != NULL)
         {
             wxItemResource *parent = (wxItemResource *)node->GetData();


@@ -309,10 +309,10 @@ bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
 void wxResourceTable::ClearTable()
 {
     BeginFind();
 void wxResourceTable::ClearTable()
 {
     BeginFind();

-    wxNode *node = Next();
+    wxHashTable::Node *node = Next();

     while (node)
     {
     while (node)
     {

-        wxNode *next = Next();
+        wxHashTable::Node *next = Next();

         wxItemResource *item = (wxItemResource *)node->GetData();
         delete item;
         delete node;
         wxItemResource *item = (wxItemResource *)node->GetData();
         delete item;
         delete node;

diff --git a/contrib/utils/convertrc/wxr2xml.cpp b/contrib/utils/convertrc/wxr2xml.cpp
index 8c4a70e6e06ab49f15fbd9a5fdfa75a0ace202ad..c15d162a224ebf04117964c671d71830a181fb02 100644 (file)
--- a/contrib/utils/convertrc/wxr2xml.cpp
+++ b/contrib/utils/convertrc/wxr2xml.cpp
@@ -68,7 +68,7 @@ bool wxr2xml::Convert(wxString wxrfile, wxString xmlfile)
 bool wxr2xml::ParseResources()
 {
     m_table.BeginFind();
 bool wxr2xml::ParseResources()
 {
     m_table.BeginFind();

-    wxNode *node;
+    wxHashTable::Node *node;

 
     node = m_table.Next();
     while (node) 
 
     node = m_table.Next();
     while (node)