wxEmptyString decorations.

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

diff --git a/contrib/src/deprecated/resource.cpp b/contrib/src/deprecated/resource.cpp
index 74dd99e7e9fda27ff62e8d025f5ba2b12bbb6cd4..a2055edd7c52316899fd348c273a10a8ce11d4b6 100644 (file)
--- a/contrib/src/deprecated/resource.cpp
+++ b/contrib/src/deprecated/resource.cpp
@@ -70,6 +70,9 @@
 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"
 #endif
 

+#include "wx/splitter.h"
+#include "wx/toolbar.h"
+

 #include "wx/validate.h"
 #include "wx/log.h"
 #include "wx/module.h"
 #include "wx/validate.h"
 #include "wx/log.h"
 #include "wx/module.h"


@@ -86,9 +89,14 @@
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 
 #include "wx/deprecated/resource.h"
 #include "wx/deprecated/wxexpr.h"
 

+#if !WXWIN_COMPATIBILITY_2_4
+static inline wxChar* copystring(const wxChar* s)
+    { return wxStrcpy(new wxChar[wxStrlen(s) + 1], s); }
+#endif
+

 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
 // Forward (private) declarations
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);

-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = FALSE);
+wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel = false);

 wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr);
 wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr);
 wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr);
 wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr);
 wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr);
 wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr);


@@ -129,7 +137,7 @@ class wxResourceModule: public wxModule
 {
 public:
     wxResourceModule() : wxModule() {}
 {
 public:
     wxResourceModule() : wxModule() {}

-    virtual bool OnInit() { wxInitializeResourceSystem(); return TRUE; }
+    virtual bool OnInit() { wxInitializeResourceSystem(); return true; }

     virtual void OnExit() { wxCleanUpResourceSystem();  }
 
     DECLARE_DYNAMIC_CLASS(wxResourceModule)
     virtual void OnExit() { wxCleanUpResourceSystem();  }
 
     DECLARE_DYNAMIC_CLASS(wxResourceModule)


@@ -156,13 +164,13 @@ wxItemResource::wxItemResource()
 
 wxItemResource::~wxItemResource()
 {
 
 wxItemResource::~wxItemResource()
 {

-    wxNode *node = m_children.First();
+    wxNode *node = m_children.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxItemResource *item = (wxItemResource *)node->Data();
+        wxItemResource *item = (wxItemResource *)node->GetData();

         delete item;
         delete node;
         delete item;
         delete node;

-        node = m_children.First();
+        node = m_children.GetFirst();

     }
 }
 
     }
 }
 


@@ -207,11 +215,10 @@ 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 = (wxNode *) NULL;
-        node = Next();
+        wxHashTable::Node *node = Next();

         while (node != NULL)
         {
         while (node != NULL)
         {

-            wxItemResource *parent = (wxItemResource *)node->Data();
+            wxItemResource *parent = (wxItemResource *)node->GetData();

             if (parent->GetChildren().Member(item))
             {
                 parent->GetChildren().DeleteObject(item);
             if (parent->GetChildren().Member(item))
             {
                 parent->GetChildren().DeleteObject(item);


@@ -221,10 +228,10 @@ bool wxResourceTable::DeleteResource(const wxString& name)
         }
 
         delete item;
         }
 
         delete item;

-        return TRUE;
+        return true;

     }
     else
     }
     else

-        return FALSE;
+        return false;

 }
 
 bool wxResourceTable::ParseResourceFile( wxInputStream *is )
 }
 
 bool wxResourceTable::ParseResourceFile( wxInputStream *is )


@@ -232,7 +239,7 @@ bool wxResourceTable::ParseResourceFile( wxInputStream *is )
     wxExprDatabase db;
     int len = is->GetSize() ;
 
     wxExprDatabase db;
     int len = is->GetSize() ;
 

