ISO C++ cast fix (patches #1024150 and #1024149).

[wxWidgets.git] / contrib / src / deprecated / resource.cpp

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 8bdd46f0b9bcf3bbcaf38d1b94d27eee5f4bce33..1e0624092018401ee3742e7eaa94375c15bc340b 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();
-        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;
@@ -2373,7 +2373,7 @@ long wxParseWindowStyle(const wxString& bitListString)
 }
 
 /*
-* Load a bitmap from a wxWindows resource, choosing an optimum
+* Load a bitmap from a wxWidgets resource, choosing an optimum
 * depth and appropriate type.
 */
 
@@ -2527,7 +2527,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
 }
 
 /*
-* Load an icon from a wxWindows resource, choosing an optimum
+* Load an icon from a wxWidgets resource, choosing an optimum
 * depth and appropriate type.
 */
 
@@ -2652,7 +2652,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {
-                // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
+                // *** XPM ICON NOT YET IMPLEMENTED IN wxWidgets ***
                 /*
                 wxItemResource *item = table->FindResource(name);
                 if (!item)