more files to ignore in cvs commands (setup.h, lex_yy.c, y_tab.c)

[wxWidgets.git] / utils / dialoged / src / symbtabl.cpp

diff --git a/utils/dialoged/src/symbtabl.cpp b/utils/dialoged/src/symbtabl.cpp
index 48c0cb40ae09451a1971e3692e265d068fd855c5..110764e782c97372c6630d01a9ebdb1f46e36873 100644 (file)
--- a/utils/dialoged/src/symbtabl.cpp
+++ b/utils/dialoged/src/symbtabl.cpp
@@ -70,7 +70,7 @@ bool wxResourceSymbolTable::ReadIncludeFile(const wxString& filename)
     str.UngetWriteBuf();
 
     // Look for #define occurrences
-    size_t pos = str.Find("#define");
+    int pos = str.Find("#define");
     while (pos != -1)
     {
         size_t len = str.Length();
@@ -133,7 +133,7 @@ bool wxResourceSymbolTable::WriteIncludeFile(const wxString& filename)
     wxNode* node = m_hashTable.Next();
     while (node)
     {
-        char* str = node->key.string;
+        const char* str = node->GetKeyString();
         int id = (int) node->Data() ;
 
         if (!IsStandardSymbol(str))
@@ -181,7 +181,7 @@ wxString wxResourceSymbolTable::GetSymbolForId(int id)
     wxNode* node = m_hashTable.Next();
     while (node)
     {
-        char* str = node->key.string;
+        const char* str = node->GetKeyString();
         if (str && ( ((int) node->Data()) == id) )
             return wxString(str);
 
@@ -323,7 +323,7 @@ bool wxResourceSymbolTable::FillComboBox(wxComboBox* comboBox)
     wxNode* node = m_hashTable.Next();
     while (node)
     {
-        char* str = node->key.string;
+        const char* str = node->GetKeyString();
 
         comboBox->Append(str);
         node = m_hashTable.Next();