-    bool eof = FALSE;
+    bool eof = false;

     while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
     {
         wxResourceReadOneResource(is, db, &eof, this) ;
     while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
     {
         wxResourceReadOneResource(is, db, &eof, this) ;


@@ -244,10 +251,10 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
     wxExprDatabase db;
 
 {
     wxExprDatabase db;
 

-    FILE *fd = wxFopen(filename, wxT("r"));
+    FILE *fd = wxFopen(filename.fn_str(), wxT("r"));

     if (!fd)
     if (!fd)

-        return FALSE;
-    bool eof = FALSE;
+        return false;
+    bool eof = false;

     while (wxResourceReadOneResource(fd, db, &eof, this) && !eof)
     {
         // Loop
     while (wxResourceReadOneResource(fd, db, &eof, this) && !eof)
     {
         // Loop


@@ -262,7 +269,7 @@ bool wxResourceTable::ParseResourceData(const wxString& data)
     if (!db.ReadFromString(data))
     {
         wxLogWarning(_("Ill-formed resource file syntax."));
     if (!db.ReadFromString(data))
     {
         wxLogWarning(_("Ill-formed resource file syntax."));

-        return FALSE;
+        return false;

     }
 
     return wxResourceInterpretResources(*this, db);
     }
 
     return wxResourceInterpretResources(*this, db);


@@ -279,7 +286,7 @@ bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char bits
     item->SetValue2((long)width);
     item->SetValue3((long)height);
     AddResource(item);
     item->SetValue2((long)width);
     item->SetValue3((long)height);
     AddResource(item);

-    return TRUE;
+    return true;

 }
 
 bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **data)
 }
 
 bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **data)


@@ -291,22 +298,22 @@ bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **da
     item->SetName(name);
     item->SetValue1((long)data);
     AddResource(item);
     item->SetName(name);
     item->SetValue1((long)data);
     AddResource(item);

-    return TRUE;
+    return true;

 }
 
 bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
 {
 }
 
 bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))
 {

-    return FALSE;
+    return false;

 }
 
 void wxResourceTable::ClearTable()
 {
     BeginFind();
 }
 
 void wxResourceTable::ClearTable()
 {
     BeginFind();

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

     while (node)
     {
     while (node)
     {

-        wxNode *next = Next();
-        wxItemResource *item = (wxItemResource *)node->Data();
+        wxHashTable::Node *next = Next();
+        wxItemResource *item = (wxItemResource *)node->GetData();

         delete item;
         delete node;
         node = next;
         delete item;
         delete node;
         node = next;


@@ -436,7 +443,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
             ((wxScrollBar *)control)->SetViewLength((int)(long)childResource->GetValue5());
         */
         ((wxScrollBar *)control)->SetScrollbar((int)childResource->GetValue1(),(int)childResource->GetValue2(),
             ((wxScrollBar *)control)->SetViewLength((int)(long)childResource->GetValue5());
         */
         ((wxScrollBar *)control)->SetScrollbar((int)childResource->GetValue1(),(int)childResource->GetValue2(),

-            (int)childResource->GetValue3(),(int)(long)childResource->GetValue5(),FALSE);
+            (int)childResource->GetValue3(),(int)(long)childResource->GetValue5(),false);

 
     }
 #endif
 
     }
 #endif


@@ -456,17 +463,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxListBox(parent, id, pos, size,
             }
         }
         control = new wxListBox(parent, id, pos, size,


@@ -480,17 +487,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxChoice(parent, id, pos, size,
             }
         }
         control = new wxChoice(parent, id, pos, size,


@@ -505,17 +512,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,
             }
         }
         control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,


@@ -530,17 +537,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

-        if (stringList.Number() > 0)
+        if (stringList.GetCount() > 0)

         {
         {

-            noStrings = stringList.Number();
+            noStrings = stringList.GetCount();

             strings = new wxString[noStrings];
             strings = new wxString[noStrings];

-            wxNode *node = stringList.First();
+            wxStringListNode *node = stringList.GetFirst();

             int i = 0;
             while (node)
             {
             int i = 0;
             while (node)
             {

-                strings[i] = (wxChar *)node->Data();
+                strings[i] = (wxChar *)node->GetData();

                 i ++;
                 i ++;

-                node = node->Next();
+                node = node->GetNext();

             }
         }
         control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,
             }
         }
         control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,


@@ -565,7 +572,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
             // Force the layout algorithm since the size changes the layout
             if (control->IsKindOf(CLASSINFO(wxRadioBox)))
             {
             // Force the layout algorithm since the size changes the layout
             if (control->IsKindOf(CLASSINFO(wxRadioBox)))
             {

-                control->SetSize(-1, -1, -1, -1, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);
+                control->SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, wxSIZE_AUTO_WIDTH|wxSIZE_AUTO_HEIGHT);

             }
 #endif
         }
             }
 #endif
         }


@@ -579,17 +586,17 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
 
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
 {
 
 bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
 {

-    wxNode *node = db.First();
+    wxNode *node = db.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxExpr *clause = (wxExpr *)node->Data();
+        wxExpr *clause = (wxExpr *)node->GetData();

         wxString functor(clause->Functor());
 
         wxItemResource *item = (wxItemResource *) NULL;
         if (functor == wxT("dialog"))
             item = wxResourceInterpretDialog(table, clause);
         else if (functor == wxT("panel"))
         wxString functor(clause->Functor());
 
         wxItemResource *item = (wxItemResource *) NULL;
         if (functor == wxT("dialog"))
             item = wxResourceInterpretDialog(table, clause);
         else if (functor == wxT("panel"))

-            item = wxResourceInterpretDialog(table, clause, TRUE);
+            item = wxResourceInterpretDialog(table, clause, true);

         else if (functor == wxT("menubar"))
             item = wxResourceInterpretMenuBar(table, clause);
         else if (functor == wxT("menu"))
         else if (functor == wxT("menubar"))
             item = wxResourceInterpretMenuBar(table, clause);
         else if (functor == wxT("menu"))


@@ -608,9 +615,9 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
                 table.DeleteResource(item->GetName());
             table.AddResource(item);
         }
                 table.DeleteResource(item->GetName());
             table.AddResource(item);
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    return TRUE;
+    return true;

 }
 
 static const wxChar *g_ValidControlClasses[] =
 }
 
 static const wxChar *g_ValidControlClasses[] =


@@ -642,9 +649,9 @@ static bool wxIsValidControlClass(const wxString& c)
     for ( size_t i = 0; i < WXSIZEOF(g_ValidControlClasses); i++ )
     {
         if ( c == g_ValidControlClasses[i] )
     for ( size_t i = 0; i < WXSIZEOF(g_ValidControlClasses); i++ )
     {
         if ( c == g_ValidControlClasses[i] )

-            return TRUE;
+            return true;

     }
     }

