* wxSocket fixes: FTP, HTTP works really now. GTK fixes to prevent infinite loop.

[wxWidgets.git] / src / common / resource.cpp

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 5cda920f991a3570ea2a7bb0f1b6e449fca17523..a3c99026f98bdb641574d018b8d4b6ee101b35a8 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -20,6 +20,12 @@
 #pragma hdrstop
 #endif
 
 #pragma hdrstop
 #endif
 

+#if wxUSE_WX_RESOURCES
+
+#ifdef __VISUALC__
+    #pragma warning(disable:4706)   // assignment within conditional expression
+#endif // VC++
+

 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 #include "wx/setup.h"
 #ifndef WX_PRECOMP
 #include "wx/defs.h"
 #include "wx/setup.h"


@@ -33,12 +39,15 @@
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"

+#include "wx/radiobut.h"

 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"

+#include "wx/settings.h"

 #include "wx/slider.h"
 #include "wx/statbox.h"
 #include "wx/slider.h"
 #include "wx/statbox.h"

-#if USE_GAUGE
+#include "wx/statbmp.h"
+#if wxUSE_GAUGE

 #include "wx/gauge.h"
 #endif
 #include "wx/textctrl.h"
 #include "wx/gauge.h"
 #endif
 #include "wx/textctrl.h"


@@ -46,11 +55,15 @@
 #include "wx/intl.h"
 #endif
 
 #include "wx/intl.h"
 #endif
 

-#if USE_SCROLLBAR
+#if wxUSE_RADIOBUTTON
+#include "wx/radiobut.h"
+#endif
+
+#if wxUSE_SCROLLBAR

 #include "wx/scrolbar.h"
 #endif
 
 #include "wx/scrolbar.h"
 #endif
 

-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX

 #include "wx/combobox.h"
 #endif
 
 #include "wx/combobox.h"
 #endif
 


@@ -58,8 +71,6 @@
 
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 

-#if USE_WX_RESOURCES
-

 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>


@@ -69,34 +80,36 @@
 #include "wx/string.h"
 #include "wx/wxexpr.h"
 
 #include "wx/string.h"
 #include "wx/wxexpr.h"
 

+#include "wx/settings.h"
+

 // Forward (private) declarations
 // Forward (private) declarations

-bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db);
-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *expr, bool isPanel = FALSE);
-wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *expr);
-wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, PrologExpr *expr);
-wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *expr);
-wxItemResource *wxResourceInterpretString(wxResourceTable& table, PrologExpr *expr);
-wxItemResource *wxResourceInterpretBitmap(wxResourceTable& table, PrologExpr *expr);
-wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, PrologExpr *expr);
+bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db);
+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 *wxResourceInterpretString(wxResourceTable& table, wxExpr *expr);
+wxItemResource *wxResourceInterpretBitmap(wxResourceTable& table, wxExpr *expr);
+wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr);

 // Interpret list expression
 // Interpret list expression

-wxFont *wxResourceInterpretFontSpec(PrologExpr *expr);
+wxFont wxResourceInterpretFontSpec(wxExpr *expr);

 
 

-bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
-bool wxResourceParseIncludeFile(char *f, wxResourceTable *table = (wxResourceTable *) NULL);
+bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
+bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxResourceTable *) NULL);

 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 

-static char *wxResourceBuffer = (char *) NULL;
-static long wxResourceBufferSize = 0;
-static long wxResourceBufferCount = 0;
-static int wxResourceStringPtr = 0;
+char *wxResourceBuffer = (char *) NULL;
+long wxResourceBufferSize = 0;
+long wxResourceBufferCount = 0;
+int wxResourceStringPtr = 0;

 
 

-void wxInitializeResourceSystem(void)
+void wxInitializeResourceSystem()

 {
     wxDefaultResourceTable = new wxResourceTable;
 }
 
 {
     wxDefaultResourceTable = new wxResourceTable;
 }
 

-void wxCleanUpResourceSystem(void)
+void wxCleanUpResourceSystem()

 {
     delete wxDefaultResourceTable;
     if (wxResourceBuffer)
 {
     delete wxDefaultResourceTable;
     if (wxResourceBuffer)


@@ -113,119 +126,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
 #endif
 
 IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
 #endif
 

-wxItemResource::wxItemResource(void)
+wxItemResource::wxItemResource()

 {
 {

-  itemType = (char *) NULL;
-  title = (char *) NULL;
-  name = (char *) NULL;
-  windowStyle = 0;
-  x = y = width = height = 0;
-  value1 = value2 = value3 = value5 = 0;
-  value4 = (char *) NULL;
-  stringValues = (wxStringList *) NULL;
-  bitmap = (wxBitmap *) NULL;
-  backgroundColour = labelColour = buttonColour = (wxColour *) NULL;
-  windowFont = (wxFont *) NULL;
+  m_itemType = "";
+  m_title = "";
+  m_name = "";
+  m_windowStyle = 0;
+  m_x = m_y = m_width = m_height = 0;
+  m_value1 = m_value2 = m_value3 = m_value5 = 0;
+  m_value4 = "";

   m_windowId = 0;
   m_windowId = 0;

+  m_exStyle = 0;

 }
 
 }
 

-wxItemResource::~wxItemResource(void)
+wxItemResource::~wxItemResource()

 {
 {

-  if (itemType) delete[] itemType;
-  if (title) delete[] title;
-  if (name) delete[] name;
-  if (value4) delete[] value4;
-  if (stringValues)
-    delete stringValues;
-  if (bitmap)
-    delete bitmap;
-  if (backgroundColour)
-    delete backgroundColour;
-  if (labelColour)
-    delete labelColour;
-  if (buttonColour)
-    delete buttonColour;
-  wxNode *node = children.First();
+  wxNode *node = m_children.First();

   while (node)
   {
     wxItemResource *item = (wxItemResource *)node->Data();
     delete item;
     delete node;
   while (node)
   {
     wxItemResource *item = (wxItemResource *)node->Data();
     delete item;
     delete node;

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

   }
 }
 
   }
 }
 

-void wxItemResource::SetTitle(char *t)
-{
-  if (t == title)
-    return;
-    
-  if (title) delete[] title;
-  if (t)
-    title = copystring(t);
-  else
-    title = (char *) NULL;
-}
-
-void wxItemResource::SetType(char *t)
-{
-  if (itemType == t)
-    return;
-    
-  if (itemType) delete[] itemType;
-  if (t)
-    itemType = copystring(t);
-  else
-    itemType = (char *) NULL;
-}
-
-void wxItemResource::SetName(char *n)
-{
-  if (n == name)
-    return;
-    
-  if (name) delete[] name;
-  if (n)
-    name = copystring(n);
-  else
-    name = (char *) NULL;
-}
-
-void wxItemResource::SetStringValues(wxStringList *svalues)
-{
-  if (stringValues)
-    delete stringValues;
-  if (svalues)
-    stringValues = svalues;
-  else
-    stringValues = (wxStringList *) NULL;
-}
-
-void wxItemResource::SetValue4(char *v)
-{
-  if (value4 == v)
-    return;
-
-  if (value4) delete[] value4;
-  if (v)
-    value4 = copystring(v);
-  else
-    value4 = (char *) NULL;
-}
-

 /*
  * Resource table
  */
 /*
  * Resource table
  */

- 
-wxResourceTable::wxResourceTable(void):wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING)
+
+wxResourceTable::wxResourceTable():wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING)

 {
 }
 
 {
 }
 

-wxResourceTable::~wxResourceTable(void)
+wxResourceTable::~wxResourceTable()

 {
   ClearTable();
 }
 {
   ClearTable();
 }

-    
+

 wxItemResource *wxResourceTable::FindResource(const wxString& name) const
 {
   wxItemResource *item = (wxItemResource *)Get((char *)(const char *)name);
 wxItemResource *wxResourceTable::FindResource(const wxString& name) const
 {
   wxItemResource *item = (wxItemResource *)Get((char *)(const char *)name);


@@ -234,10 +172,10 @@ wxItemResource *wxResourceTable::FindResource(const wxString& name) const
 
 void wxResourceTable::AddResource(wxItemResource *item)
 {
 
 void wxResourceTable::AddResource(wxItemResource *item)
 {

-  char *name = item->GetName();
-  if (!name)
+  wxString name = item->GetName();
+  if (name == "")

     name = item->GetTitle();
     name = item->GetTitle();

-  if (!name)
+  if (name == "")

     name = "no name";
 
   // Delete existing resource, if any.
     name = "no name";
 
   // Delete existing resource, if any.


@@ -264,7 +202,7 @@ bool wxResourceTable::DeleteResource(const wxString& name)
         break;
       }
     }
         break;
       }
     }

-    
+

     delete item;
     return TRUE;
   }
     delete item;
     return TRUE;
   }


@@ -272,11 +210,11 @@ bool wxResourceTable::DeleteResource(const wxString& name)
     return FALSE;
 }
 
     return FALSE;
 }
 

-bool wxResourceTable::ParseResourceFile(char *filename)
+bool wxResourceTable::ParseResourceFile(const wxString& filename)

 {
 {

-  PrologDatabase db;
+  wxExprDatabase db;

 
 

-  FILE *fd = fopen(filename, "r");
+  FILE *fd = fopen((const char*) filename, "r");

   if (!fd)
     return FALSE;
   bool eof = FALSE;
   if (!fd)
     return FALSE;
   bool eof = FALSE;


@@ -288,10 +226,10 @@ bool wxResourceTable::ParseResourceFile(char *filename)
   return wxResourceInterpretResources(*this, db);
 }
 
   return wxResourceInterpretResources(*this, db);
 }
 

-bool wxResourceTable::ParseResourceData(char *data)
+bool wxResourceTable::ParseResourceData(const wxString& data)

 {
 {

-  PrologDatabase db;
-  if (!db.ReadPrologFromString(data))
+  wxExprDatabase db;
+  if (!db.ReadFromString(data))

   {
     wxLogWarning(_("Ill-formed resource file syntax."));
     return FALSE;
   {
     wxLogWarning(_("Ill-formed resource file syntax."));
     return FALSE;


@@ -300,7 +238,7 @@ bool wxResourceTable::ParseResourceData(char *data)
   return wxResourceInterpretResources(*this, db);
 }
 
   return wxResourceInterpretResources(*this, db);
 }
 

-bool wxResourceTable::RegisterResourceBitmapData(char *name, char bits[], int width, int height)
+bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char bits[], int width, int height)

 {
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;
 {
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;


@@ -314,7 +252,7 @@ bool wxResourceTable::RegisterResourceBitmapData(char *name, char bits[], int wi
   return TRUE;
 }
 
   return TRUE;
 }
 

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

 {
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;
 {
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;


@@ -326,12 +264,12 @@ bool wxResourceTable::RegisterResourceBitmapData(char *name, char **data)
   return TRUE;
 }
 
   return TRUE;
 }
 

-bool wxResourceTable::SaveResource(char *WXUNUSED(filename))
+bool wxResourceTable::SaveResource(const wxString& WXUNUSED(filename))

 {
   return FALSE;
 }
 
 {
   return FALSE;
 }
 

-void wxResourceTable::ClearTable(void)
+void wxResourceTable::ClearTable()

 {
   BeginFind();
   wxNode *node = Next();
 {
   BeginFind();
   wxNode *node = Next();


@@ -345,140 +283,140 @@ void wxResourceTable::ClearTable(void)
   }
 }
 
   }
 }
 

-wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childResource) const
+wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* childResource, const wxItemResource* parentResource) const

 {
   int id = childResource->GetId();
   if ( id == 0 )
    id = -1;
 
 {
   int id = childResource->GetId();
   if ( id == 0 )
    id = -1;
 

+  bool dlgUnits = ((parentResource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0);
+

   wxControl *control = (wxControl *) NULL;
   wxString itemType(childResource->GetType());
   wxControl *control = (wxControl *) NULL;
   wxString itemType(childResource->GetType());

+
+  wxPoint pos;
+  wxSize size;
+  if (dlgUnits)
+  {
+    pos = parent->ConvertDialogToPixels(wxPoint(childResource->GetX(), childResource->GetY()));
+    size = parent->ConvertDialogToPixels(wxSize(childResource->GetWidth(), childResource->GetHeight()));
+  }
+  else
+  {
+    pos = wxPoint(childResource->GetX(), childResource->GetY());
+    size = wxSize(childResource->GetWidth(), childResource->GetHeight());
+  }
+

   if (itemType == wxString("wxButton") || itemType == wxString("wxBitmapButton"))
       {
   if (itemType == wxString("wxButton") || itemType == wxString("wxBitmapButton"))
       {

-        if (childResource->GetValue4())
+        if (childResource->GetValue4() != "")

         {
           // Bitmap button
         {
           // Bitmap button

-          wxBitmap *bitmap = childResource->GetBitmap();
-          if (!bitmap)
+          wxBitmap bitmap = childResource->GetBitmap();
+          if (!bitmap.Ok())

           {
             bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
           {
             bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);

-            childResource->SetBitmap(bitmap);
+            ((wxItemResource*) childResource)->SetBitmap(bitmap);

           }
           }

-          if (bitmap)
-           control = new wxBitmapButton(parent, id, *bitmap,
-             wxPoint(childResource->GetX(), childResource->GetY()),
-          wxSize(childResource->GetWidth(), childResource->GetHeight()),
+          if (bitmap.Ok())
+           control = new wxBitmapButton(parent, id, bitmap, pos, size,

                childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
         }
         else
           // Normal, text button
                childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
         }
         else
           // Normal, text button

-          control = new wxButton(parent, id, childResource->GetTitle(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+          control = new wxButton(parent, id, childResource->GetTitle(), pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
    else if (itemType == wxString("wxMessage") || itemType == wxString("wxStaticText") ||
          itemType == wxString("wxStaticBitmap"))
       {
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
    else if (itemType == wxString("wxMessage") || itemType == wxString("wxStaticText") ||
          itemType == wxString("wxStaticBitmap"))
       {

-        if (childResource->GetValue4())
+        if (childResource->GetValue4() != "")

         {
           // Bitmap message
         {
           // Bitmap message

-          wxBitmap *bitmap = childResource->GetBitmap();
-          if (!bitmap)
+          wxBitmap bitmap = childResource->GetBitmap();
+          if (!bitmap.Ok())

           {
             bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);
           {
             bitmap = wxResourceCreateBitmap(childResource->GetValue4(), (wxResourceTable *)this);

-            childResource->SetBitmap(bitmap);
+            ((wxItemResource*) childResource)->SetBitmap(bitmap);

           }
           }

-#if USE_BITMAP_MESSAGE
-          if (bitmap)
-           control = new wxStaticBitmap(parent, id, *bitmap,
-             wxPoint(childResource->GetX(), childResource->GetY()),
-          wxSize(childResource->GetWidth(), childResource->GetHeight()),
+#if wxUSE_BITMAP_MESSAGE
+          if (bitmap.Ok())
+           control = new wxStaticBitmap(parent, id, bitmap, pos, size,

              childResource->GetStyle(), childResource->GetName());
 #endif
         }
         else
         {
              childResource->GetStyle(), childResource->GetName());
 #endif
         }
         else
         {

-           control = new wxStaticText(parent, id, childResource->GetTitle(),
-             wxPoint(childResource->GetX(), childResource->GetY()),
-          wxSize(childResource->GetWidth(), childResource->GetHeight()),
+           control = new wxStaticText(parent, id, childResource->GetTitle(), pos, size,

              childResource->GetStyle(), childResource->GetName());
         }
       }
    else if (itemType == wxString("wxText") || itemType == wxString("wxTextCtrl") || itemType == wxString("wxMultiText"))
       {
              childResource->GetStyle(), childResource->GetName());
         }
       }
    else if (itemType == wxString("wxText") || itemType == wxString("wxTextCtrl") || itemType == wxString("wxMultiText"))
       {

-        control = new wxTextCtrl(parent, id, childResource->GetValue4(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
    else if (itemType == wxString("wxCheckBox"))
       {
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
    else if (itemType == wxString("wxCheckBox"))
       {

-        control = new wxCheckBox(parent, id, childResource->GetTitle(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
       }
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
       }

-#if USE_GAUGE
+#if wxUSE_GAUGE

    else if (itemType == wxString("wxGauge"))
       {
    else if (itemType == wxString("wxGauge"))
       {

-        control = new wxGauge(parent, id, (int)childResource->GetValue2(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
       }
 #endif
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
       }
 #endif

-#if USE_RADIOBUTTON
+#if wxUSE_RADIOBUTTON

    else if (itemType == wxString("wxRadioButton"))
       {
         control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
    else if (itemType == wxString("wxRadioButton"))
       {
         control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),

-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+           pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
 #endif
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
 #endif

-#if USE_SCROLLBAR
+#if wxUSE_SCROLLBAR

    else if (itemType == wxString("wxScrollBar"))
       {
    else if (itemType == wxString("wxScrollBar"))
       {

-        control = new wxScrollBar(parent, id,
-           wxPoint(childResource->GetX(), childResource->GetY()),
-           wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxScrollBar(parent, id, pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());

+/*

         ((wxScrollBar *)control)->SetValue((int)childResource->GetValue1());
         ((wxScrollBar *)control)->SetPageSize((int)childResource->GetValue2());
         ((wxScrollBar *)control)->SetObjectLength((int)childResource->GetValue3());
         ((wxScrollBar *)control)->SetViewLength((int)(long)childResource->GetValue5());
         ((wxScrollBar *)control)->SetValue((int)childResource->GetValue1());
         ((wxScrollBar *)control)->SetPageSize((int)childResource->GetValue2());
         ((wxScrollBar *)control)->SetObjectLength((int)childResource->GetValue3());
         ((wxScrollBar *)control)->SetViewLength((int)(long)childResource->GetValue5());

+*/
+               ((wxScrollBar *)control)->SetScrollbar((int)childResource->GetValue1(),(int)childResource->GetValue2(),
+                       (int)childResource->GetValue3(),(int)(long)childResource->GetValue5(),FALSE);
+

       }
 #endif
    else if (itemType == wxString("wxSlider"))
       {
         control = new wxSlider(parent, id, (int)childResource->GetValue1(),
       }
 #endif
    else if (itemType == wxString("wxSlider"))
       {
         control = new wxSlider(parent, id, (int)childResource->GetValue1(),

-           (int)childResource->GetValue2(), (int)childResource->GetValue3(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-           wxSize(childResource->GetWidth(), childResource->GetHeight()),
+           (int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size,

            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
    else if (itemType == wxString("wxGroupBox") || itemType == wxString("wxStaticBox"))
       {
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
    else if (itemType == wxString("wxGroupBox") || itemType == wxString("wxStaticBox"))
       {

-        control = new wxStaticBox(parent, id, childResource->GetTitle(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size,

            childResource->GetStyle(), childResource->GetName());
       }
    else if (itemType == wxString("wxListBox"))
       {
            childResource->GetStyle(), childResource->GetName());
       }
    else if (itemType == wxString("wxListBox"))
       {

-        wxStringList *stringList = childResource->GetStringValues();
+        wxStringList& stringList = childResource->GetStringValues();

         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

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

         {
         {

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

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

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

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


@@ -487,9 +425,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
             node = node->Next();
           }
         }
             node = node->Next();
           }
         }

-        control = new wxListBox(parent, id,
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxListBox(parent, id, pos, size,

            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         if (strings)
            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         if (strings)


@@ -497,14 +433,14 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
       }
    else if (itemType == wxString("wxChoice"))
       {
       }
    else if (itemType == wxString("wxChoice"))
       {

-        wxStringList *stringList = childResource->GetStringValues();
+        wxStringList& stringList = childResource->GetStringValues();

         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

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

         {
         {

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

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

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

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


@@ -513,25 +449,23 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
             node = node->Next();
           }
         }
             node = node->Next();
           }
         }

-        control = new wxChoice(parent, id,
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxChoice(parent, id, pos, size,

            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         if (strings)
           delete[] strings;
       }
            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         if (strings)
           delete[] strings;
       }

-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX

    else if (itemType == wxString("wxComboBox"))
       {
    else if (itemType == wxString("wxComboBox"))
       {

-        wxStringList *stringList = childResource->GetStringValues();
+        wxStringList& stringList = childResource->GetStringValues();

         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

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

         {
         {

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

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

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

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


@@ -540,9 +474,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
             node = node->Next();
           }
         }
             node = node->Next();
           }
         }

-        control = new wxComboBox(parent, id, childResource->GetValue4(),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,

            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         if (strings)
            noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
 
         if (strings)


@@ -551,14 +483,14 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
 #endif
    else if (itemType == wxString("wxRadioBox"))
       {
 #endif
    else if (itemType == wxString("wxRadioBox"))
       {

-        wxStringList *stringList = childResource->GetStringValues();
+        wxStringList& stringList = childResource->GetStringValues();

         wxString *strings = (wxString *) NULL;
         int noStrings = 0;
         wxString *strings = (wxString *) NULL;
         int noStrings = 0;

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

         {
         {

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

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

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

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


@@ -567,9 +499,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
             node = node->Next();
           }
         }
             node = node->Next();
           }
         }

-        control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()),
-           wxPoint(childResource->GetX(), childResource->GetY()),
-         wxSize(childResource->GetWidth(), childResource->GetHeight()),
+        control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,

            noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
          childResource->GetName());
 
            noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
          childResource->GetName());
 


@@ -577,8 +507,15 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
           delete[] strings;
       }
 
           delete[] strings;
       }
 

-  if (control && childResource->GetFont())
-    control->SetFont(*childResource->GetFont());
+  if ((parentResource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
+  {
+    // Don't set font; will be inherited from parent.
+  }
+  else
+  {
+    if (control && childResource->GetFont().Ok())
+      control->SetFont(childResource->GetFont());
+  }

   return control;
 }
 
   return control;
 }
 


@@ -586,12 +523,12 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, wxItemResource *childRe
  * Interpret database as a series of resources
  */
 
  * Interpret database as a series of resources
  */
 

-bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db)
+bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)

 {
   wxNode *node = db.First();
   while (node)
   {
 {
   wxNode *node = db.First();
   while (node)
   {

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

    wxString functor(clause->Functor());
 
     wxItemResource *item = (wxItemResource *) NULL;
    wxString functor(clause->Functor());
 
     wxItemResource *item = (wxItemResource *) NULL;


@@ -613,7 +550,7 @@ bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db)
     if (item)
     {
       // Remove any existing resource of same name
     if (item)
     {
       // Remove any existing resource of same name

-      if (item->GetName())
+      if (item->GetName() != "")

         table.DeleteResource(item->GetName());
       table.AddResource(item);
     }
         table.DeleteResource(item->GetName());
       table.AddResource(item);
     }


@@ -622,17 +559,33 @@ bool wxResourceInterpretResources(wxResourceTable& table, PrologDatabase& db)
   return TRUE;
 }
 
   return TRUE;
 }
 

-static char *g_ValidControlClasses[] = { "wxButton", "wxBitmapButton", "wxMessage",
- "wxStaticText", "wxStaticBitmap", "wxText", "wxTextCtrl", "wxMultiText",
- "wxListBox", "wxRadioBox", "wxRadioButton", "wxCheckBox", "wxBitmapCheckBox",
- "wxGroupBox", "wxStaticBox", "wxSlider", "wxGauge", "wxScrollBar",
- "wxChoice", "wxComboBox" } ;
-static int g_ValidControlClassesCount = sizeof(g_ValidControlClasses) / sizeof(char *) ;
+static const char *g_ValidControlClasses[] =
+{
+    "wxButton",
+    "wxBitmapButton",
+    "wxMessage",
+    "wxStaticText",
+    "wxStaticBitmap",
+    "wxText",
+    "wxTextCtrl",
+    "wxMultiText",
+    "wxListBox",
+    "wxRadioBox",
+    "wxRadioButton",
+    "wxCheckBox",
+    "wxBitmapCheckBox",
+    "wxGroupBox",
+    "wxStaticBox",
+    "wxSlider",
+    "wxGauge",
+    "wxScrollBar",
+    "wxChoice",
+    "wxComboBox"
+};

 
 static bool wxIsValidControlClass(const wxString& c)
 {
 
 static bool wxIsValidControlClass(const wxString& c)
 {

-   int i;
-   for ( i = 0; i < g_ValidControlClassesCount; i++)
+   for ( size_t i = 0; i < WXSIZEOF(g_ValidControlClasses); i++ )

    {
       if ( c == g_ValidControlClasses[i] )
          return TRUE;
    {
       if ( c == g_ValidControlClasses[i] )
          return TRUE;


@@ -640,101 +593,99 @@ static bool wxIsValidControlClass(const wxString& c)
    return FALSE;
 }
 
    return FALSE;
 }
 

-wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *expr, bool isPanel)
+wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr, bool isPanel)

 {
   wxItemResource *dialogItem = new wxItemResource;
   if (isPanel)
     dialogItem->SetType("wxPanel");
   else
     dialogItem->SetType("wxDialog");
 {
   wxItemResource *dialogItem = new wxItemResource;
   if (isPanel)
     dialogItem->SetType("wxPanel");
   else
     dialogItem->SetType("wxDialog");

-  char *style = (char *) NULL;
-  char *title = (char *) NULL;
-  char *name = (char *) NULL;
-  char *backColourHex = (char *) NULL;
-  char *labelColourHex = (char *) NULL;
-  char *buttonColourHex = (char *) NULL;
+  wxString style = "";
+  wxString title = "";
+  wxString name = "";
+  wxString backColourHex = "";
+  wxString labelColourHex = "";
+  wxString buttonColourHex = "";

 
   long windowStyle = wxDEFAULT_DIALOG_STYLE;
   if (isPanel)
     windowStyle = 0;
 
   long windowStyle = wxDEFAULT_DIALOG_STYLE;
   if (isPanel)
     windowStyle = 0;

-    
+

   int x = 0; int y = 0; int width = -1; int height = -1;
   int isModal = 0;
   int x = 0; int y = 0; int width = -1; int height = -1;
   int isModal = 0;

-  PrologExpr *labelFontExpr = (PrologExpr *) NULL;
-  PrologExpr *buttonFontExpr = (PrologExpr *) NULL;
-  PrologExpr *fontExpr = (PrologExpr *) NULL;
-  expr->AssignAttributeValue("style", &style);
-  expr->AssignAttributeValue("name", &name);
-  expr->AssignAttributeValue("title", &title);
-  expr->AssignAttributeValue("x", &x);
-  expr->AssignAttributeValue("y", &y);
-  expr->AssignAttributeValue("width", &width);
-  expr->AssignAttributeValue("height", &height);
-  expr->AssignAttributeValue("modal", &isModal);
-  expr->AssignAttributeValue("label_font", &labelFontExpr);
-  expr->AssignAttributeValue("button_font", &buttonFontExpr);
-  expr->AssignAttributeValue("font", &fontExpr);
-  expr->AssignAttributeValue("background_colour", &backColourHex);
-  expr->AssignAttributeValue("label_colour", &labelColourHex);
-  expr->AssignAttributeValue("button_colour", &buttonColourHex);
+  wxExpr *labelFontExpr = (wxExpr *) NULL;
+  wxExpr *buttonFontExpr = (wxExpr *) NULL;
+  wxExpr *fontExpr = (wxExpr *) NULL;
+  expr->GetAttributeValue("style", style);
+  expr->GetAttributeValue("name", name);
+  expr->GetAttributeValue("title", title);
+  expr->GetAttributeValue("x", x);
+  expr->GetAttributeValue("y", y);
+  expr->GetAttributeValue("width", width);
+  expr->GetAttributeValue("height", height);
+  expr->GetAttributeValue("modal", isModal);
+  expr->GetAttributeValue("label_font", &labelFontExpr);
+  expr->GetAttributeValue("button_font", &buttonFontExpr);
+  expr->GetAttributeValue("font", &fontExpr);
+  expr->GetAttributeValue("background_colour", backColourHex);
+  expr->GetAttributeValue("label_colour", labelColourHex);
+  expr->GetAttributeValue("button_colour", buttonColourHex);
+
+  int useDialogUnits = 0;
+  expr->GetAttributeValue("use_dialog_units", useDialogUnits);
+  if (useDialogUnits != 0)
+    dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
+
+  int useDefaults = 0;
+  expr->GetAttributeValue("use_system_defaults", useDefaults);
+  if (useDefaults != 0)
+    dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);

 
   long id = 0;
   expr->GetAttributeValue("id", id);
   dialogItem->SetId(id);
 
 
   long id = 0;
   expr->GetAttributeValue("id", id);
   dialogItem->SetId(id);
 

-  if (style)
+  if (style != "")

   {
     windowStyle = wxParseWindowStyle(style);
   }
   dialogItem->SetStyle(windowStyle);
   dialogItem->SetValue1(isModal);
   {
     windowStyle = wxParseWindowStyle(style);
   }
   dialogItem->SetStyle(windowStyle);
   dialogItem->SetValue1(isModal);

-  if (name)
-    dialogItem->SetName(name);
-  if (title)
-    dialogItem->SetTitle(title);
+  dialogItem->SetName(name);
+  dialogItem->SetTitle(title);

   dialogItem->SetSize(x, y, width, height);
   dialogItem->SetSize(x, y, width, height);

-  
-  if (backColourHex)
+
+  if (backColourHex != "")

   {
     int r = 0;
     int g = 0;
     int b = 0;
   {
     int r = 0;
     int g = 0;
     int b = 0;

-    r = wxHexToDec(backColourHex);
-    g = wxHexToDec(backColourHex+2);
-    b = wxHexToDec(backColourHex+4);
-    dialogItem->SetBackgroundColour(new wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
-    delete[] backColourHex;
+    r = wxHexToDec(backColourHex.Mid(0, 2));
+    g = wxHexToDec(backColourHex.Mid(2, 2));
+    b = wxHexToDec(backColourHex.Mid(4, 2));
+    dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));

   }
   }

-  if (labelColourHex)
+  if (labelColourHex != "")

   {
     int r = 0;
     int g = 0;
     int b = 0;
   {
     int r = 0;
     int g = 0;
     int b = 0;

-    r = wxHexToDec(labelColourHex);
-    g = wxHexToDec(labelColourHex+2);
-    b = wxHexToDec(labelColourHex+4);
-    dialogItem->SetLabelColour(new wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
-    delete[] labelColourHex;
+    r = wxHexToDec(labelColourHex.Mid(0, 2));
+    g = wxHexToDec(labelColourHex.Mid(2, 2));
+    b = wxHexToDec(labelColourHex.Mid(4, 2));
+    dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));

   }
   }

-  if (buttonColourHex)
+  if (buttonColourHex != "")

   {
     int r = 0;
     int g = 0;
     int b = 0;
   {
     int r = 0;
     int g = 0;
     int b = 0;

-    r = wxHexToDec(buttonColourHex);
-    g = wxHexToDec(buttonColourHex+2);
-    b = wxHexToDec(buttonColourHex+4);
-    dialogItem->SetButtonColour(new wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
-    delete[] buttonColourHex;
+    r = wxHexToDec(buttonColourHex.Mid(0, 2));
+    g = wxHexToDec(buttonColourHex.Mid(2, 2));
+    b = wxHexToDec(buttonColourHex.Mid(4, 2));
+    dialogItem->SetButtonColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));

   }
 
   }
 

-  if (name)
-    delete[] name;
-  if (title)
-    delete[] title;
-  if (style)
-    delete[] style;
-

   if (fontExpr)
     dialogItem->SetFont(wxResourceInterpretFontSpec(fontExpr));
   else if (buttonFontExpr)
   if (fontExpr)
     dialogItem->SetFont(wxResourceInterpretFontSpec(fontExpr));
   else if (buttonFontExpr)


@@ -743,7 +694,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex
     dialogItem->SetFont(wxResourceInterpretFontSpec(labelFontExpr));
 
   // Now parse all controls
     dialogItem->SetFont(wxResourceInterpretFontSpec(labelFontExpr));
 
   // Now parse all controls

-  PrologExpr *controlExpr = expr->GetFirst();
+  wxExpr *controlExpr = expr->GetFirst();

   while (controlExpr)
   {
     if (controlExpr->Number() == 3)
   while (controlExpr)
   {
     if (controlExpr->Number() == 3)


@@ -752,7 +703,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex
       if (controlKeyword != "" && controlKeyword == "control")
       {
         // The value part: always a list.
       if (controlKeyword != "" && controlKeyword == "control")
       {
         // The value part: always a list.

-        PrologExpr *listExpr = controlExpr->Nth(2);
+        wxExpr *listExpr = controlExpr->Nth(2);

         if (listExpr->Type() == PrologList)
         {
           wxItemResource *controlItem = wxResourceInterpretControl(table, listExpr);
         if (listExpr->Type() == PrologList)
         {
           wxItemResource *controlItem = wxResourceInterpretControl(table, listExpr);


@@ -768,7 +719,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, PrologExpr *ex
   return dialogItem;
 }
 
   return dialogItem;
 }
 

-wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *expr)
+wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)

 {
   wxItemResource *controlItem = new wxItemResource;
 
 {
   wxItemResource *controlItem = new wxItemResource;
 


@@ -784,7 +735,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
   int x = 0; int y = 0; int width = -1; int height = -1;
   int count = 0;
 
   int x = 0; int y = 0; int width = -1; int height = -1;
   int count = 0;
 

-  PrologExpr *expr1 = expr->Nth(0);
+  wxExpr *expr1 = expr->Nth(0);

 
   if ( expr1->Type() == PrologString || expr1->Type() == PrologWord )
   {
 
   if ( expr1->Type() == PrologString || expr1->Type() == PrologWord )
   {


@@ -796,7 +747,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
    else
    {
         wxString str(expr1->StringValue());
    else
    {
         wxString str(expr1->StringValue());

-        id = wxResourceGetIdentifier(WXSTRINGCAST str, &table);
+        id = wxResourceGetIdentifier(str, &table);

         if (id == 0)
         {
           wxLogWarning(_("Could not resolve control class or id '%s'. "
         if (id == 0)
         {
           wxLogWarning(_("Could not resolve control class or id '%s'. "


@@ -832,7 +783,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
   if (expr1)
   {
     style = expr1->StringValue();
   if (expr1)
   {
     style = expr1->StringValue();

-    windowStyle = wxParseWindowStyle(WXSTRINGCAST style);
+    windowStyle = wxParseWindowStyle(style);

   }
 
   expr1 = expr->Nth(count);
   }
 
   expr1 = expr->Nth(count);


@@ -861,19 +812,36 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
     height = (int)expr1->IntegerValue();
 
   controlItem->SetStyle(windowStyle);
     height = (int)expr1->IntegerValue();
 
   controlItem->SetStyle(windowStyle);

-  controlItem->SetName(WXSTRINGCAST name);
-  controlItem->SetTitle(WXSTRINGCAST title);
+  controlItem->SetName(name);
+  controlItem->SetTitle(title);

   controlItem->SetSize(x, y, width, height);
   controlItem->SetSize(x, y, width, height);

-  controlItem->SetType(WXSTRINGCAST controlType);
+  controlItem->SetType(controlType);

   controlItem->SetId(id);
 
   if (controlType == "wxButton")
   controlItem->SetId(id);
 
   if (controlType == "wxButton")

+  {
+    // Check for bitmap resource name (in case loading old-style resource file)
+    if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
+    {
+        count ++;
+        wxString str(expr->Nth(count)->StringValue());
+
+        if (str != "")
+        {
+            controlItem->SetValue4(str);
+            controlItem->SetType("wxBitmapButton");
+        }
+    }
+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+  }
+  else if (controlType == "wxBitmapButton")

   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
     {
         wxString str(expr->Nth(count)->StringValue());
   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
     {
         wxString str(expr->Nth(count)->StringValue());

-        controlItem->SetValue4(WXSTRINGCAST str);
+        controlItem->SetValue4(str);

         count ++;
         if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
           controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
         count ++;
         if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
           controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));


@@ -890,7 +858,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
         controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }
         controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }

-#if USE_RADIOBUTTON
+#if wxUSE_RADIOBUTTON

   else if (controlType == "wxRadioButton")
   {
     // Check for default value
   else if (controlType == "wxRadioButton")
   {
     // Check for default value


@@ -909,7 +877,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
    {
       wxString str(expr->Nth(count)->StringValue());
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
    {
       wxString str(expr->Nth(count)->StringValue());

-      controlItem->SetValue4(WXSTRINGCAST str);
+      controlItem->SetValue4(str);

      count ++;
 
       if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
      count ++;
 
       if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)


@@ -923,16 +891,29 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
    }
   }
   else if (controlType == "wxMessage" || controlType == "wxStaticText")
    }
   }
   else if (controlType == "wxMessage" || controlType == "wxStaticText")

+  {
+    // Check for bitmap resource name (in case it's an old-style .wxr file)
+    if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
+    {
+      wxString str(expr->Nth(count)->StringValue());
+      controlItem->SetValue4(str);
+      count ++;
+      controlItem->SetType("wxStaticText");
+    }
+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+  }
+  else if (controlType == "wxStaticBitmap")

   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
     {
       wxString str(expr->Nth(count)->StringValue());
   {
     // Check for bitmap resource name
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
     {
       wxString str(expr->Nth(count)->StringValue());

-      controlItem->SetValue4(WXSTRINGCAST str);
+      controlItem->SetValue4(str);

       count ++;
       count ++;

-      if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-        controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));

     }
     }

+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));

   }
   else if (controlType == "wxGroupBox" || controlType == "wxStaticBox")
   {
   }
   else if (controlType == "wxGroupBox" || controlType == "wxStaticBox")
   {


@@ -1027,52 +1008,57 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
   }
   else if (controlType == "wxListBox")
   {
   }
   else if (controlType == "wxListBox")
   {

-    PrologExpr *valueList = (PrologExpr *) NULL;
+    wxExpr *valueList = (wxExpr *) NULL;

 
     if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
     {
 
     if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
     {

-      wxStringList *stringList = new wxStringList;
-      PrologExpr *stringExpr = valueList->GetFirst();
+      wxStringList stringList;
+      wxExpr *stringExpr = valueList->GetFirst();

       while (stringExpr)
       {
       while (stringExpr)
       {

-        stringList->Add(stringExpr->StringValue());
+        stringList.Add(stringExpr->StringValue());

         stringExpr = stringExpr->GetNext();
       }
       controlItem->SetStringValues(stringList);
      count ++;
         stringExpr = stringExpr->GetNext();
       }
       controlItem->SetStringValues(stringList);
      count ++;

-
+// This is now obsolete: it's in the window style.

       // Check for wxSINGLE/wxMULTIPLE
       // Check for wxSINGLE/wxMULTIPLE

-      PrologExpr *mult = (PrologExpr *) NULL;
+      wxExpr *mult = (wxExpr *) NULL;
+/*

       controlItem->SetValue1(wxLB_SINGLE);
       controlItem->SetValue1(wxLB_SINGLE);

+*/

       if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
       {
       if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
       {

+/*

         wxString m(mult->StringValue());
         wxString m(mult->StringValue());

-        if (m == "wxMULTIPLE")
+        if (m == "wxLB_MULTIPLE")

           controlItem->SetValue1(wxLB_MULTIPLE);
           controlItem->SetValue1(wxLB_MULTIPLE);

-        else if (m == "wxEXTENDED")
+        else if (m == "wxLB_EXTENDED")

           controlItem->SetValue1(wxLB_EXTENDED);
           controlItem->SetValue1(wxLB_EXTENDED);

+*/
+       // Ignore the value

        count ++;
        count ++;

-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-       {
-          // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+      }
+      if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      {
+         // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));

          count ++;
          count ++;

-          if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-            controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-       }
-     }
+         if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+           controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+      }

    }
   }
   else if (controlType == "wxChoice")
   {
    }
   }
   else if (controlType == "wxChoice")
   {

-    PrologExpr *valueList = (PrologExpr *) NULL;
+    wxExpr *valueList = (wxExpr *) NULL;

     // Check for default value list
     if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
     {
     // Check for default value list
     if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
     {

-      wxStringList *stringList = new wxStringList;
-      PrologExpr *stringExpr = valueList->GetFirst();
+      wxStringList stringList;
+      wxExpr *stringExpr = valueList->GetFirst();

       while (stringExpr)
       {
       while (stringExpr)
       {

-        stringList->Add(stringExpr->StringValue());
+        stringList.Add(stringExpr->StringValue());

         stringExpr = stringExpr->GetNext();
       }
       controlItem->SetStringValues(stringList);
         stringExpr = stringExpr->GetNext();
       }
       controlItem->SetStringValues(stringList);


@@ -1089,26 +1075,26 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
      }
    }
   }
      }
    }
   }

-#if USE_COMBOBOX
+#if wxUSE_COMBOBOX

   else if (controlType == "wxComboBox")
   {
   else if (controlType == "wxComboBox")
   {

-    PrologExpr *textValue = expr->Nth(count);
+    wxExpr *textValue = expr->Nth(count);

     if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
    {
       wxString str(textValue->StringValue());
     if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
    {
       wxString str(textValue->StringValue());

-      controlItem->SetValue4(WXSTRINGCAST str);
+      controlItem->SetValue4(str);

 
      count ++;
 
      count ++;

-      
-      PrologExpr *valueList = (PrologExpr *) NULL;
+
+      wxExpr *valueList = (wxExpr *) NULL;

       // Check for default value list
       if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
       {
       // Check for default value list
       if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
       {

-        wxStringList *stringList = new wxStringList;
-        PrologExpr *stringExpr = valueList->GetFirst();
+        wxStringList stringList;
+        wxExpr *stringExpr = valueList->GetFirst();

         while (stringExpr)
         {
         while (stringExpr)
         {

-          stringList->Add(stringExpr->StringValue());
+          stringList.Add(stringExpr->StringValue());

           stringExpr = stringExpr->GetNext();
         }
         controlItem->SetStringValues(stringList);
           stringExpr = stringExpr->GetNext();
         }
         controlItem->SetStringValues(stringList);


@@ -1127,18 +1113,18 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
    }
   }
 #endif
    }
   }
 #endif

-#if 0
+#if 1

   else if (controlType == "wxRadioBox")
   {
   else if (controlType == "wxRadioBox")
   {

-    PrologExpr *valueList = (PrologExpr *) NULL;
+    wxExpr *valueList = (wxExpr *) NULL;

     // Check for default value list
     if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
     {
     // Check for default value list
     if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
     {

-      wxStringList *stringList = new wxStringList;
-      PrologExpr *stringExpr = valueList->GetFirst();
+      wxStringList stringList;
+      wxExpr *stringExpr = valueList->GetFirst();

       while (stringExpr)
       {
       while (stringExpr)
       {

-        stringList->Add(stringExpr->StringValue());
+        stringList.Add(stringExpr->StringValue());

         stringExpr = stringExpr->GetNext();
       }
       controlItem->SetStringValues(stringList);
         stringExpr = stringExpr->GetNext();
       }
       controlItem->SetStringValues(stringList);


@@ -1172,21 +1158,21 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, PrologExpr *e
   return controlItem;
 }
 
   return controlItem;
 }
 

-// Forward declaration 
-wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, PrologExpr *expr);
+// Forward declaration
+wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr);

 
 /*
  * Interpet a menu item
  */
 
 
 /*
  * Interpet a menu item
  */
 

-wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *expr)
+wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr)

 {
   wxItemResource *item = new wxItemResource;
 {
   wxItemResource *item = new wxItemResource;

-  
-  PrologExpr *labelExpr = expr->Nth(0);
-  PrologExpr *idExpr = expr->Nth(1);
-  PrologExpr *helpExpr = expr->Nth(2);
-  PrologExpr *checkableExpr = expr->Nth(3);
+
+  wxExpr *labelExpr = expr->Nth(0);
+  wxExpr *idExpr = expr->Nth(1);
+  wxExpr *helpExpr = expr->Nth(2);
+  wxExpr *checkableExpr = expr->Nth(3);

 
   // Further keywords/attributes to follow sometime...
   if (expr->Number() == 0)
 
   // Further keywords/attributes to follow sometime...
   if (expr->Number() == 0)


@@ -1202,7 +1188,7 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *
     if (labelExpr)
     {
       wxString str(labelExpr->StringValue());
     if (labelExpr)
     {
       wxString str(labelExpr->StringValue());

-      item->SetTitle(WXSTRINGCAST str);
+      item->SetTitle(str);

     }
     if (idExpr)
     {
     }
     if (idExpr)
     {


@@ -1211,7 +1197,7 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *
       if ((idExpr->Type() == PrologString) || (idExpr->Type() == PrologWord))
       {
         wxString str(idExpr->StringValue());
       if ((idExpr->Type() == PrologString) || (idExpr->Type() == PrologWord))
       {
         wxString str(idExpr->StringValue());

-        id = wxResourceGetIdentifier(WXSTRINGCAST str, &table);
+        id = wxResourceGetIdentifier(str, &table);

         if (id == 0)
         {
           wxLogWarning(_("Could not resolve menu id '%s'. "
         if (id == 0)
         {
           wxLogWarning(_("Could not resolve menu id '%s'. "


@@ -1227,16 +1213,16 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *
     if (helpExpr)
     {
       wxString str(helpExpr->StringValue());
     if (helpExpr)
     {
       wxString str(helpExpr->StringValue());

-      item->SetValue4(WXSTRINGCAST str);
+      item->SetValue4(str);

     }
     if (checkableExpr)
       item->SetValue2(checkableExpr->IntegerValue());
 
     // Find the first expression that's a list, for submenu
     }
     if (checkableExpr)
       item->SetValue2(checkableExpr->IntegerValue());
 
     // Find the first expression that's a list, for submenu

-    PrologExpr *subMenuExpr = expr->GetFirst();
+    wxExpr *subMenuExpr = expr->GetFirst();

     while (subMenuExpr && (subMenuExpr->Type() != PrologList))
       subMenuExpr = subMenuExpr->GetNext();
     while (subMenuExpr && (subMenuExpr->Type() != PrologList))
       subMenuExpr = subMenuExpr->GetNext();

-      
+

     while (subMenuExpr)
     {
       wxItemResource *child = wxResourceInterpretMenuItem(table, subMenuExpr);
     while (subMenuExpr)
     {
       wxItemResource *child = wxResourceInterpretMenuItem(table, subMenuExpr);


@@ -1251,12 +1237,12 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, PrologExpr *
  * Interpret a nested list as a menu
  */
 /*
  * Interpret a nested list as a menu
  */
 /*

-wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, PrologExpr *expr)
+wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr)

 {
   wxItemResource *menu = new wxItemResource;
 //  menu->SetType(wxTYPE_MENU);
   menu->SetType("wxMenu");
 {
   wxItemResource *menu = new wxItemResource;
 //  menu->SetType(wxTYPE_MENU);
   menu->SetType("wxMenu");

-  PrologExpr *element = expr->GetFirst();
+  wxExpr *element = expr->GetFirst();

   while (element)
   {
     wxItemResource *item = wxResourceInterpretMenuItem(table, element);
   while (element)
   {
     wxItemResource *item = wxResourceInterpretMenuItem(table, element);


@@ -1268,41 +1254,39 @@ wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, PrologExpr *exp
 }
 */
 
 }
 */
 

-wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, PrologExpr *expr)
+wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)

 {
 {

-  PrologExpr *listExpr = (PrologExpr *) NULL;
-  expr->AssignAttributeValue("menu", &listExpr);
+  wxExpr *listExpr = (wxExpr *) NULL;
+  expr->GetAttributeValue("menu", &listExpr);

   if (!listExpr)
     return (wxItemResource *) NULL;
   if (!listExpr)
     return (wxItemResource *) NULL;

-  
+

   wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
 
   if (!menuResource)
     return (wxItemResource *) NULL;
   wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
 
   if (!menuResource)
     return (wxItemResource *) NULL;

-    
-  char *name = (char *) NULL;
-  expr->AssignAttributeValue("name", &name);
-  if (name)
+
+  wxString name;
+  if (expr->GetAttributeValue("name", name))

   {
     menuResource->SetName(name);
   {
     menuResource->SetName(name);

-    delete[] name;

   }
   }

-  
+

   return menuResource;
 }
 
   return menuResource;
 }
 

-wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *expr)
+wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)

 {
 {

-  PrologExpr *listExpr = (PrologExpr *) NULL;
-  expr->AssignAttributeValue("menu", &listExpr);
+  wxExpr *listExpr = (wxExpr *) NULL;
+  expr->GetAttributeValue("menu", &listExpr);

   if (!listExpr)
     return (wxItemResource *) NULL;
 
   wxItemResource *resource = new wxItemResource;
   resource->SetType("wxMenu");
 //  resource->SetType(wxTYPE_MENU);
   if (!listExpr)
     return (wxItemResource *) NULL;
 
   wxItemResource *resource = new wxItemResource;
   resource->SetType("wxMenu");
 //  resource->SetType(wxTYPE_MENU);

-  
-  PrologExpr *element = listExpr->GetFirst();
+
+  wxExpr *element = listExpr->GetFirst();

   while (element)
   {
     wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
   while (element)
   {
     wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);


@@ -1310,36 +1294,32 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, PrologExpr *e
     element = element->GetNext();
   }
 
     element = element->GetNext();
   }
 

-  char *name = (char *) NULL;
-  expr->AssignAttributeValue("name", &name);
-  if (name)
+  wxString name;
+  if (expr->GetAttributeValue("name", name))

   {
     resource->SetName(name);
   {
     resource->SetName(name);

-    delete[] name;

   }
   }

-  
+

   return resource;
 }
 
   return resource;
 }
 

-wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), PrologExpr *WXUNUSED(expr))
+wxItemResource *wxResourceInterpretString(wxResourceTable& WXUNUSED(table), wxExpr *WXUNUSED(expr))

 {
   return (wxItemResource *) NULL;
 }
 
 {
   return (wxItemResource *) NULL;
 }
 

-wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), PrologExpr *expr)
+wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxExpr *expr)

 {
   wxItemResource *bitmapItem = new wxItemResource;
 //  bitmapItem->SetType(wxTYPE_BITMAP);
   bitmapItem->SetType("wxBitmap");
 {
   wxItemResource *bitmapItem = new wxItemResource;
 //  bitmapItem->SetType(wxTYPE_BITMAP);
   bitmapItem->SetType("wxBitmap");

-  char *name = (char *) NULL;
-  expr->AssignAttributeValue("name", &name);
-  if (name)
+  wxString name;
+  if (expr->GetAttributeValue("name", name))

   {
     bitmapItem->SetName(name);
   {
     bitmapItem->SetName(name);

-    delete[] name;

   }
   // Now parse all bitmap specifications
   }
   // Now parse all bitmap specifications

-  PrologExpr *bitmapExpr = expr->GetFirst();
+  wxExpr *bitmapExpr = expr->GetFirst();

   while (bitmapExpr)
   {
     if (bitmapExpr->Number() == 3)
   while (bitmapExpr)
   {
     if (bitmapExpr->Number() == 3)


@@ -1348,7 +1328,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), Prol
       if (bitmapKeyword == "bitmap" || bitmapKeyword == "icon")
       {
         // The value part: always a list.
       if (bitmapKeyword == "bitmap" || bitmapKeyword == "icon")
       {
         // The value part: always a list.

-        PrologExpr *listExpr = bitmapExpr->Nth(2);
+        wxExpr *listExpr = bitmapExpr->Nth(2);

         if (listExpr->Type() == PrologList)
         {
           wxItemResource *bitmapSpec = new wxItemResource;
         if (listExpr->Type() == PrologList)
         {
           wxItemResource *bitmapSpec = new wxItemResource;


@@ -1357,26 +1337,24 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), Prol
 
           // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
           // where everything after 'filename' is optional.
 
           // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
           // where everything after 'filename' is optional.

-          PrologExpr *nameExpr = listExpr->Nth(0);
-          PrologExpr *typeExpr = listExpr->Nth(1);
-          PrologExpr *platformExpr = listExpr->Nth(2);
-          PrologExpr *coloursExpr = listExpr->Nth(3);
-          PrologExpr *xresExpr = listExpr->Nth(4);
-          PrologExpr *yresExpr = listExpr->Nth(5);
-          if (nameExpr && nameExpr->StringValue())
+          wxExpr *nameExpr = listExpr->Nth(0);
+          wxExpr *typeExpr = listExpr->Nth(1);
+          wxExpr *platformExpr = listExpr->Nth(2);
+          wxExpr *coloursExpr = listExpr->Nth(3);
+          wxExpr *xresExpr = listExpr->Nth(4);
+          wxExpr *yresExpr = listExpr->Nth(5);
+          if (nameExpr && nameExpr->StringValue() != "")

           {
           {

-            wxString str(nameExpr->StringValue());
-            bitmapSpec->SetName(WXSTRINGCAST str);
+            bitmapSpec->SetName(nameExpr->StringValue());

           }
           }

-          if (typeExpr && typeExpr->StringValue())
+          if (typeExpr && typeExpr->StringValue() != "")

           {
           {

-            wxString str(typeExpr->StringValue());
-            bitmapSpec->SetValue1(wxParseWindowStyle(WXSTRINGCAST str));
+            bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));

           }
           else
             bitmapSpec->SetValue1(0);
           }
           else
             bitmapSpec->SetValue1(0);

-            
-          if (platformExpr && platformExpr->StringValue())
+
+          if (platformExpr && platformExpr->StringValue() != "")

           {
             wxString plat(platformExpr->StringValue());
             if (plat == "windows" || plat == "WINDOWS")
           {
             wxString plat(platformExpr->StringValue());
             if (plat == "windows" || plat == "WINDOWS")


@@ -1400,18 +1378,18 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), Prol
           if (yresExpr)
             yres = (int)yresExpr->IntegerValue();
           bitmapSpec->SetSize(0, 0, xres, yres);
           if (yresExpr)
             yres = (int)yresExpr->IntegerValue();
           bitmapSpec->SetSize(0, 0, xres, yres);

-            
+

           bitmapItem->GetChildren().Append(bitmapSpec);
         }
       }
     }
     bitmapExpr = bitmapExpr->GetNext();
   }
           bitmapItem->GetChildren().Append(bitmapSpec);
         }
       }
     }
     bitmapExpr = bitmapExpr->GetNext();
   }

-  
+

   return bitmapItem;
 }
 
   return bitmapItem;
 }
 

-wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, PrologExpr *expr)
+wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr)

 {
   wxItemResource *item = wxResourceInterpretBitmap(table, expr);
   if (item)
 {
   wxItemResource *item = wxResourceInterpretBitmap(table, expr);
   if (item)


@@ -1425,10 +1403,10 @@ wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, PrologExpr *expr
 }
 
 // Interpret list expression as a font
 }
 
 // Interpret list expression as a font

-wxFont *wxResourceInterpretFontSpec(PrologExpr *expr)
+wxFont wxResourceInterpretFontSpec(wxExpr *expr)

 {
   if (expr->Type() != PrologList)
 {
   if (expr->Type() != PrologList)

-    return (wxFont *) NULL;
+    return wxNullFont;

 
   int point = 10;
   int family = wxSWISS;
 
   int point = 10;
   int family = wxSWISS;


@@ -1436,13 +1414,13 @@ wxFont *wxResourceInterpretFontSpec(PrologExpr *expr)
   int weight = wxNORMAL;
   int underline = 0;
   wxString faceName("");
   int weight = wxNORMAL;
   int underline = 0;
   wxString faceName("");

-  
-  PrologExpr *pointExpr = expr->Nth(0);
-  PrologExpr *familyExpr = expr->Nth(1);
-  PrologExpr *styleExpr = expr->Nth(2);
-  PrologExpr *weightExpr = expr->Nth(3);
-  PrologExpr *underlineExpr = expr->Nth(4);
-  PrologExpr *faceNameExpr = expr->Nth(5);
+
+  wxExpr *pointExpr = expr->Nth(0);
+  wxExpr *familyExpr = expr->Nth(1);
+  wxExpr *styleExpr = expr->Nth(2);
+  wxExpr *weightExpr = expr->Nth(3);
+  wxExpr *underlineExpr = expr->Nth(4);
+  wxExpr *faceNameExpr = expr->Nth(5);

   if (pointExpr)
     point = (int)pointExpr->IntegerValue();
 
   if (pointExpr)
     point = (int)pointExpr->IntegerValue();
 


@@ -1450,35 +1428,35 @@ wxFont *wxResourceInterpretFontSpec(PrologExpr *expr)
   if (familyExpr)
   {
     str = familyExpr->StringValue();
   if (familyExpr)
   {
     str = familyExpr->StringValue();

-    family = (int)wxParseWindowStyle(WXSTRINGCAST str);
+    family = (int)wxParseWindowStyle(str);

   }
   if (styleExpr)
   {
     str = styleExpr->StringValue();
   }
   if (styleExpr)
   {
     str = styleExpr->StringValue();

-    style = (int)wxParseWindowStyle(WXSTRINGCAST str);
+    style = (int)wxParseWindowStyle(str);

   }
   if (weightExpr)
   {
     str = weightExpr->StringValue();
   }
   if (weightExpr)
   {
     str = weightExpr->StringValue();

-    weight = (int)wxParseWindowStyle(WXSTRINGCAST str);
+    weight = (int)wxParseWindowStyle(str);

   }
   if (underlineExpr)
     underline = (int)underlineExpr->IntegerValue();
   if (faceNameExpr)
     faceName = faceNameExpr->StringValue();
 
   }
   if (underlineExpr)
     underline = (int)underlineExpr->IntegerValue();
   if (faceNameExpr)
     faceName = faceNameExpr->StringValue();
 

-  char *faceName1 = (char *) NULL;
-  if (faceName != "")
-    faceName1 = WXSTRINGCAST faceName;
-  wxFont *font = wxTheFontList->FindOrCreateFont(point, family, style, weight, (underline != 0), faceName1);
+  wxFont font(point, family, style, weight, (underline != 0), faceName);

   return font;
 }
 
   return font;
 }
 

+// Separate file for the remainder of this, for BC++/Win16
+
+#if !((defined(__BORLANDC__) || defined(__SC__)) && defined(__WIN16__))

 /*
  * (Re)allocate buffer for reading in from resource file
  */
 
 /*
  * (Re)allocate buffer for reading in from resource file
  */
 

-bool wxReallocateResourceBuffer(void)
+bool wxReallocateResourceBuffer()

 {
   if (!wxResourceBuffer)
   {
 {
   if (!wxResourceBuffer)
   {


@@ -1595,7 +1573,7 @@ bool wxGetResourceToken(FILE *fd)
         wxReallocateResourceBuffer();
       wxResourceBuffer[wxResourceBufferCount] = (char)ch;
       wxResourceBufferCount ++;
         wxReallocateResourceBuffer();
       wxResourceBuffer[wxResourceBufferCount] = (char)ch;
       wxResourceBufferCount ++;

-      
+

       ch = getc(fd);
     }
     wxResourceBuffer[wxResourceBufferCount] = 0;
       ch = getc(fd);
     }
     wxResourceBuffer[wxResourceBufferCount] = 0;


@@ -1610,12 +1588,12 @@ bool wxGetResourceToken(FILE *fd)
   static char *name = "....";
   with possible comments.
  */
   static char *name = "....";
   with possible comments.
  */

- 
-bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResourceTable *table)
+
+bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   // static or #define
   if (!wxGetResourceToken(fd))
   {
   // static or #define
   if (!wxGetResourceToken(fd))
   {


@@ -1643,7 +1621,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
     }
     delete[] name;
     delete[] value;
     }
     delete[] name;
     delete[] value;

- 
+

     return TRUE;
   }
   else if (strcmp(wxResourceBuffer, "#include") == 0)
     return TRUE;
   }
   else if (strcmp(wxResourceBuffer, "#include") == 0)


@@ -1686,7 +1664,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
     wxLogWarning(_("Expected 'char' whilst parsing resource."));
     return FALSE;
   }
     wxLogWarning(_("Expected 'char' whilst parsing resource."));
     return FALSE;
   }

-    
+

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


@@ -1702,7 +1680,7 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
   }
   char nameBuf[100];
   strncpy(nameBuf, wxResourceBuffer+1, 99);
   }
   char nameBuf[100];
   strncpy(nameBuf, wxResourceBuffer+1, 99);

-    
+

   // =
   if (!wxGetResourceToken(fd))
   {
   // =
   if (!wxGetResourceToken(fd))
   {


@@ -1743,16 +1721,16 @@ bool wxResourceReadOneResource(FILE *fd, PrologDatabase& db, bool *eof, wxResour
 /*
  * Parses string window style into integer window style
  */
 /*
  * Parses string window style into integer window style
  */

- 
+

 /*
  * Style flag parsing, e.g.
  * "wxSYSTEM_MENU | wxBORDER" -> integer
  */
 
 /*
  * Style flag parsing, e.g.
  * "wxSYSTEM_MENU | wxBORDER" -> integer
  */
 

-char *wxResourceParseWord(char *s, int *i)
+char* wxResourceParseWord(char*s, int *i)

 {
   if (!s)
 {
   if (!s)

-    return (char *) NULL;
+    return (char*) NULL;

 
   static char buf[150];
   int len = strlen(s);
 
   static char buf[150];
   int len = strlen(s);


@@ -1774,7 +1752,7 @@ char *wxResourceParseWord(char *s, int *i)
   }
   *i = ii;
   if (j == 0)
   }
   *i = ii;
   if (j == 0)

-    return (char *) NULL;
+    return (char*) NULL;

   else
     return buf;
 }
   else
     return buf;
 }


@@ -1799,13 +1777,13 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxLB_SORT", wxLB_SORT },
   { "wxLB_OWNERDRAW", wxLB_OWNERDRAW },
   { "wxLB_HSCROLL", wxLB_HSCROLL },
   { "wxLB_SORT", wxLB_SORT },
   { "wxLB_OWNERDRAW", wxLB_OWNERDRAW },
   { "wxLB_HSCROLL", wxLB_HSCROLL },

-  
+

   /* wxComboxBox */
   { "wxCB_SIMPLE", wxCB_SIMPLE },
   { "wxCB_DROPDOWN", wxCB_DROPDOWN },
   { "wxCB_READONLY", wxCB_READONLY },
   { "wxCB_SORT", wxCB_SORT },
   /* wxComboxBox */
   { "wxCB_SIMPLE", wxCB_SIMPLE },
   { "wxCB_DROPDOWN", wxCB_DROPDOWN },
   { "wxCB_READONLY", wxCB_READONLY },
   { "wxCB_SORT", wxCB_SORT },

-  
+

   /* wxGauge */
   { "wxGA_PROGRESSBAR", wxGA_PROGRESSBAR },
   { "wxGA_HORIZONTAL", wxGA_HORIZONTAL },
   /* wxGauge */
   { "wxGA_PROGRESSBAR", wxGA_PROGRESSBAR },
   { "wxGA_HORIZONTAL", wxGA_HORIZONTAL },


@@ -1821,6 +1799,8 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
 
   /* wxRadioBox/wxRadioButton */
   { "wxRB_GROUP", wxRB_GROUP },
 
   /* wxRadioBox/wxRadioButton */
   { "wxRB_GROUP", wxRB_GROUP },

+  { "wxRA_SPECIFY_COLS", wxRA_SPECIFY_COLS },
+  { "wxRA_SPECIFY_ROWS", wxRA_SPECIFY_ROWS },

   { "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
   { "wxRA_VERTICAL", wxRA_VERTICAL },
 
   { "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
   { "wxRA_VERTICAL", wxRA_VERTICAL },
 


@@ -1892,7 +1872,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxALIGN_CENTRE", wxALIGN_CENTRE},
   { "wxALIGN_RIGHT", wxALIGN_RIGHT},
   { "wxCOLOURED", wxCOLOURED},
   { "wxALIGN_CENTRE", wxALIGN_CENTRE},
   { "wxALIGN_RIGHT", wxALIGN_RIGHT},
   { "wxCOLOURED", wxCOLOURED},

-  
+

   /* wxToolBar */
   { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
   { "wxTB_HORIZONTAL", wxTB_HORIZONTAL},
   /* wxToolBar */
   { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
   { "wxTB_HORIZONTAL", wxTB_HORIZONTAL},


@@ -1916,7 +1896,8 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
   { "wxMINIMIZE_BOX", wxMINIMIZE_BOX},
   { "wxMAXIMIZE_BOX", wxMAXIMIZE_BOX},
   { "wxRESIZE_BOX", wxRESIZE_BOX},
   { "wxMINIMIZE_BOX", wxMINIMIZE_BOX},
   { "wxMAXIMIZE_BOX", wxMAXIMIZE_BOX},
   { "wxRESIZE_BOX", wxRESIZE_BOX},

-  { "wxDEFAULT_FRAME", wxDEFAULT_FRAME},
+  { "wxDEFAULT_FRAME_STYLE", wxDEFAULT_FRAME_STYLE},
+  { "wxDEFAULT_FRAME", wxDEFAULT_FRAME_STYLE},

   { "wxDEFAULT_DIALOG_STYLE", wxDEFAULT_DIALOG_STYLE},
   { "wxBORDER", wxBORDER},
   { "wxRETAINED", wxRETAINED},
   { "wxDEFAULT_DIALOG_STYLE", wxDEFAULT_DIALOG_STYLE},
   { "wxBORDER", wxBORDER},
   { "wxRETAINED", wxRETAINED},


@@ -2037,12 +2018,12 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
 
 static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));
 
 
 static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));
 

-long wxParseWindowStyle(char *bitListString)
+long wxParseWindowStyle(const wxString& bitListString)

 {
   int i = 0;
   char *word;
   long bitList = 0;
 {
   int i = 0;
   char *word;
   long bitList = 0;

-  while ((word = wxResourceParseWord(bitListString, &i)))
+  while ((word = wxResourceParseWord((char*) (const char*) bitListString, &i)))

   {
     bool found = FALSE;
     int j;
   {
     bool found = FALSE;
     int j;


@@ -2066,25 +2047,25 @@ long wxParseWindowStyle(char *bitListString)
  * Load a bitmap from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */
  * Load a bitmap from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */

- 
-wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
+
+wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {

-    if (!item->GetType() || strcmp(item->GetType(), "wxBitmap") != 0)
+    if ((item->GetType() == "") || (item->GetType() != "wxBitmap"))

     {
     {

-      wxLogWarning(_("%s not a bitmap resource specification."), resource);
-      return (wxBitmap *) NULL;
+      wxLogWarning(_("%s not a bitmap resource specification."), (const char*) resource);
+      return wxNullBitmap;

     }
     int thisDepth = wxDisplayDepth();
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;
     }
     int thisDepth = wxDisplayDepth();
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;

-    
+

     // Try to find optimum bitmap for this platform/colour depth
     wxNode *node = item->GetChildren().First();
     while (node)
     // Try to find optimum bitmap for this platform/colour depth
     wxNode *node = item->GetChildren().First();
     while (node)


@@ -2164,11 +2145,10 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
     }
     // If no matching resource, fail.
     if (!optResource)
     }
     // If no matching resource, fail.
     if (!optResource)

-      return (wxBitmap *) NULL;
+      return wxNullBitmap;

 
 

-    char *name = optResource->GetName();
+    wxString name = optResource->GetName();

     int bitmapType = (int)optResource->GetValue1();
     int bitmapType = (int)optResource->GetValue1();

-    wxBitmap *bitmap = (wxBitmap *) NULL;

     switch (bitmapType)
     {
       case wxBITMAP_TYPE_XBM_DATA:
     switch (bitmapType)
     {
       case wxBITMAP_TYPE_XBM_DATA:


@@ -2178,10 +2158,10 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
         if (!item)
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"
         if (!item)
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"

-                         "Forgot to use wxResourceLoadBitmapData?"), name);
-          return (wxBitmap *) NULL;
+                         "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
+          return wxNullBitmap;

         }
         }

-        bitmap = new wxBitmap((char *)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()); 
+        return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;

 #else
         wxLogWarning(_("No XBM facility available!"));
 #endif
 #else
         wxLogWarning(_("No XBM facility available!"));
 #endif


@@ -2189,15 +2169,15 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {

-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
+#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)

         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
           wxLogWarning(_("Failed to find XPM resource %s.\n"
         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
           wxLogWarning(_("Failed to find XPM resource %s.\n"

-                         "Forgot to use wxResourceLoadBitmapData?"), name);
-          return (wxBitmap *) NULL;
+                         "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
+          return wxNullBitmap;

         }
         }

-        bitmap = new wxBitmap(item->GetValue1());
+        return wxBitmap((char **)item->GetValue1());

 #else
         wxLogWarning(_("No XPM facility available!"));
 #endif
 #else
         wxLogWarning(_("No XPM facility available!"));
 #endif


@@ -2205,27 +2185,16 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
       }
       default:
       {
       }
       default:
       {

-        bitmap = new wxBitmap(name, bitmapType);
+        return wxBitmap(name, bitmapType);

         break;
       }
     }
         break;
       }
     }

-    if (!bitmap)
-      return (wxBitmap *) NULL;
-      
-    if (bitmap->Ok())
-    {
-      return bitmap;
-    }
-    else
-    {
-      delete bitmap;
-      return (wxBitmap *) NULL;
-    }
+    return wxNullBitmap;

   }
   else
   {
   }
   else
   {

-    wxLogWarning(_("Bitmap resource specification %s not found."), resource);
-    return (wxBitmap *) NULL;
+    wxLogWarning(_("Bitmap resource specification %s not found."), (const char*) resource);
+    return wxNullBitmap;

   }
 }
 
   }
 }
 


@@ -2233,25 +2202,25 @@ wxBitmap *wxResourceCreateBitmap(char *resource, wxResourceTable *table)
  * Load an icon from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */
  * Load an icon from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */

- 
-wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
+
+wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)

 {
   if (!table)
 {
   if (!table)

-  table = wxDefaultResourceTable;
-  
+    table = wxDefaultResourceTable;
+

   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {

-    if (!item->GetType() || strcmp(item->GetType(), "wxIcon") != 0)
+    if ((item->GetType() == "") || strcmp(item->GetType(), "wxIcon") != 0)

     {
     {

-      wxLogWarning(_("%s not an icon resource specification."), resource);
-      return (wxIcon *) NULL;
+      wxLogWarning(_("%s not an icon resource specification."), (const char*) resource);
+      return wxNullIcon;

     }
     int thisDepth = wxDisplayDepth();
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;
     }
     int thisDepth = wxDisplayDepth();
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;

-    
+

     // Try to find optimum icon for this platform/colour depth
     wxNode *node = item->GetChildren().First();
     while (node)
     // Try to find optimum icon for this platform/colour depth
     wxNode *node = item->GetChildren().First();
     while (node)


@@ -2331,11 +2300,10 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
     }
     // If no matching resource, fail.
     if (!optResource)
     }
     // If no matching resource, fail.
     if (!optResource)

-      return (wxIcon *) NULL;
+      return wxNullIcon;

 
 

-    char *name = optResource->GetName();
+    wxString name = optResource->GetName();

     int bitmapType = (int)optResource->GetValue1();
     int bitmapType = (int)optResource->GetValue1();

-    wxIcon *icon = (wxIcon *) NULL;

     switch (bitmapType)
     {
       case wxBITMAP_TYPE_XBM_DATA:
     switch (bitmapType)
     {
       case wxBITMAP_TYPE_XBM_DATA:


@@ -2345,10 +2313,10 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
         if (!item)
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"
         if (!item)
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"

-                         "Forgot to use wxResourceLoadIconData?"), name);
-          return (wxIcon *) NULL;
+                         "Forgot to use wxResourceLoadIconData?"), (const char*) name);
+          return wxNullIcon;

         }
         }

-        icon = new wxIcon((char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()); 
+        return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());

 #else
         wxLogWarning(_("No XBM facility available!"));
 #endif
 #else
         wxLogWarning(_("No XBM facility available!"));
 #endif


@@ -2358,7 +2326,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
       {
       // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
 /*
       {
       // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
 /*

-#if (defined(__WXGTK__)) || (defined(__WXMSW__) && USE_XPM_IN_MSW)
+#if (defined(__WXGTK__)) || (defined(__WXMSW__) && wxUSE_XPM_IN_MSW)

         wxItemResource *item = table->FindResource(name);
         if (!item)
         {
         wxItemResource *item = table->FindResource(name);
         if (!item)
         {


@@ -2367,7 +2335,7 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
           wxLogWarning(buf);
           return NULL;
         }
           wxLogWarning(buf);
           return NULL;
         }

-        icon = new wxIcon((char **)item->GetValue1());
+        return wxIcon((char **)item->GetValue1());

 #else
         wxLogWarning(_("No XPM facility available!"));
 #endif
 #else
         wxLogWarning(_("No XPM facility available!"));
 #endif


@@ -2378,30 +2346,19 @@ wxIcon *wxResourceCreateIcon(char *resource, wxResourceTable *table)
       default:
       {
 #ifdef __WXGTK__
       default:
       {
 #ifdef __WXGTK__

-        wxLogWarning(_("Icon resource specification %s not found."), resource);
+        wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);

 #else
 #else

-        icon = new wxIcon(name, bitmapType);
+        return wxIcon(name, bitmapType);

 #endif
         break;
       }
     }
 #endif
         break;
       }
     }

-    if (!icon)
-      return (wxIcon *) NULL;
-      
-    if (icon->Ok())
-    {
-      return icon;
-    }
-    else
-    {
-      delete icon;
-      return (wxIcon *) NULL;
-    }
+    return wxNullIcon;

   }
   else
   {
   }
   else
   {

-    wxLogWarning(_("Icon resource specification %s not found."), resource);
-    return (wxIcon *) NULL;
+    wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);
+    return wxNullIcon;

   }
 }
 
   }
 }
 


@@ -2412,7 +2369,7 @@ wxMenu *wxResourceCreateMenu(wxItemResource *item)
   while (node)
   {
     wxItemResource *child = (wxItemResource *)node->Data();
   while (node)
   {
     wxItemResource *child = (wxItemResource *)node->Data();

-    if (child->GetType() && strcmp(child->GetType(), "wxMenuSeparator") == 0)
+    if ((child->GetType() != "") && (child->GetType() == "wxMenuSeparator"))

       menu->AppendSeparator();
     else if (child->GetChildren().Number() > 0)
     {
       menu->AppendSeparator();
     else if (child->GetChildren().Number() > 0)
     {


@@ -2429,13 +2386,13 @@ wxMenu *wxResourceCreateMenu(wxItemResource *item)
   return menu;
 }
 
   return menu;
 }
 

-wxMenuBar *wxResourceCreateMenuBar(char *resource, wxResourceTable *table, wxMenuBar *menuBar)
+wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *table, wxMenuBar *menuBar)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   wxItemResource *menuResource = table->FindResource(resource);
   wxItemResource *menuResource = table->FindResource(resource);

-  if (menuResource && menuResource->GetType() && strcmp(menuResource->GetType(), "wxMenu") == 0)
+  if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))

   {
     if (!menuBar)
       menuBar = new wxMenuBar;
   {
     if (!menuBar)
       menuBar = new wxMenuBar;


@@ -2453,45 +2410,45 @@ wxMenuBar *wxResourceCreateMenuBar(char *resource, wxResourceTable *table, wxMen
   return (wxMenuBar *) NULL;
 }
 
   return (wxMenuBar *) NULL;
 }
 

-wxMenu *wxResourceCreateMenu(char *resource, wxResourceTable *table)
+wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   wxItemResource *menuResource = table->FindResource(resource);
   wxItemResource *menuResource = table->FindResource(resource);

-  if (menuResource && menuResource->GetType() && strcmp(menuResource->GetType(), "wxMenu") == 0)
+  if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))

 //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
     return wxResourceCreateMenu(menuResource);
   return (wxMenu *) NULL;
 }
 
 // Global equivalents (so don't have to refer to default table explicitly)
 //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
     return wxResourceCreateMenu(menuResource);
   return (wxMenu *) NULL;
 }
 
 // Global equivalents (so don't have to refer to default table explicitly)

-bool wxResourceParseData(char *resource, wxResourceTable *table)
+bool wxResourceParseData(const wxString& resource, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   return table->ParseResourceData(resource);
 }
 
   return table->ParseResourceData(resource);
 }
 

-bool wxResourceParseFile(char *filename, wxResourceTable *table)
+bool wxResourceParseFile(const wxString& filename, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   return table->ParseResourceFile(filename);
 }
 
 // Register XBM/XPM data
   return table->ParseResourceFile(filename);
 }
 
 // Register XBM/XPM data

-bool wxResourceRegisterBitmapData(char *name, char bits[], int width, int height, wxResourceTable *table)
+bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width, int height, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   return table->RegisterResourceBitmapData(name, bits, width, height);
 }
 
   return table->RegisterResourceBitmapData(name, bits, width, height);
 }
 

-bool wxResourceRegisterBitmapData(char *name, char **data, wxResourceTable *table)
+bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;


@@ -2511,20 +2468,20 @@ void wxResourceClear(wxResourceTable *table)
  * Identifiers
  */
 
  * Identifiers
  */
 

-bool wxResourceAddIdentifier(char *name, int value, wxResourceTable *table)
+bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   table->identifiers.Put(name, (wxObject *)value);
   return TRUE;
 }
 
   table->identifiers.Put(name, (wxObject *)value);
   return TRUE;
 }
 

-int wxResourceGetIdentifier(char *name, wxResourceTable *table)
+int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   return (int)table->identifiers.Get(name);
 }
 
   return (int)table->identifiers.Get(name);
 }
 


@@ -2532,11 +2489,11 @@ int wxResourceGetIdentifier(char *name, wxResourceTable *table)
  * Parse #include file for #defines (only)
  */
 
  * Parse #include file for #defines (only)
  */
 

-bool wxResourceParseIncludeFile(char *f, wxResourceTable *table)
+bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   FILE *fd = fopen(f, "r");
   if (!fd)
   {
   FILE *fd = fopen(f, "r");
   if (!fd)
   {


@@ -2579,7 +2536,7 @@ static int getc_string(char *s)
   }
 }
 
   }
 }
 