-    return FALSE;
+    return false;

 }
 
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel)
 }
 
 wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel)


@@ -665,7 +672,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     if (isPanel)
         windowStyle = 0;
 
     if (isPanel)
         windowStyle = 0;
 

-    int x = 0; int y = 0; int width = -1; int height = -1;
+    int x = 0; int y = 0; int width = wxDefaultCoord; int height = wxDefaultCoord;

     int isModal = 0;
     wxExpr *labelFontExpr = (wxExpr *) NULL;
     wxExpr *buttonFontExpr = (wxExpr *) NULL;
     int isModal = 0;
     wxExpr *labelFontExpr = (wxExpr *) NULL;
     wxExpr *buttonFontExpr = (wxExpr *) NULL;


@@ -705,17 +712,23 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     }
     dialogItem->SetStyle(windowStyle);
     dialogItem->SetValue1(isModal);
     }
     dialogItem->SetStyle(windowStyle);
     dialogItem->SetValue1(isModal);

-    if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
-        dialogItem->SetValue1(TRUE);
+#ifdef __VMS
+#pragma message disable CODCAUUNR
+#endif
+   if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
+        dialogItem->SetValue1(true);
+#ifdef __VMS
+#pragma message enable CODCAUUNR
+#endif

 
     dialogItem->SetName(name);
     dialogItem->SetTitle(title);
     dialogItem->SetSize(x, y, width, height);
 
     // Check for wxWin 1.68-style specifications
 
     dialogItem->SetName(name);
     dialogItem->SetTitle(title);
     dialogItem->SetSize(x, y, width, height);
 
     // Check for wxWin 1.68-style specifications

-    if (style.Find(wxT("VERTICAL_LABEL")) != -1)
+    if (style.Find(wxT("VERTICAL_LABEL")) != wxNOT_FOUND)

         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);

-    else if (style.Find(wxT("HORIZONTAL_LABEL")) != -1)
+    else if (style.Find(wxT("HORIZONTAL_LABEL")) != wxNOT_FOUND)

         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
 
     if (backColourHex != wxT(""))
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
 
     if (backColourHex != wxT(""))


@@ -795,7 +808,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     wxString name;
     int id = 0;
     long windowStyle = 0;
     wxString name;
     int id = 0;
     long windowStyle = 0;

-    int x = 0; int y = 0; int width = -1; int height = -1;
+    int x = 0; int y = 0; int width = wxDefaultCoord; int height = wxDefaultCoord;

     int count = 0;
 
     wxExpr *expr1 = expr->Nth(0);
     int count = 0;
 
     wxExpr *expr1 = expr->Nth(0);


@@ -880,9 +893,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     controlItem->SetId(id);
 
     // Check for wxWin 1.68-style specifications
     controlItem->SetId(id);
 
     // Check for wxWin 1.68-style specifications

-    if (style.Find(wxT("VERTICAL_LABEL")) != -1)
+    if (style.Find(wxT("VERTICAL_LABEL")) != wxNOT_FOUND)

         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);

-    else if (style.Find(wxT("HORIZONTAL_LABEL")) != -1)
+    else if (style.Find(wxT("HORIZONTAL_LABEL")) != wxNOT_FOUND)

         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
 
     if (controlType == wxT("wxButton"))
         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
 
     if (controlType == wxT("wxButton"))


@@ -1519,7 +1532,7 @@ bool wxReallocateResourceBuffer()
     {
         wxResourceBufferSize = 1000;
         wxResourceBuffer = new char[wxResourceBufferSize];
     {
         wxResourceBufferSize = 1000;
         wxResourceBuffer = new char[wxResourceBufferSize];

-        return TRUE;
+        return true;

     }
     if (wxResourceBuffer)
     {
     }
     if (wxResourceBuffer)
     {


@@ -1530,12 +1543,12 @@ bool wxReallocateResourceBuffer()
         wxResourceBuffer = tmp;
         wxResourceBufferSize = newSize;
     }
         wxResourceBuffer = tmp;
         wxResourceBufferSize = newSize;
     }

-    return TRUE;
+    return true;

 }
 
 static bool wxEatWhiteSpace(FILE *fd)
 {
 }
 
 static bool wxEatWhiteSpace(FILE *fd)
 {

-    int ch = 0;
+    int ch;

 
     while ((ch = getc(fd)) != EOF)
     {
 
     while ((ch = getc(fd)) != EOF)
     {


@@ -1553,7 +1566,7 @@ static bool wxEatWhiteSpace(FILE *fd)
                 if (ch == EOF)
                 {
                     ungetc(prev_ch, fd);
                 if (ch == EOF)
                 {
                     ungetc(prev_ch, fd);

-                    return TRUE;
+                    return true;

                 }
 
                 if (ch == '*')
                 }
 
                 if (ch == '*')


@@ -1577,17 +1590,17 @@ static bool wxEatWhiteSpace(FILE *fd)
                 {
                     ungetc(prev_ch, fd);
                     ungetc(ch, fd);
                 {
                     ungetc(prev_ch, fd);
                     ungetc(ch, fd);

-                    return TRUE;
+                    return true;

                 }
             }
             break;
         default:
             ungetc(ch, fd);
                 }
             }
             break;
         default:
             ungetc(ch, fd);

-            return TRUE;
+            return true;

 
         }
     }
 
         }
     }

-    return FALSE;
+    return false;

 }
 static bool wxEatWhiteSpace(wxInputStream *is)
 {
 }
 static bool wxEatWhiteSpace(wxInputStream *is)
 {


@@ -1595,7 +1608,7 @@ static bool wxEatWhiteSpace(wxInputStream *is)
     if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
     {
         is->Ungetch(ch);
     if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
     {
         is->Ungetch(ch);

-        return TRUE;
+        return true;

     }
 
     // Eat whitespace
     }
 
     // Eat whitespace


@@ -1607,17 +1620,17 @@ static bool wxEatWhiteSpace(wxInputStream *is)
         ch = is->GetC();
         if (ch == '*')
         {
         ch = is->GetC();
         if (ch == '*')
         {

-            bool finished = FALSE;
+            bool finished = false;

             while (!finished)
             {
                 ch = is->GetC();
                 if (ch == EOF)
             while (!finished)
             {
                 ch = is->GetC();
                 if (ch == EOF)

-                    return FALSE;
+                    return false;

                 if (ch == '*')
                 {
                     int newCh = is->GetC();
                     if (newCh == '/')
                 if (ch == '*')
                 {
                     int newCh = is->GetC();
                     if (newCh == '/')

-                        finished = TRUE;
+                        finished = true;

                     else
                     {
                         is->Ungetch(ch);
                     else
                     {
                         is->Ungetch(ch);


@@ -1626,7 +1639,7 @@ static bool wxEatWhiteSpace(wxInputStream *is)
             }
         }
         else // False alarm
             }
         }
         else // False alarm

-            return FALSE;
+            return false;

     }
     else
         is->Ungetch(ch);
     }
     else
         is->Ungetch(ch);


@@ -1652,7 +1665,7 @@ bool wxGetResourceToken(FILE *fd)
             if (ch == EOF)
             {
                 wxResourceBuffer[wxResourceBufferCount] = 0;
             if (ch == EOF)
             {
                 wxResourceBuffer[wxResourceBufferCount] = 0;

-                return FALSE;
+                return false;

             }
             // Escaped characters
             else if (ch == '\\')
             }
             // Escaped characters
             else if (ch == '\\')


@@ -1691,9 +1704,9 @@ bool wxGetResourceToken(FILE *fd)
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
         if (ch == EOF)
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
         if (ch == EOF)

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 bool wxGetResourceToken(wxInputStream *is)
 }
 
 bool wxGetResourceToken(wxInputStream *is)


@@ -1715,7 +1728,7 @@ bool wxGetResourceToken(wxInputStream *is)
             if (ch == EOF)
             {
                 wxResourceBuffer[wxResourceBufferCount] = 0;
             if (ch == EOF)
             {
                 wxResourceBuffer[wxResourceBufferCount] = 0;

-                return FALSE;
+                return false;

             }
             // Escaped characters
             else if (ch == '\\')
             }
             // Escaped characters
             else if (ch == '\\')


@@ -1756,9 +1769,9 @@ bool wxGetResourceToken(wxInputStream *is)
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
         if (ch == EOF)
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
         if (ch == EOF)

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -1775,8 +1788,8 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     // static or #define
     if (!wxGetResourceToken(fd))
     {
     // static or #define
     if (!wxGetResourceToken(fd))
     {

-        *eof = TRUE;
-        return FALSE;
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "#define") == 0)
     }
 
     if (strcmp(wxResourceBuffer, "#define") == 0)


@@ -1795,12 +1808,12 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
             wxLogWarning(_("#define %s must be an integer."), name);
             delete[] name;
             delete[] value;
             wxLogWarning(_("#define %s must be an integer."), name);
             delete[] name;
             delete[] value;

-            return FALSE;
+            return false;

         }
         delete[] name;
         delete[] value;
 
         }
         delete[] name;
         delete[] value;
 

-        return TRUE;
+        return true;

     }
     else if (strcmp(wxResourceBuffer, "#include") == 0)
     {
     }
     else if (strcmp(wxResourceBuffer, "#include") == 0)
     {


@@ -1817,44 +1830,44 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
             wxLogWarning(_("Could not find resource include file %s."), actualName);
         }
         delete[] name;
             wxLogWarning(_("Could not find resource include file %s."), actualName);
         }
         delete[] name;

-        return TRUE;
+        return true;

     }
     else if (strcmp(wxResourceBuffer, "static") != 0)
     {
         wxChar buf[300];
         wxStrcpy(buf, _("Found "));
         wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
     }
     else if (strcmp(wxResourceBuffer, "static") != 0)
     {
         wxChar buf[300];
         wxStrcpy(buf, _("Found "));
         wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);

-        wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+        wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));

         wxLogWarning(buf);
         wxLogWarning(buf);

-        return FALSE;
+        return false;

     }
 
     // char
     if (!wxGetResourceToken(fd))
     {
     }
 
     // char
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "char") != 0)
     {
     }
 
     if (strcmp(wxResourceBuffer, "char") != 0)
     {

-        wxLogWarning(_("Expected 'char' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected 'char' while parsing resource."));
+        return false;

     }
 
     // *name
     if (!wxGetResourceToken(fd))
     {
     }
 
     // *name
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (wxResourceBuffer[0] != '*')
     {
     }
 
     if (wxResourceBuffer[0] != '*')
     {

-        wxLogWarning(_("Expected '*' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected '*' while parsing resource."));
+        return false;

     }
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
     }
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);