-static int ungetc_string(void)
+static int ungetc_string()

 {
   wxResourceStringPtr --;
   return 0;
 {
   wxResourceStringPtr --;
   return 0;


@@ -2590,7 +2547,7 @@ bool wxEatWhiteSpaceString(char *s)
   int ch = getc_string(s);
   if (ch == EOF)
     return TRUE;
   int ch = getc_string(s);
   if (ch == EOF)
     return TRUE;

-    
+

   if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
   {
     ungetc_string();
   if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
   {
     ungetc_string();


@@ -2685,7 +2642,7 @@ bool wxGetResourceTokenString(char *s)
         wxReallocateResourceBuffer();
       wxResourceBuffer[wxResourceBufferCount] = (char)ch;
       wxResourceBufferCount ++;
         wxReallocateResourceBuffer();
       wxResourceBuffer[wxResourceBufferCount] = (char)ch;
       wxResourceBufferCount ++;

-      
+

       ch = getc_string(s);
     }
     wxResourceBuffer[wxResourceBufferCount] = 0;
       ch = getc_string(s);
     }
     wxResourceBuffer[wxResourceBufferCount] = 0;


@@ -2700,12 +2657,12 @@ bool wxGetResourceTokenString(char *s)
   static char *name = "....";
   with possible comments.
  */
   static char *name = "....";
   with possible comments.
  */

- 
-bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxResourceTable *table)
+
+bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   // static or #define
   if (!wxGetResourceTokenString(s))
   {
   // static or #define
   if (!wxGetResourceTokenString(s))
   {


@@ -2733,7 +2690,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
     }
     delete[] name;
     delete[] value;
     }
     delete[] name;
     delete[] value;

- 
+

     return TRUE;
   }
 /*
     return TRUE;
   }
 /*


@@ -2780,7 +2737,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
     wxLogWarning(_("Expected 'char' whilst parsing resource."));
     return FALSE;
   }
     wxLogWarning(_("Expected 'char' whilst parsing resource."));
     return FALSE;
   }

-    
+

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


@@ -2796,7 +2753,7 @@ bool wxResourceReadOneResourceString(char *s, PrologDatabase& db, bool *eof, wxR
   }
   char nameBuf[100];
   strncpy(nameBuf, wxResourceBuffer+1, 99);
   }
   char nameBuf[100];
   strncpy(nameBuf, wxResourceBuffer+1, 99);

-    
+

   // =
   if (!wxGetResourceTokenString(s))
   {
   // =
   if (!wxGetResourceTokenString(s))
   {


@@ -2838,11 +2795,11 @@ bool wxResourceParseString(char *s, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   if (!s)
     return FALSE;
   if (!s)
     return FALSE;

-    
-  // Turn backslashes into spaces 
+
+  // Turn backslashes into spaces

   if (s)
   {
     int len = strlen(s);
   if (s)
   {
     int len = strlen(s);


@@ -2855,7 +2812,7 @@ bool wxResourceParseString(char *s, wxResourceTable *table)
       }
   }
 
       }
   }
 

-  PrologDatabase db;
+  wxExprDatabase db;

   wxResourceStringPtr = 0;
 
   bool eof = FALSE;
   wxResourceStringPtr = 0;
 
   bool eof = FALSE;


@@ -2874,68 +2831,100 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   wxItemResource *resource = table->FindResource((const char *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
   wxItemResource *resource = table->FindResource((const char *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))

-  if (!resource || !resource->GetType() ||
-    ! ((strcmp(resource->GetType(), "wxDialog") == 0) || (strcmp(resource->GetType(), "wxPanel") == 0)))
+  if (!resource || (resource->GetType() == "") ||
+    ! ((resource->GetType() == "wxDialog") || (resource->GetType() == "wxPanel")))

     return FALSE;
 
     return FALSE;
 

-  char *title = resource->GetTitle();
+  wxString title(resource->GetTitle());

   long theWindowStyle = resource->GetStyle();
   bool isModal = (resource->GetValue1() != 0);
   int x = resource->GetX();
   int y = resource->GetY();
   int width = resource->GetWidth();
   int height = resource->GetHeight();
   long theWindowStyle = resource->GetStyle();
   bool isModal = (resource->GetValue1() != 0);
   int x = resource->GetX();
   int y = resource->GetY();
   int width = resource->GetWidth();
   int height = resource->GetHeight();

-  char *name = resource->GetName();
-
-  wxFont *theFont = resource->GetFont();
+  wxString name = resource->GetName();

 
   if (IsKindOf(CLASSINFO(wxDialog)))
   {
     wxDialog *dialogBox = (wxDialog *)this;
 
   if (IsKindOf(CLASSINFO(wxDialog)))
   {
     wxDialog *dialogBox = (wxDialog *)this;

-   long modalStyle = isModal ? wxDIALOG_MODAL : 0;
+    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, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
       return FALSE;

-    dialogBox->SetClientSize(width, height);
+
+    // Only reset the client size if we know we're not going to do it again below.
+    if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
+      dialogBox->SetClientSize(width, height);
+  }
+  else if (IsKindOf(CLASSINFO(wxPanel)))
+  {
+    wxPanel* panel = (wxPanel *)this;
+    if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
+      return FALSE;

   }
   else
   {
   }
   else
   {

-    if (!((wxWindow *)this)->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))
+    if (!this->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle, name))

       return FALSE;
   }
 
       return FALSE;
   }
 

-  if (theFont)
-    SetFont(*theFont);
+  if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
+  {
+    // No need to do this since it's done in wxPanel or wxDialog constructor.
+    // SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+  }
+  else
+  {
+    if (resource->GetFont().Ok())
+      SetFont(resource->GetFont());
+    if (resource->GetBackgroundColour().Ok())
+      SetBackgroundColour(resource->GetBackgroundColour());
+  }
+
+  // Should have some kind of font at this point
+  if (!GetFont().Ok())
+      SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
+  if (!GetBackgroundColour().Ok())
+      SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

 
 

-  if (resource->GetBackgroundColour())
-    SetBackgroundColour(*resource->GetBackgroundColour());
+  // Only when we've created the window and set the font can we set the correct size,
+  // if based on dialog units.
+  if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) != 0)
+  {
+    wxSize sz = ConvertDialogToPixels(wxSize(width, height));
+    SetClientSize(sz.x, sz.y);
+
+    wxPoint pt = ConvertDialogToPixels(wxPoint(x, y));
+    Move(pt.x, pt.y);
+  }

 
 

-   // TODO
-  if (resource->GetLabelColour())
-    SetForegroundColour(*resource->GetLabelColour());
-  else if (resource->GetButtonColour())
-    SetForegroundColour(*resource->GetButtonColour());
-    

   // Now create children
   wxNode *node = resource->GetChildren().First();
   while (node)
   {
     wxItemResource *childResource = (wxItemResource *)node->Data();
   // Now create children
   wxNode *node = resource->GetChildren().First();
   while (node)
   {
     wxItemResource *childResource = (wxItemResource *)node->Data();

-    
-    (void) CreateItem(childResource, table);
+
+    (void) CreateItem(childResource, resource, table);

 
     node = node->Next();
   }
   return TRUE;
 }
 
 
     node = node->Next();
   }
   return TRUE;
 }
 

-wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxResourceTable *table)
+wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemResource* parentResource, const wxResourceTable *table)

 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-  return table->CreateItem((wxWindow *)this, (wxItemResource *)resource);
+  return table->CreateItem((wxWindow *)this, resource, parentResource);

 }
 
 }
 

-#endif // USE_WX_RESOURCES
+#ifdef __VISUALC__
+    #pragma warning(default:4706)   // assignment within conditional expression
+#endif // VC++
+
+#endif
+  // BC++/Win16
+
+#endif // wxUSE_WX_RESOURCES