@@ -1863,38 +1876,38 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     // =
     if (!wxGetResourceToken(fd))
     {
     // =
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {

-        wxLogWarning(_("Expected '=' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected '=' while parsing resource."));
+        return false;

     }
 
     // String
     if (!wxGetResourceToken(fd))
     {
     }
 
     // String
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
     else
     {
         if (!db.ReadPrologFromString(wxResourceBuffer))
         {
             wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
     }
     else
     {
         if (!db.ReadPrologFromString(wxResourceBuffer))
         {
             wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);

-            return FALSE;
+            return false;

         }
     }
     // Semicolon
     if (!wxGetResourceToken(fd))
     {
         }
     }
     // Semicolon
     if (!wxGetResourceToken(fd))
     {

-        *eof = TRUE;
+        *eof = true;

     }
     }

-    return TRUE;
+    return true;

 }
 
 bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
 }
 
 bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)


@@ -1905,8 +1918,8 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
     // static or #define
     if (!wxGetResourceToken(fd))
     {
     // static or #define
     if (!wxGetResourceToken(fd))
     {

-        *eof = TRUE;
-        return FALSE;
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "#define") == 0)
     }
 
     if (strcmp(wxResourceBuffer, "#define") == 0)


@@ -1925,12 +1938,12 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
             wxLogWarning(_("#define %s must be an integer."), name);
             delete[] name;
             delete[] value;
             wxLogWarning(_("#define %s must be an integer."), name);
             delete[] name;
             delete[] value;

-            return FALSE;
+            return false;

         }
         delete[] name;
         delete[] value;
 
         }
         delete[] name;
         delete[] value;
 

-        return TRUE;
+        return true;

     }
     else if (strcmp(wxResourceBuffer, "#include") == 0)
     {
     }
     else if (strcmp(wxResourceBuffer, "#include") == 0)
     {


@@ -1947,44 +1960,44 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
             wxLogWarning(_("Could not find resource include file %s."), actualName);
         }
         delete[] name;
             wxLogWarning(_("Could not find resource include file %s."), actualName);
         }
         delete[] name;

-        return TRUE;
+        return true;

     }
     else if (strcmp(wxResourceBuffer, "static") != 0)
     {
         wxChar buf[300];
         wxStrcpy(buf, _("Found "));
         wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);
     }
     else if (strcmp(wxResourceBuffer, "static") != 0)
     {
         wxChar buf[300];
         wxStrcpy(buf, _("Found "));
         wxStrncat(buf, wxConvLibc.cMB2WX(wxResourceBuffer), 30);

-        wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+        wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));

         wxLogWarning(buf);
         wxLogWarning(buf);

-        return FALSE;
+        return false;

     }
 
     // char
     if (!wxGetResourceToken(fd))
     {
     }
 
     // char
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "char") != 0)
     {
     }
 
     if (strcmp(wxResourceBuffer, "char") != 0)
     {

-        wxLogWarning(_("Expected 'char' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected 'char' while parsing resource."));
+        return false;

     }
 
     // *name
     if (!wxGetResourceToken(fd))
     {
     }
 
     // *name
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (wxResourceBuffer[0] != '*')
     {
     }
 
     if (wxResourceBuffer[0] != '*')
     {

-        wxLogWarning(_("Expected '*' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected '*' while parsing resource."));
+        return false;

     }
     char nameBuf[100];
     strncpy(nameBuf, wxResourceBuffer+1, 99);
     }
     char nameBuf[100];
     strncpy(nameBuf, wxResourceBuffer+1, 99);


@@ -1992,38 +2005,38 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
     // =
     if (!wxGetResourceToken(fd))
     {
     // =
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {

-        wxLogWarning(_("Expected '=' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected '=' while parsing resource."));
+        return false;

     }
 
     // String
     if (!wxGetResourceToken(fd))
     {
     }
 
     // String
     if (!wxGetResourceToken(fd))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
     else
     {
         if (!db.ReadPrologFromString(wxResourceBuffer))
         {
             wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
     }
     else
     {
         if (!db.ReadPrologFromString(wxResourceBuffer))
         {
             wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);

-            return FALSE;
+            return false;

         }
     }
     // Semicolon
     if (!wxGetResourceToken(fd))
     {
         }
     }
     // Semicolon
     if (!wxGetResourceToken(fd))
     {

-        *eof = TRUE;
+        *eof = true;

     }
     }

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -2340,18 +2353,18 @@ long wxParseWindowStyle(const wxString& bitListString)
     word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
     while (word != NULL)
     {
     word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
     while (word != NULL)
     {

-        bool found = FALSE;
+        bool found = false;

         int j;
         for (j = 0; j < wxResourceBitListCount; j++)
             if (wxStrcmp(wxResourceBitListTable[j].word, word) == 0)
             {
                 bitList |= wxResourceBitListTable[j].bits;
         int j;
         for (j = 0; j < wxResourceBitListCount; j++)
             if (wxStrcmp(wxResourceBitListTable[j].word, word) == 0)
             {
                 bitList |= wxResourceBitListTable[j].bits;

-                found = TRUE;
+                found = true;

                 break;
             }
             if (!found)
             {
                 break;
             }
             if (!found)
             {

-                wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
+                wxLogWarning(_("Unrecognized style %s while parsing resource."), word);

                 return 0;
             }
             word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
                 return 0;
             }
             word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);


@@ -2360,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.
 */
 
 * depth and appropriate type.
 */
 


@@ -2383,10 +2396,10 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum bitmap for this platform/colour depth
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum bitmap for this platform/colour depth

-        wxNode *node = item->GetChildren().First();
+        wxNode *node = item->GetChildren().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxItemResource *child = (wxItemResource *)node->Data();
+            wxItemResource *child = (wxItemResource *)node->GetData();

             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*
             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*


@@ -2457,7 +2470,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             default:
                 break;
             }
             default:
                 break;
             }

-            node = node->Next();
+            node = node->GetNext();

         }
         // If no matching resource, fail.
         if (!optResource)
         }
         // If no matching resource, fail.
         if (!optResource)


@@ -2514,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.
 */
 
 * depth and appropriate type.
 */
 


@@ -2537,10 +2550,10 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum icon for this platform/colour depth
         wxItemResource *optResource = (wxItemResource *) NULL;
 
         // Try to find optimum icon for this platform/colour depth

-        wxNode *node = item->GetChildren().First();
+        wxNode *node = item->GetChildren().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxItemResource *child = (wxItemResource *)node->Data();
+            wxItemResource *child = (wxItemResource *)node->GetData();

             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*
             int platform = (int)child->GetValue2();
             int noColours = (int)child->GetValue3();
             /*


@@ -2611,7 +2624,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             default:
                 break;
             }
             default:
                 break;
             }

-            node = node->Next();
+            node = node->GetNext();

         }
         // If no matching resource, fail.
         if (!optResource)
         }
         // If no matching resource, fail.
         if (!optResource)


@@ -2639,7 +2652,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {
             }
         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)
                 /*
                 wxItemResource *item = table->FindResource(name);
                 if (!item)


@@ -2660,7 +2673,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
                 break;
 #else

-                return wxIcon(name, bitmapType);
+                return wxIcon(name, (wxBitmapType) bitmapType);

 #endif
             }
         }
 #endif
             }
         }


@@ -2678,13 +2691,13 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;
 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;

-    wxNode *node = item->GetChildren().First();
+    wxNode *node = item->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxItemResource *child = (wxItemResource *)node->Data();
+        wxItemResource *child = (wxItemResource *)node->GetData();

         if ((child->GetType() != wxT("")) && (child->GetType() == wxT("wxMenuSeparator")))
             menu->AppendSeparator();
         if ((child->GetType() != wxT("")) && (child->GetType() == wxT("wxMenuSeparator")))
             menu->AppendSeparator();

-        else if (child->GetChildren().Number() > 0)
+        else if (child->GetChildren().GetCount() > 0)

         {
             wxMenu *subMenu = wxResourceCreateMenu(child);
             if (subMenu)
         {
             wxMenu *subMenu = wxResourceCreateMenu(child);
             if (subMenu)


@@ -2694,7 +2707,7 @@ wxMenu *wxResourceCreateMenu(wxItemResource *item)
         {
             menu->Append((int)child->GetValue1(), child->GetTitle(), child->GetValue4(), (child->GetValue2() != 0));
         }
         {
             menu->Append((int)child->GetValue1(), child->GetTitle(), child->GetValue4(), (child->GetValue2() != 0));
         }

-        node = node->Next();
+        node = node->GetNext();

     }
     return menu;
 }
     }
     return menu;
 }


@@ -2709,14 +2722,14 @@ wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *ta
     {
         if (!menuBar)
             menuBar = new wxMenuBar;
     {
         if (!menuBar)
             menuBar = new wxMenuBar;

-        wxNode *node = menuResource->GetChildren().First();
+        wxNode *node = menuResource->GetChildren().GetFirst();

         while (node)
         {
         while (node)
         {

-            wxItemResource *child = (wxItemResource *)node->Data();
+            wxItemResource *child = (wxItemResource *)node->GetData();

             wxMenu *menu = wxResourceCreateMenu(child);
             if (menu)
                 menuBar->Append(menu, child->GetTitle());
             wxMenu *menu = wxResourceCreateMenu(child);
             if (menu)
                 menuBar->Append(menu, child->GetTitle());

-            node = node->Next();
+            node = node->GetNext();

         }
         return menuBar;
     }
         }
         return menuBar;
     }


@@ -2798,7 +2811,7 @@ bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *t
         table = wxDefaultResourceTable;
 
     table->identifiers.Put(name, (wxObject *)(long)value);
         table = wxDefaultResourceTable;
 
     table->identifiers.Put(name, (wxObject *)(long)value);

-    return TRUE;
+    return true;

 }
 
 int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
 }
 
 int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)


@@ -2818,10 +2831,10 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
     if (!table)
         table = wxDefaultResourceTable;
 
     if (!table)
         table = wxDefaultResourceTable;
 

-    FILE *fd = wxFopen(f, wxT("r"));
+    FILE *fd = wxFopen(f.fn_str(), wxT("r"));

     if (!fd)
     {
     if (!fd)
     {

-        return FALSE;
+        return false;

     }
     while (wxGetResourceToken(fd))
     {
     }
     while (wxGetResourceToken(fd))
     {


@@ -2841,7 +2854,7 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
         }
     }
     fclose(fd);
         }
     }
     fclose(fd);

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -2868,7 +2881,7 @@ static int ungetc_string()
 
 bool wxEatWhiteSpaceString(char *s)
 {
 
 bool wxEatWhiteSpaceString(char *s)
 {

-    int ch = 0;
+    int ch;

 
     while ((ch = getc_string(s)) != EOF)
     {
 
     while ((ch = getc_string(s)) != EOF)
     {


@@ -2881,18 +2894,17 @@ bool wxEatWhiteSpaceString(char *s)
             break;
         case '/':
             {
             break;
         case '/':
             {

-                int prev_ch = ch;

                 ch = getc_string(s);
                 if (ch == EOF)
                 {
                     ungetc_string();
                 ch = getc_string(s);
                 if (ch == EOF)
                 {
                     ungetc_string();

-                    return TRUE;
+                    return true;

                 }
 
                 if (ch == '*')
                 {
                     // Eat C comment
                 }
 
                 if (ch == '*')
                 {
                     // Eat C comment

-                    prev_ch = 0;
+                    int prev_ch = 0;

                     while ((ch = getc_string(s)) != EOF)
                     {
                         if (ch == '/' && prev_ch == '*')
                     while ((ch = getc_string(s)) != EOF)
                     {
                         if (ch == '/' && prev_ch == '*')


@@ -2904,17 +2916,17 @@ bool wxEatWhiteSpaceString(char *s)
                 {
                     ungetc_string();
                     ungetc_string();
                 {
                     ungetc_string();
                     ungetc_string();

-                    return TRUE;
+                    return true;

                 }
             }
             break;
         default:
             ungetc_string();
                 }
             }
             break;
         default:
             ungetc_string();

-            return TRUE;
+            return true;

 
         }
     }
 
         }
     }

-    return FALSE;
+    return false;

 }
 
 bool wxGetResourceTokenString(char *s)
 }
 
 bool wxGetResourceTokenString(char *s)


@@ -2936,7 +2948,7 @@ bool wxGetResourceTokenString(char *s)
             if (ch == EOF)
             {
                 wxResourceBuffer[wxResourceBufferCount] = 0;
             if (ch == EOF)
             {
                 wxResourceBuffer[wxResourceBufferCount] = 0;

-                return FALSE;
+                return false;

             }
             // Escaped characters
             else if (ch == '\\')
             }
             // Escaped characters
             else if (ch == '\\')


@@ -2975,9 +2987,9 @@ bool wxGetResourceTokenString(char *s)
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
         if (ch == EOF)
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
         if (ch == EOF)

-            return FALSE;
+            return false;

     }
     }

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -2994,8 +3006,8 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     // static or #define
     if (!wxGetResourceTokenString(s))
     {
     // static or #define
     if (!wxGetResourceTokenString(s))
     {

-        *eof = TRUE;
-        return FALSE;
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "#define") == 0)
     }
 
     if (strcmp(wxResourceBuffer, "#define") == 0)


@@ -3014,12 +3026,12 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
             wxLogWarning(_("#define %s must be an integer."), name);
             delete[] name;
             delete[] value;
             wxLogWarning(_("#define %s must be an integer."), name);
             delete[] name;
             delete[] value;

-            return FALSE;
+            return false;

         }
         delete[] name;
         delete[] value;
 
         }
         delete[] name;
         delete[] value;
 

-        return TRUE;
+        return true;

     }
     /*
     else if (strcmp(wxResourceBuffer, "#include") == 0)
     }
     /*
     else if (strcmp(wxResourceBuffer, "#include") == 0)


@@ -3039,7 +3051,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     wxLogWarning(buf);
     }
     delete[] name;
     wxLogWarning(buf);
     }
     delete[] name;

-    return TRUE;
+    return true;

     }
     */
     else if (strcmp(wxResourceBuffer, "static") != 0)
     }
     */
     else if (strcmp(wxResourceBuffer, "static") != 0)


@@ -3047,37 +3059,37 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
         wxChar buf[300];
         wxStrcpy(buf, _("Found "));
         wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
         wxChar buf[300];
         wxStrcpy(buf, _("Found "));
         wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);

-        wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+        wxStrcat(buf, _(", expected static, #include or #define\nwhile parsing resource."));

         wxLogWarning(buf);
         wxLogWarning(buf);

-        return FALSE;
+        return false;

     }
 
     // char
     if (!wxGetResourceTokenString(s))
     {
     }
 
     // char
     if (!wxGetResourceTokenString(s))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "char") != 0)
     {
     }
 
     if (strcmp(wxResourceBuffer, "char") != 0)
     {

-        wxLogWarning(_("Expected 'char' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected 'char' while parsing resource."));
+        return false;

     }
 
     // *name
     if (!wxGetResourceTokenString(s))
     {
     }
 
     // *name
     if (!wxGetResourceTokenString(s))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (wxResourceBuffer[0] != '*')
     {
     }
 
     if (wxResourceBuffer[0] != '*')
     {

-        wxLogWarning(_("Expected '*' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected '*' while parsing resource."));
+        return false;

     }
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
     }
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);


@@ -3086,41 +3098,41 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     // =
     if (!wxGetResourceTokenString(s))
     {
     // =
     if (!wxGetResourceTokenString(s))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
     }
 
     if (strcmp(wxResourceBuffer, "=") != 0)
     {

-        wxLogWarning(_("Expected '=' whilst parsing resource."));
-        return FALSE;
+        wxLogWarning(_("Expected '=' while parsing resource."));
+        return false;

     }
 
     // String
     if (!wxGetResourceTokenString(s))
     {
     }
 
     // String
     if (!wxGetResourceTokenString(s))
     {

-        wxLogWarning(_("Unexpected end of file whilst parsing resource."));
-        *eof = TRUE;
-        return FALSE;
+        wxLogWarning(_("Unexpected end of file while parsing resource."));
+        *eof = true;
+        return false;

     }
     else
     {
         if (!db.ReadPrologFromString(wxResourceBuffer))
         {
             wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
     }
     else
     {
         if (!db.ReadPrologFromString(wxResourceBuffer))
         {
             wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);

-            return FALSE;
+            return false;

         }
     }
     // Semicolon
     if (!wxGetResourceTokenString(s))
     {
         }
     }
     // Semicolon
     if (!wxGetResourceTokenString(s))
     {

-        *eof = TRUE;
+        *eof = true;

     }
     }

-    return TRUE;
+    return true;

 }
 
 }
 

-bool wxResourceParseString(const wxString& s, wxResourceTable *table)
+bool wxResourceParseString(const wxString& s, wxResourceTable *WXUNUSED(table))

 {
 #if wxUSE_UNICODE
     return wxResourceParseString( (char*)s.mb_str().data() );
 {
 #if wxUSE_UNICODE
     return wxResourceParseString( (char*)s.mb_str().data() );


@@ -3135,7 +3147,7 @@ bool wxResourceParseString(char *s, wxResourceTable *table)
         table = wxDefaultResourceTable;
 
     if (!s)
         table = wxDefaultResourceTable;
 
     if (!s)

-        return FALSE;
+        return false;

 
     // Turn backslashes into spaces
     if (s)
 
     // Turn backslashes into spaces
     if (s)


@@ -3153,7 +3165,7 @@ bool wxResourceParseString(char *s, wxResourceTable *table)
     wxExprDatabase db;
     wxResourceStringPtr = 0;
 
     wxExprDatabase db;
     wxResourceStringPtr = 0;
 

-    bool eof = FALSE;
+    bool eof = false;

     while (wxResourceReadOneResourceString(s, db, &eof, table) && !eof)
     {
         // Loop
     while (wxResourceReadOneResourceString(s, db, &eof, table) && !eof)
     {
         // Loop


@@ -3174,7 +3186,7 @@ bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString&
     //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
     if (!resource || (resource->GetType() == wxT("")) ||
         ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))
     //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
     if (!resource || (resource->GetType() == wxT("")) ||
         ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))

-        return FALSE;
+        return false;

 
     wxString title(resource->GetTitle());
     long theWindowStyle = resource->GetStyle();
 
     wxString title(resource->GetTitle());
     long theWindowStyle = resource->GetStyle();


@@ -3192,8 +3204,8 @@ bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString&
         {
             wxDialog *dialogBox = (wxDialog *)thisWindow;
             long modalStyle = isModal ? wxDIALOG_MODAL : 0;
         {
             wxDialog *dialogBox = (wxDialog *)thisWindow;
             long modalStyle = isModal ? wxDIALOG_MODAL : 0;

-            if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
-                return FALSE;
+            if (!dialogBox->Create(parent, wxID_ANY, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
+                return false;

 
             // Only reset the client size if we know we're not going to do it again below.
             if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
 
             // Only reset the client size if we know we're not going to do it again below.
             if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)


@@ -3202,13 +3214,13 @@ bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString&
         else if (thisWindow->IsKindOf(CLASSINFO(wxPanel)))
         {
             wxPanel* panel = (wxPanel *)thisWindow;
         else if (thisWindow->IsKindOf(CLASSINFO(wxPanel)))
         {
             wxPanel* panel = (wxPanel *)thisWindow;

-            if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
-                return FALSE;
+            if (!panel->Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
+                return false;

         }
         else
         {
         }
         else
         {

-            if (!((wxWindow *)thisWindow)->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
-                return FALSE;
+            if (!((wxWindow *)thisWindow)->Create(parent, wxID_ANY, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
+                return false;

         }
     }
 
         }
     }
 


@@ -3243,16 +3255,16 @@ bool wxLoadFromResource(wxWindow* thisWindow, wxWindow *parent, const wxString&
     }
 
     // Now create children
     }
 
     // Now create children

-    wxNode *node = resource->GetChildren().First();
+    wxNode *node = resource->GetChildren().GetFirst();

     while (node)
     {
     while (node)
     {

-        wxItemResource *childResource = (wxItemResource *)node->Data();
+        wxItemResource *childResource = (wxItemResource *)node->GetData();

 
         (void) wxCreateItem(thisWindow, childResource, resource, table);
 
 
         (void) wxCreateItem(thisWindow, childResource, resource, table);
 

-        node = node->Next();
+        node = node->GetNext();

     }
     }

-    return TRUE;
+    return true;

 }
 
 wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)
 }
 
 wxControl *wxCreateItem(wxWindow* thisWindow, const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)