Unicode overview added

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index 0c2cc28936aeaef2eab1496943b9fd6eec4dd220..4c53d60295386aaba4365b7a0fdcd522eee61837 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"


@@ -38,15 +44,19 @@
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"

+#include "wx/icon.h"

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

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

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

-#endif

 #include "wx/textctrl.h"
 #include "wx/msgdlg.h"
 #include "wx/intl.h"
 #endif
 
 #include "wx/textctrl.h"
 #include "wx/msgdlg.h"
 #include "wx/intl.h"
 #endif
 

+#if wxUSE_RADIOBTN
+#include "wx/radiobut.h"
+#endif
+

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


@@ -59,8 +69,6 @@
 
 #include "wx/log.h"
 
 
 #include "wx/log.h"
 

-#if wxUSE_WX_RESOURCES
-

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


@@ -89,10 +97,10 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxR
 
 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 wxInitializeResourceSystem()
 {


@@ -144,7 +152,7 @@ wxItemResource::~wxItemResource()
 /*
  * Resource table
  */
 /*
  * Resource table
  */

- 
+

 wxResourceTable::wxResourceTable():wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING)
 {
 }
 wxResourceTable::wxResourceTable():wxHashTable(wxKEY_STRING), identifiers(wxKEY_STRING)
 {
 }


@@ -153,20 +161,20 @@ wxResourceTable::~wxResourceTable()
 {
   ClearTable();
 }
 {
   ClearTable();
 }

-    
+

 wxItemResource *wxResourceTable::FindResource(const wxString& name) const
 {
 wxItemResource *wxResourceTable::FindResource(const wxString& name) const
 {

-  wxItemResource *item = (wxItemResource *)Get((char *)(const char *)name);
+  wxItemResource *item = (wxItemResource *)Get(WXSTRINGCAST name);

   return item;
 }
 
 void wxResourceTable::AddResource(wxItemResource *item)
 {
   wxString name = item->GetName();
   return item;
 }
 
 void wxResourceTable::AddResource(wxItemResource *item)
 {
   wxString name = item->GetName();

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

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

-  if (name == "")
-    name = "no name";
+  if (name == T(""))
+    name = T("no name");

 
   // Delete existing resource, if any.
   Delete(name);
 
   // Delete existing resource, if any.
   Delete(name);


@@ -176,14 +184,15 @@ void wxResourceTable::AddResource(wxItemResource *item)
 
 bool wxResourceTable::DeleteResource(const wxString& name)
 {
 
 bool wxResourceTable::DeleteResource(const wxString& name)
 {

-  wxItemResource *item = (wxItemResource *)Delete((char *)(const char *)name);
+  wxItemResource *item = (wxItemResource *)Delete(WXSTRINGCAST name);

   if (item)
   {
     // See if any resource has this as its child; if so, delete from
     // parent's child list.
     BeginFind();
     wxNode *node = (wxNode *) NULL;
   if (item)
   {
     // See if any resource has this as its child; if so, delete from
     // parent's child list.
     BeginFind();
     wxNode *node = (wxNode *) NULL;

-    while ((node = Next()))
+    node = Next();
+    while (node != NULL)

     {
       wxItemResource *parent = (wxItemResource *)node->Data();
       if (parent->GetChildren().Member(item))
     {
       wxItemResource *parent = (wxItemResource *)node->Data();
       if (parent->GetChildren().Member(item))


@@ -191,8 +200,9 @@ bool wxResourceTable::DeleteResource(const wxString& name)
         parent->GetChildren().DeleteObject(item);
         break;
       }
         parent->GetChildren().DeleteObject(item);
         break;
       }

+      node = Next();

     }
     }

-    
+

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


@@ -204,7 +214,7 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
   wxExprDatabase db;
 
 {
   wxExprDatabase db;
 

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

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


@@ -233,7 +243,7 @@ bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char bits
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;
 //  item->SetType(wxRESOURCE_TYPE_XBM_DATA);
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;
 //  item->SetType(wxRESOURCE_TYPE_XBM_DATA);

-  item->SetType("wxXBMData");
+  item->SetType(T("wxXBMData"));

   item->SetName(name);
   item->SetValue1((long)bits);
   item->SetValue2((long)width);
   item->SetName(name);
   item->SetValue1((long)bits);
   item->SetValue2((long)width);


@@ -247,7 +257,7 @@ bool wxResourceTable::RegisterResourceBitmapData(const wxString& name, char **da
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;
 //  item->SetType(wxRESOURCE_TYPE_XPM_DATA);
   // Register pre-loaded bitmap data
   wxItemResource *item = new wxItemResource;
 //  item->SetType(wxRESOURCE_TYPE_XPM_DATA);

-  item->SetType("wxXPMData");
+  item->SetType(T("wxXPMData"));

   item->SetName(name);
   item->SetValue1((long)data);
   AddResource(item);
   item->SetName(name);
   item->SetValue1((long)data);
   AddResource(item);


@@ -297,9 +307,9 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
     size = wxSize(childResource->GetWidth(), childResource->GetHeight());
   }
 
     size = wxSize(childResource->GetWidth(), childResource->GetHeight());
   }
 

-  if (itemType == wxString("wxButton") || itemType == wxString("wxBitmapButton"))
+  if (itemType == wxString(T("wxButton")) || itemType == wxString(T("wxBitmapButton")))

       {
       {

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

         {
           // Bitmap button
           wxBitmap bitmap = childResource->GetBitmap();
         {
           // Bitmap button
           wxBitmap bitmap = childResource->GetBitmap();


@@ -317,10 +327,10 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           control = new wxButton(parent, id, childResource->GetTitle(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
           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"))
+   else if (itemType == wxString(T("wxMessage")) || itemType == wxString(T("wxStaticText")) ||
+         itemType == wxString(T("wxStaticBitmap")))

       {
       {

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

         {
           // Bitmap message
           wxBitmap bitmap = childResource->GetBitmap();
         {
           // Bitmap message
           wxBitmap bitmap = childResource->GetBitmap();


@@ -341,12 +351,12 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
              childResource->GetStyle(), childResource->GetName());
         }
       }
              childResource->GetStyle(), childResource->GetName());
         }
       }

-   else if (itemType == wxString("wxText") || itemType == wxString("wxTextCtrl") || itemType == wxString("wxMultiText"))
+   else if (itemType == wxString(T("wxText")) || itemType == wxString(T("wxTextCtrl")) || itemType == wxString(T("wxMultiText")))

       {
         control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
       {
         control = new wxTextCtrl(parent, id, childResource->GetValue4(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }

-   else if (itemType == wxString("wxCheckBox"))
+   else if (itemType == wxString(T("wxCheckBox")))

       {
         control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       {
         control = new wxCheckBox(parent, id, childResource->GetTitle(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());


@@ -354,7 +364,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
       }
 #if wxUSE_GAUGE
         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
       }
 #if wxUSE_GAUGE

-   else if (itemType == wxString("wxGauge"))
+   else if (itemType == wxString(T("wxGauge")))

       {
         control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       {
         control = new wxGauge(parent, id, (int)childResource->GetValue2(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());


@@ -362,8 +372,8 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
       }
 #endif
         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
       }
 #endif

-#if wxUSE_RADIOBUTTON
-   else if (itemType == wxString("wxRadioButton"))
+#if wxUSE_RADIOBTN
+   else if (itemType == wxString(T("wxRadioButton")))

       {
         control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
            pos, size,
       {
         control = new wxRadioButton(parent, id, childResource->GetTitle(), // (int)childResource->GetValue1(),
            pos, size,


@@ -371,28 +381,33 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
       }
 #endif
 #if wxUSE_SCROLLBAR
       }
 #endif
 #if wxUSE_SCROLLBAR

-   else if (itemType == wxString("wxScrollBar"))
+   else if (itemType == wxString(T("wxScrollBar")))

       {
         control = new wxScrollBar(parent, id, pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       {
         control = new wxScrollBar(parent, id, pos, size,
            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
       }
 #endif

-   else if (itemType == wxString("wxSlider"))
+   else if (itemType == wxString(T("wxSlider")))

       {
         control = new wxSlider(parent, id, (int)childResource->GetValue1(),
            (int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }
       {
         control = new wxSlider(parent, id, (int)childResource->GetValue1(),
            (int)childResource->GetValue2(), (int)childResource->GetValue3(), pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       }

-   else if (itemType == wxString("wxGroupBox") || itemType == wxString("wxStaticBox"))
+   else if (itemType == wxString(T("wxGroupBox")) || itemType == wxString(T("wxStaticBox")))

       {
         control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size,
            childResource->GetStyle(), childResource->GetName());
       }
       {
         control = new wxStaticBox(parent, id, childResource->GetTitle(), pos, size,
            childResource->GetStyle(), childResource->GetName());
       }

-   else if (itemType == wxString("wxListBox"))
+   else if (itemType == wxString(T("wxListBox")))

       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;


@@ -405,7 +420,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           int i = 0;
           while (node)
           {
           int i = 0;
           while (node)
           {

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

             i ++;
             node = node->Next();
           }
             i ++;
             node = node->Next();
           }


@@ -416,7 +431,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         if (strings)
           delete[] strings;
       }
         if (strings)
           delete[] strings;
       }

-   else if (itemType == wxString("wxChoice"))
+   else if (itemType == wxString(T("wxChoice")))

       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;


@@ -429,7 +444,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           int i = 0;
           while (node)
           {
           int i = 0;
           while (node)
           {

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

             i ++;
             node = node->Next();
           }
             i ++;
             node = node->Next();
           }


@@ -441,7 +456,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           delete[] strings;
       }
 #if wxUSE_COMBOBOX
           delete[] strings;
       }
 #if wxUSE_COMBOBOX

-   else if (itemType == wxString("wxComboBox"))
+   else if (itemType == wxString(T("wxComboBox")))

       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;


@@ -454,7 +469,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           int i = 0;
           while (node)
           {
           int i = 0;
           while (node)
           {

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

             i ++;
             node = node->Next();
           }
             i ++;
             node = node->Next();
           }


@@ -466,7 +481,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           delete[] strings;
       }
 #endif
           delete[] strings;
       }
 #endif

-   else if (itemType == wxString("wxRadioBox"))
+   else if (itemType == wxString(T("wxRadioBox")))

       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;
       {
         wxStringList& stringList = childResource->GetStringValues();
         wxString *strings = (wxString *) NULL;


@@ -479,7 +494,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
           int i = 0;
           while (node)
           {
           int i = 0;
           while (node)
           {

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

             i ++;
             node = node->Next();
           }
             i ++;
             node = node->Next();
           }


@@ -517,25 +532,25 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
    wxString functor(clause->Functor());
 
     wxItemResource *item = (wxItemResource *) NULL;
    wxString functor(clause->Functor());
 
     wxItemResource *item = (wxItemResource *) NULL;

-    if (functor == "dialog")
+    if (functor == T("dialog"))

       item = wxResourceInterpretDialog(table, clause);
       item = wxResourceInterpretDialog(table, clause);

-    else if (functor == "panel")
+    else if (functor == T("panel"))

       item = wxResourceInterpretDialog(table, clause, TRUE);
       item = wxResourceInterpretDialog(table, clause, TRUE);

-    else if (functor == "menubar")
+    else if (functor == T("menubar"))

       item = wxResourceInterpretMenuBar(table, clause);
       item = wxResourceInterpretMenuBar(table, clause);

-    else if (functor == "menu")
+    else if (functor == T("menu"))

       item = wxResourceInterpretMenu(table, clause);
       item = wxResourceInterpretMenu(table, clause);

-    else if (functor == "string")
+    else if (functor == T("string"))

       item = wxResourceInterpretString(table, clause);
       item = wxResourceInterpretString(table, clause);

-    else if (functor == "bitmap")
+    else if (functor == T("bitmap"))

       item = wxResourceInterpretBitmap(table, clause);
       item = wxResourceInterpretBitmap(table, clause);

-    else if (functor == "icon")
+    else if (functor == T("icon"))

       item = wxResourceInterpretIcon(table, clause);
 
     if (item)
     {
       // Remove any existing resource of same name
       item = wxResourceInterpretIcon(table, clause);
 
     if (item)
     {
       // Remove any existing resource of same name

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

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


@@ -544,17 +559,33 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& 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 wxChar *g_ValidControlClasses[] =
+{
+    T("wxButton"),
+    T("wxBitmapButton"),
+    T("wxMessage"),
+    T("wxStaticText"),
+    T("wxStaticBitmap"),
+    T("wxText"),
+    T("wxTextCtrl"),
+    T("wxMultiText"),
+    T("wxListBox"),
+    T("wxRadioBox"),
+    T("wxRadioButton"),
+    T("wxCheckBox"),
+    T("wxBitmapCheckBox"),
+    T("wxGroupBox"),
+    T("wxStaticBox"),
+    T("wxSlider"),
+    T("wxGauge"),
+    T("wxScrollBar"),
+    T("wxChoice"),
+    T("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;


@@ -566,65 +597,68 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
 {
   wxItemResource *dialogItem = new wxItemResource;
   if (isPanel)
 {
   wxItemResource *dialogItem = new wxItemResource;
   if (isPanel)

-    dialogItem->SetType("wxPanel");
+    dialogItem->SetType(T("wxPanel"));

   else
   else

-    dialogItem->SetType("wxDialog");
-  wxString style = "";
-  wxString title = "";
-  wxString name = "";
-  wxString backColourHex = "";
-  wxString labelColourHex = "";
-  wxString buttonColourHex = "";
+    dialogItem->SetType(T("wxDialog"));
+  wxString style = T("");
+  wxString title = T("");
+  wxString name = T("");
+  wxString backColourHex = T("");
+  wxString labelColourHex = T("");
+  wxString buttonColourHex = T("");

 
   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;
   wxExpr *labelFontExpr = (wxExpr *) NULL;
   wxExpr *buttonFontExpr = (wxExpr *) NULL;
   wxExpr *fontExpr = (wxExpr *) NULL;
   int x = 0; int y = 0; int width = -1; int height = -1;
   int isModal = 0;
   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);
+  expr->GetAttributeValue(T("style"), style);
+  expr->GetAttributeValue(T("name"), name);
+  expr->GetAttributeValue(T("title"), title);
+  expr->GetAttributeValue(T("x"), x);
+  expr->GetAttributeValue(T("y"), y);
+  expr->GetAttributeValue(T("width"), width);
+  expr->GetAttributeValue(T("height"), height);
+  expr->GetAttributeValue(T("modal"), isModal);
+  expr->GetAttributeValue(T("label_font"), &labelFontExpr);
+  expr->GetAttributeValue(T("button_font"), &buttonFontExpr);
+  expr->GetAttributeValue(T("font"), &fontExpr);
+  expr->GetAttributeValue(T("background_colour"), backColourHex);
+  expr->GetAttributeValue(T("label_colour"), labelColourHex);
+  expr->GetAttributeValue(T("button_colour"), buttonColourHex);

 
   int useDialogUnits = 0;
 
   int useDialogUnits = 0;

-  expr->GetAttributeValue("use_dialog_units", useDialogUnits);
+  expr->GetAttributeValue(T("use_dialog_units"), useDialogUnits);

   if (useDialogUnits != 0)
     dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
 
   int useDefaults = 0;
   if (useDialogUnits != 0)
     dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
 
   int useDefaults = 0;

-  expr->GetAttributeValue("use_system_defaults", useDefaults);
+  expr->GetAttributeValue(T("use_system_defaults"), useDefaults);

   if (useDefaults != 0)
     dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
 
   long id = 0;
   if (useDefaults != 0)
     dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
 
   long id = 0;

-  expr->GetAttributeValue("id", id);
+  expr->GetAttributeValue(T("id"), id);

   dialogItem->SetId(id);
 
   dialogItem->SetId(id);
 

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

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

+  if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
+    dialogItem->SetValue1(TRUE);
+

   dialogItem->SetName(name);
   dialogItem->SetTitle(title);
   dialogItem->SetSize(x, y, width, height);
   dialogItem->SetName(name);
   dialogItem->SetTitle(title);
   dialogItem->SetSize(x, y, width, height);

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

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


@@ -634,7 +668,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     b = wxHexToDec(backColourHex.Mid(4, 2));
     dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
   }
     b = wxHexToDec(backColourHex.Mid(4, 2));
     dialogItem->SetBackgroundColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
   }

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

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


@@ -644,7 +678,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     b = wxHexToDec(labelColourHex.Mid(4, 2));
     dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
   }
     b = wxHexToDec(labelColourHex.Mid(4, 2));
     dialogItem->SetLabelColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
   }

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

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


@@ -669,7 +703,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     if (controlExpr->Number() == 3)
     {
       wxString controlKeyword(controlExpr->Nth(1)->StringValue());
     if (controlExpr->Number() == 3)
     {
       wxString controlKeyword(controlExpr->Nth(1)->StringValue());

-      if (controlKeyword != "" && controlKeyword == "control")
+      if (controlKeyword != T("") && controlKeyword == T("control"))

       {
         // The value part: always a list.
         wxExpr *listExpr = controlExpr->Nth(2);
       {
         // The value part: always a list.
         wxExpr *listExpr = controlExpr->Nth(2);


@@ -722,7 +756,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
           wxLogWarning(_("Could not resolve control class or id '%s'. "
                          "Use (non-zero) integer instead\n or provide #define "
                          "(see manual for caveats)"),
           wxLogWarning(_("Could not resolve control class or id '%s'. "
                          "Use (non-zero) integer instead\n or provide #define "
                          "(see manual for caveats)"),

-                         (const char*) expr1->StringValue());
+                         (const wxChar*) expr1->StringValue());

         delete controlItem;
         return (wxItemResource *) NULL;
         }
         delete controlItem;
         return (wxItemResource *) NULL;
         }


@@ -787,7 +821,24 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
   controlItem->SetType(controlType);
   controlItem->SetId(id);
 
   controlItem->SetType(controlType);
   controlItem->SetId(id);
 

-  if (controlType == "wxButton")
+  if (controlType == T("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)))
+    {
+        wxString str(expr->Nth(count)->StringValue());
+        count ++;
+
+        if (str != T(""))
+        {
+            controlItem->SetValue4(str);
+            controlItem->SetType(T("wxBitmapButton"));
+        }
+    }
+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+  }
+  else if (controlType == T("wxBitmapButton"))

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


@@ -799,7 +850,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
           controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }
           controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }

-  else if (controlType == "wxCheckBox")
+  else if (controlType == T("wxCheckBox"))

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


@@ -810,8 +861,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }
         controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
     }
   }

-#if wxUSE_RADIOBUTTON
-  else if (controlType == "wxRadioButton")
+#if wxUSE_RADIOBTN
+  else if (controlType == T("wxRadioButton"))

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


@@ -823,7 +874,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     }
   }
 #endif
     }
   }
 #endif

-  else if (controlType == "wxText" || controlType == "wxTextCtrl" || controlType == "wxMultiText")
+  else if (controlType == T("wxText") || controlType == T("wxTextCtrl") || controlType == T("wxMultiText"))

   {
     // Check for default value
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))
   {
     // Check for default value
     if (expr->Nth(count) && ((expr->Nth(count)->Type() == PrologString) || (expr->Nth(count)->Type() == PrologWord)))


@@ -842,7 +893,20 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
      }
    }
   }
      }
    }
   }

-  else if (controlType == "wxMessage" || controlType == "wxStaticText")
+  else if (controlType == T("wxMessage") || controlType == T("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(T("wxStaticText"));
+    }
+    if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
+      controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+  }
+  else if (controlType == T("wxStaticBitmap"))

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


@@ -850,16 +914,16 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       wxString str(expr->Nth(count)->StringValue());
       controlItem->SetValue4(str);
       count ++;
       wxString str(expr->Nth(count)->StringValue());
       controlItem->SetValue4(str);
       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 == T("wxGroupBox") || controlType == T("wxStaticBox"))

   {
     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 == "wxGauge")
+  else if (controlType == T("wxGauge"))

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


@@ -885,7 +949,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
      }
    }
   }
      }
    }
   }

-  else if (controlType == "wxSlider")
+  else if (controlType == T("wxSlider"))

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


@@ -918,7 +982,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
      }
    }
   }
      }
    }
   }

-  else if (controlType == "wxScrollBar")
+  else if (controlType == T("wxScrollBar"))

   {
     // DEFAULT VALUE
     if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
   {
     // DEFAULT VALUE
     if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))


@@ -945,7 +1009,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
      }
    }
   }
      }
    }
   }

-  else if (controlType == "wxListBox")
+  else if (controlType == T("wxListBox"))

   {
     wxExpr *valueList = (wxExpr *) NULL;
 
   {
     wxExpr *valueList = (wxExpr *) NULL;
 


@@ -987,7 +1051,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       }
    }
   }
       }
    }
   }

-  else if (controlType == "wxChoice")
+  else if (controlType == T("wxChoice"))

   {
     wxExpr *valueList = (wxExpr *) NULL;
     // Check for default value list
   {
     wxExpr *valueList = (wxExpr *) NULL;
     // Check for default value list


@@ -1015,7 +1079,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
    }
   }
 #if wxUSE_COMBOBOX
    }
   }
 #if wxUSE_COMBOBOX

-  else if (controlType == "wxComboBox")
+  else if (controlType == T("wxComboBox"))

   {
     wxExpr *textValue = expr->Nth(count);
     if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))
   {
     wxExpr *textValue = expr->Nth(count);
     if (textValue && (textValue->Type() == PrologString || textValue->Type() == PrologWord))


@@ -1024,7 +1088,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       controlItem->SetValue4(str);
 
      count ++;
       controlItem->SetValue4(str);
 
      count ++;

-      
+

       wxExpr *valueList = (wxExpr *) NULL;
       // Check for default value list
       if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
       wxExpr *valueList = (wxExpr *) NULL;
       // Check for default value list
       if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))


@@ -1053,7 +1117,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
   }
 #endif
 #if 1
   }
 #endif
 #if 1

-  else if (controlType == "wxRadioBox")
+  else if (controlType == T("wxRadioBox"))

   {
     wxExpr *valueList = (wxExpr *) NULL;
     // Check for default value list
   {
     wxExpr *valueList = (wxExpr *) NULL;
     // Check for default value list


@@ -1097,7 +1161,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
   return controlItem;
 }
 
   return controlItem;
 }
 

-// Forward declaration 
+// Forward declaration

 wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr);
 
 /*
 wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr);
 
 /*


@@ -1107,7 +1171,7 @@ wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr);
 wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr)
 {
   wxItemResource *item = new wxItemResource;
 wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr)
 {
   wxItemResource *item = new wxItemResource;

-  
+

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


@@ -1117,13 +1181,13 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr
   if (expr->Number() == 0)
   {
 //    item->SetType(wxRESOURCE_TYPE_SEPARATOR);
   if (expr->Number() == 0)
   {
 //    item->SetType(wxRESOURCE_TYPE_SEPARATOR);

-    item->SetType("wxMenuSeparator");
+    item->SetType(T("wxMenuSeparator"));

     return item;
   }
   else
   {
 //    item->SetType(wxTYPE_MENU); // Well, menu item, but doesn't matter.
     return item;
   }
   else
   {
 //    item->SetType(wxTYPE_MENU); // Well, menu item, but doesn't matter.

-    item->SetType("wxMenu"); // Well, menu item, but doesn't matter.
+    item->SetType(T("wxMenu")); // Well, menu item, but doesn't matter.

     if (labelExpr)
     {
       wxString str(labelExpr->StringValue());
     if (labelExpr)
     {
       wxString str(labelExpr->StringValue());


@@ -1142,7 +1206,7 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr
           wxLogWarning(_("Could not resolve menu id '%s'. "
                          "Use (non-zero) integer instead\n"
                          "or provide #define (see manual for caveats)"),
           wxLogWarning(_("Could not resolve menu id '%s'. "
                          "Use (non-zero) integer instead\n"
                          "or provide #define (see manual for caveats)"),

-                         (const char*) idExpr->StringValue());
+                         (const wxChar*) idExpr->StringValue());

         }
       }
       else if (idExpr->Type() == PrologInteger)
         }
       }
       else if (idExpr->Type() == PrologInteger)


@@ -1161,7 +1225,7 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr
     wxExpr *subMenuExpr = expr->GetFirst();
     while (subMenuExpr && (subMenuExpr->Type() != PrologList))
       subMenuExpr = subMenuExpr->GetNext();
     wxExpr *subMenuExpr = expr->GetFirst();
     while (subMenuExpr && (subMenuExpr->Type() != PrologList))
       subMenuExpr = subMenuExpr->GetNext();

-      
+

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


@@ -1196,35 +1260,35 @@ wxItemResource *wxResourceInterpretMenu1(wxResourceTable& table, wxExpr *expr)
 wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
 {
   wxExpr *listExpr = (wxExpr *) NULL;
 wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
 {
   wxExpr *listExpr = (wxExpr *) NULL;

-  expr->GetAttributeValue("menu", &listExpr);
+  expr->GetAttributeValue(T("menu"), &listExpr);

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

-  
+

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

-  if (expr->GetAttributeValue("name", name))
+  if (expr->GetAttributeValue(T("name"), name))

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

-  
+

   return menuResource;
 }
 
 wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
 {
   wxExpr *listExpr = (wxExpr *) NULL;
   return menuResource;
 }
 
 wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
 {
   wxExpr *listExpr = (wxExpr *) NULL;

-  expr->GetAttributeValue("menu", &listExpr);
+  expr->GetAttributeValue(T("menu"), &listExpr);

   if (!listExpr)
     return (wxItemResource *) NULL;
 
   wxItemResource *resource = new wxItemResource;
   if (!listExpr)
     return (wxItemResource *) NULL;
 
   wxItemResource *resource = new wxItemResource;

-  resource->SetType("wxMenu");
+  resource->SetType(T("wxMenu"));

 //  resource->SetType(wxTYPE_MENU);
 //  resource->SetType(wxTYPE_MENU);

-  
+

   wxExpr *element = listExpr->GetFirst();
   while (element)
   {
   wxExpr *element = listExpr->GetFirst();
   while (element)
   {


@@ -1234,11 +1298,11 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
   }
 
   wxString name;
   }
 
   wxString name;

-  if (expr->GetAttributeValue("name", name))
+  if (expr->GetAttributeValue(T("name"), name))

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

-  
+

   return resource;
 }
 
   return resource;
 }
 


@@ -1251,9 +1315,9 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
 {
   wxItemResource *bitmapItem = new wxItemResource;
 //  bitmapItem->SetType(wxTYPE_BITMAP);
 {
   wxItemResource *bitmapItem = new wxItemResource;
 //  bitmapItem->SetType(wxTYPE_BITMAP);

-  bitmapItem->SetType("wxBitmap");
+  bitmapItem->SetType(T("wxBitmap"));

   wxString name;
   wxString name;

-  if (expr->GetAttributeValue("name", name))
+  if (expr->GetAttributeValue(T("name"), name))

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


@@ -1264,7 +1328,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
     if (bitmapExpr->Number() == 3)
     {
       wxString bitmapKeyword(bitmapExpr->Nth(1)->StringValue());
     if (bitmapExpr->Number() == 3)
     {
       wxString bitmapKeyword(bitmapExpr->Nth(1)->StringValue());

-      if (bitmapKeyword == "bitmap" || bitmapKeyword == "icon")
+      if (bitmapKeyword == T("bitmap") || bitmapKeyword == T("icon"))

       {
         // The value part: always a list.
         wxExpr *listExpr = bitmapExpr->Nth(2);
       {
         // The value part: always a list.
         wxExpr *listExpr = bitmapExpr->Nth(2);


@@ -1272,7 +1336,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
         {
           wxItemResource *bitmapSpec = new wxItemResource;
 //          bitmapSpec->SetType(wxTYPE_BITMAP);
         {
           wxItemResource *bitmapSpec = new wxItemResource;
 //          bitmapSpec->SetType(wxTYPE_BITMAP);

-          bitmapSpec->SetType("wxBitmap");
+          bitmapSpec->SetType(T("wxBitmap"));

 
           // 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.


@@ -1282,25 +1346,25 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
           wxExpr *coloursExpr = listExpr->Nth(3);
           wxExpr *xresExpr = listExpr->Nth(4);
           wxExpr *yresExpr = listExpr->Nth(5);
           wxExpr *coloursExpr = listExpr->Nth(3);
           wxExpr *xresExpr = listExpr->Nth(4);
           wxExpr *yresExpr = listExpr->Nth(5);

-          if (nameExpr && nameExpr->StringValue())
+          if (nameExpr && nameExpr->StringValue() != T(""))

           {
             bitmapSpec->SetName(nameExpr->StringValue());
           }
           {
             bitmapSpec->SetName(nameExpr->StringValue());
           }

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

           {
             bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
           }
           else
             bitmapSpec->SetValue1(0);
           {
             bitmapSpec->SetValue1(wxParseWindowStyle(typeExpr->StringValue()));
           }
           else
             bitmapSpec->SetValue1(0);

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

           {
             wxString plat(platformExpr->StringValue());
           {
             wxString plat(platformExpr->StringValue());

-            if (plat == "windows" || plat == "WINDOWS")
+            if (plat == T("windows") || plat == T("WINDOWS"))

               bitmapSpec->SetValue2(RESOURCE_PLATFORM_WINDOWS);
               bitmapSpec->SetValue2(RESOURCE_PLATFORM_WINDOWS);

-            else if (plat == "x" || plat == "X")
+            else if (plat == T("x") || plat == T("X"))

               bitmapSpec->SetValue2(RESOURCE_PLATFORM_X);
               bitmapSpec->SetValue2(RESOURCE_PLATFORM_X);

-            else if (plat == "mac" || plat == "MAC")
+            else if (plat == T("mac") || plat == T("MAC"))

               bitmapSpec->SetValue2(RESOURCE_PLATFORM_MAC);
             else
               bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
               bitmapSpec->SetValue2(RESOURCE_PLATFORM_MAC);
             else
               bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);


@@ -1317,14 +1381,14 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
           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;
 }
 


@@ -1334,7 +1398,7 @@ wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr)
   if (item)
   {
 //    item->SetType(wxTYPE_ICON);
   if (item)
   {
 //    item->SetType(wxTYPE_ICON);

-    item->SetType("wxIcon");
+    item->SetType(T("wxIcon"));

     return item;
   }
   else
     return item;
   }
   else


@@ -1352,8 +1416,8 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
   int style = wxNORMAL;
   int weight = wxNORMAL;
   int underline = 0;
   int style = wxNORMAL;
   int weight = wxNORMAL;
   int underline = 0;

-  wxString faceName("");
-  
+  wxString faceName(T(""));
+

   wxExpr *pointExpr = expr->Nth(0);
   wxExpr *familyExpr = expr->Nth(1);
   wxExpr *styleExpr = expr->Nth(2);
   wxExpr *pointExpr = expr->Nth(0);
   wxExpr *familyExpr = expr->Nth(1);
   wxExpr *styleExpr = expr->Nth(2);


@@ -1388,6 +1452,9 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
   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
  */


@@ -1414,46 +1481,59 @@ bool wxReallocateResourceBuffer()
 
 static bool wxEatWhiteSpace(FILE *fd)
 {
 
 static bool wxEatWhiteSpace(FILE *fd)
 {

-  int ch = getc(fd);
-  if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
-  {
-    ungetc(ch, fd);
-    return TRUE;
-  }
+  int ch = 0;

 
 

-  // Eat whitespace
-  while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-    ch = getc(fd);
-  // Check for comment
-  if (ch == '/')
-  {
-    ch = getc(fd);
-    if (ch == '*')
-    {
-      bool finished = FALSE;
-      while (!finished)
+   while ((ch = getc(fd)) != EOF)

       {
       {

-        ch = getc(fd);
-        if (ch == EOF)
-          return FALSE;
-        if (ch == '*')
-        {
-          int newCh = getc(fd);
-          if (newCh == '/')
-            finished = TRUE;
-          else
-          {
-            ungetc(newCh, fd);
-          }
-        }
+      switch (ch)
+         {
+         case ' ':
+         case 0x0a:
+         case 0x0d:
+         case 0x09:
+            break;
+         case '/':
+            {
+            int prev_ch = ch;
+            ch = getc(fd);
+            if (ch == EOF)
+               {
+               ungetc(prev_ch, fd);
+               return TRUE;
+               }
+
+            if (ch == '*')
+               {
+               // Eat C comment
+               prev_ch = 0;
+               while ((ch = getc(fd)) != EOF)
+                  {
+                  if (ch == '/' && prev_ch == '*')
+                     break;
+                  prev_ch = ch;
+                  }
+               }
+            else if (ch == '/')
+               {
+               // Eat C++ comment
+               static char buffer[255];
+               fgets(buffer, 255, fd);
+               }
+            else
+               {
+               ungetc(prev_ch, fd);
+               ungetc(ch, fd);
+               return TRUE;
+               }
+            }
+            break;
+         default:
+            ungetc(ch, fd);
+            return TRUE;
+
+         }

       }
       }

-    }
-    else // False alarm
-      return FALSE;
-  }
-  else
-    ungetc(ch, fd);
-  return wxEatWhiteSpace(fd);
+   return FALSE;

 }
 
 bool wxGetResourceToken(FILE *fd)
 }
 
 bool wxGetResourceToken(FILE *fd)


@@ -1509,7 +1589,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;


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

- 
+

 bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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


@@ -1540,12 +1620,12 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
   if (strcmp(wxResourceBuffer, "#define") == 0)
   {
     wxGetResourceToken(fd);
   if (strcmp(wxResourceBuffer, "#define") == 0)
   {
     wxGetResourceToken(fd);

-    char *name = copystring(wxResourceBuffer);
+    wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));

     wxGetResourceToken(fd);
     wxGetResourceToken(fd);

-    char *value = copystring(wxResourceBuffer);
-    if (isalpha(value[0]))
+    wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+    if (wxIsdigit(value[0]))

     {
     {

-      int val = (int)atol(value);
+      int val = (int)wxAtol(value);

       wxResourceAddIdentifier(name, val, table);
     }
     else
       wxResourceAddIdentifier(name, val, table);
     }
     else


@@ -1557,18 +1637,18 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     }
     delete[] name;
     delete[] value;
     }
     delete[] name;
     delete[] value;

- 
+

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

-    char *name = copystring(wxResourceBuffer);
-    char *actualName = name;
-    if (name[0] == '"')
+    wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+    wxChar *actualName = name;
+    if (name[0] == T('"'))

       actualName = name + 1;
       actualName = name + 1;

-    int len = strlen(name);
-    if ((len > 0) && (name[len-1] == '"'))
+    int len = wxStrlen(name);
+    if ((len > 0) && (name[len-1] == T('"')))

       name[len-1] = 0;
     if (!wxResourceParseIncludeFile(actualName, table))
     {
       name[len-1] = 0;
     if (!wxResourceParseIncludeFile(actualName, table))
     {


@@ -1579,10 +1659,10 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
   }
   else if (strcmp(wxResourceBuffer, "static") != 0)
   {
   }
   else if (strcmp(wxResourceBuffer, "static") != 0)
   {

-    char buf[300];
-    strcpy(buf, _("Found "));
-    strncat(buf, wxResourceBuffer, 30);
-    strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+    wxChar buf[300];
+    wxStrcpy(buf, _("Found "));
+    wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
+    wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));

     wxLogWarning(buf);
     return FALSE;
   }
     wxLogWarning(buf);
     return FALSE;
   }


@@ -1600,7 +1680,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& 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))
   {


@@ -1614,9 +1694,10 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     wxLogWarning(_("Expected '*' whilst parsing resource."));
     return FALSE;
   }
     wxLogWarning(_("Expected '*' whilst parsing resource."));
     return FALSE;
   }

-  char nameBuf[100];
-  strncpy(nameBuf, wxResourceBuffer+1, 99);
-    
+  wxChar nameBuf[100];
+  wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
+  nameBuf[99] = 0;
+

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


@@ -1657,22 +1738,22 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& 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)
+wxChar* wxResourceParseWord(wxChar*s, int *i)

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

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

 
 

-  static char buf[150];
-  int len = strlen(s);
+  static wxChar buf[150];
+  int len = wxStrlen(s);

   int j = 0;
   int ii = *i;
   int j = 0;
   int ii = *i;

-  while ((ii < len) && (isalpha(s[ii]) || (s[ii] == '_')))
+  while ((ii < len) && (wxIsalpha(s[ii]) || (s[ii] == T('_'))))

   {
     buf[j] = s[ii];
     j ++;
   {
     buf[j] = s[ii];
     j ++;


@@ -1682,271 +1763,279 @@ char* wxResourceParseWord(char*s, int *i)
 
   // Eat whitespace and conjunction characters
   while ((ii < len) &&
 
   // Eat whitespace and conjunction characters
   while ((ii < len) &&

-         ((s[ii] == ' ') || (s[ii] == '|') || (s[ii] == ',')))
+         ((s[ii] == T(' ')) || (s[ii] == T('|')) || (s[ii] == T(','))))

   {
     ii ++;
   }
   *i = ii;
   if (j == 0)
   {
     ii ++;
   }
   *i = ii;
   if (j == 0)

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

   else
     return buf;
 }
 
 struct wxResourceBitListStruct
 {
   else
     return buf;
 }
 
 struct wxResourceBitListStruct
 {

-  char *word;
+  wxChar *word;

   long bits;
 };
 
 static wxResourceBitListStruct wxResourceBitListTable[] =
 {
   /* wxListBox */
   long bits;
 };
 
 static wxResourceBitListStruct wxResourceBitListTable[] =
 {
   /* wxListBox */

-  { "wxSINGLE", wxLB_SINGLE },
-  { "wxMULTIPLE", wxLB_MULTIPLE },
-  { "wxEXTENDED", wxLB_EXTENDED },
-  { "wxLB_SINGLE", wxLB_SINGLE },
-  { "wxLB_MULTIPLE", wxLB_MULTIPLE },
-  { "wxLB_EXTENDED", wxLB_EXTENDED },
-  { "wxLB_NEEDED_SB", wxLB_NEEDED_SB },
-  { "wxLB_ALWAYS_SB", wxLB_ALWAYS_SB },
-  { "wxLB_SORT", wxLB_SORT },
-  { "wxLB_OWNERDRAW", wxLB_OWNERDRAW },
-  { "wxLB_HSCROLL", wxLB_HSCROLL },
-  
+  { T("wxSINGLE"), wxLB_SINGLE },
+  { T("wxMULTIPLE"), wxLB_MULTIPLE },
+  { T("wxEXTENDED"), wxLB_EXTENDED },
+  { T("wxLB_SINGLE"), wxLB_SINGLE },
+  { T("wxLB_MULTIPLE"), wxLB_MULTIPLE },
+  { T("wxLB_EXTENDED"), wxLB_EXTENDED },
+  { T("wxLB_NEEDED_SB"), wxLB_NEEDED_SB },
+  { T("wxLB_ALWAYS_SB"), wxLB_ALWAYS_SB },
+  { T("wxLB_SORT("), wxLB_SORT },
+  { T("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
+  { T("wxLB_HSCROLL"), wxLB_HSCROLL },
+

   /* wxComboxBox */
   /* wxComboxBox */

-  { "wxCB_SIMPLE", wxCB_SIMPLE },
-  { "wxCB_DROPDOWN", wxCB_DROPDOWN },
-  { "wxCB_READONLY", wxCB_READONLY },
-  { "wxCB_SORT", wxCB_SORT },
-  
+  { T("wxCB_SIMPLE"), wxCB_SIMPLE },
+  { T("wxCB_DROPDOWN"), wxCB_DROPDOWN },
+  { T("wxCB_READONLY"), wxCB_READONLY },
+  { T("wxCB_SORT("), wxCB_SORT },
+

   /* wxGauge */
   /* wxGauge */

-  { "wxGA_PROGRESSBAR", wxGA_PROGRESSBAR },
-  { "wxGA_HORIZONTAL", wxGA_HORIZONTAL },
-  { "wxGA_VERTICAL", wxGA_VERTICAL },
+  { T("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
+  { T("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
+  { T("wxGA_VERTICAL"), wxGA_VERTICAL },

 
   /* wxTextCtrl */
 
   /* wxTextCtrl */

-  { "wxPASSWORD", wxPASSWORD},
-  { "wxPROCESS_ENTER", wxPROCESS_ENTER},
-  { "wxTE_PASSWORD", wxTE_PASSWORD},
-  { "wxTE_READONLY", wxTE_READONLY},
-  { "wxTE_PROCESS_ENTER", wxTE_PROCESS_ENTER},
-  { "wxTE_MULTILINE", wxTE_MULTILINE},
+  { T("wxPASSWORD"), wxPASSWORD},
+  { T("wxPROCESS_ENTER"), wxPROCESS_ENTER},
+  { T("wxTE_PASSWORD"), wxTE_PASSWORD},
+  { T("wxTE_READONLY"), wxTE_READONLY},
+  { T("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
+  { T("wxTE_MULTILINE"), wxTE_MULTILINE},
+  { T("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},

 
   /* wxRadioBox/wxRadioButton */
 
   /* wxRadioBox/wxRadioButton */

-  { "wxRB_GROUP", wxRB_GROUP },
-  { "wxRA_HORIZONTAL", wxRA_HORIZONTAL },
-  { "wxRA_VERTICAL", wxRA_VERTICAL },
+  { T("wxRB_GROUP"), wxRB_GROUP },
+  { T("wxRA_SPECIFY_COLS"), wxRA_SPECIFY_COLS },
+  { T("wxRA_SPECIFY_ROWS"), wxRA_SPECIFY_ROWS },
+  { T("wxRA_HORIZONTAL"), wxRA_HORIZONTAL },
+  { T("wxRA_VERTICAL"), wxRA_VERTICAL },

 
   /* wxSlider */
 
   /* wxSlider */

-  { "wxSL_HORIZONTAL", wxSL_HORIZONTAL },
-  { "wxSL_VERTICAL", wxSL_VERTICAL },
-  { "wxSL_AUTOTICKS", wxSL_AUTOTICKS },
-  { "wxSL_LABELS", wxSL_LABELS },
-  { "wxSL_LEFT", wxSL_LEFT },
-  { "wxSL_TOP", wxSL_TOP },
-  { "wxSL_RIGHT", wxSL_RIGHT },
-  { "wxSL_BOTTOM", wxSL_BOTTOM },
-  { "wxSL_BOTH", wxSL_BOTH },
-  { "wxSL_SELRANGE", wxSL_SELRANGE },
+  { T("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
+  { T("wxSL_VERTICAL"), wxSL_VERTICAL },
+  { T("wxSL_AUTOTICKS"), wxSL_AUTOTICKS },
+  { T("wxSL_LABELS"), wxSL_LABELS },
+  { T("wxSL_LEFT("), wxSL_LEFT },
+  { T("wxSL_TOP"), wxSL_TOP },
+  { T("wxSL_RIGHT("), wxSL_RIGHT },
+  { T("wxSL_BOTTOM"), wxSL_BOTTOM },
+  { T("wxSL_BOTH"), wxSL_BOTH },
+  { T("wxSL_SELRANGE"), wxSL_SELRANGE },

 
   /* wxScrollBar */
 
   /* wxScrollBar */

-  { "wxSB_HORIZONTAL", wxSB_HORIZONTAL },
-  { "wxSB_VERTICAL", wxSB_VERTICAL },
+  { T("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
+  { T("wxSB_VERTICAL"), wxSB_VERTICAL },

 
   /* wxButton */
 
   /* wxButton */

-  { "wxBU_AUTODRAW", wxBU_AUTODRAW },
-  { "wxBU_NOAUTODRAW", wxBU_NOAUTODRAW },
+  { T("wxBU_AUTODRAW"), wxBU_AUTODRAW },
+  { T("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },

 
   /* wxTreeCtrl */
 
   /* wxTreeCtrl */

-  { "wxTR_HAS_BUTTONS", wxTR_HAS_BUTTONS },
-  { "wxTR_EDIT_LABELS", wxTR_EDIT_LABELS },
-  { "wxTR_LINES_AT_ROOT", wxTR_LINES_AT_ROOT },
+  { T("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
+  { T("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
+  { T("wxTR_LINES_AT_ROOT("), wxTR_LINES_AT_ROOT },

 
   /* wxListCtrl */
 
   /* wxListCtrl */

-  { "wxLC_ICON", wxLC_ICON },
-  { "wxLC_SMALL_ICON", wxLC_SMALL_ICON },
-  { "wxLC_LIST", wxLC_LIST },
-  { "wxLC_REPORT", wxLC_REPORT },
-  { "wxLC_ALIGN_TOP", wxLC_ALIGN_TOP },
-  { "wxLC_ALIGN_LEFT", wxLC_ALIGN_LEFT },
-  { "wxLC_AUTOARRANGE", wxLC_AUTOARRANGE },
-  { "wxLC_USER_TEXT", wxLC_USER_TEXT },
-  { "wxLC_EDIT_LABELS", wxLC_EDIT_LABELS },
-  { "wxLC_NO_HEADER", wxLC_NO_HEADER },
-  { "wxLC_NO_SORT_HEADER", wxLC_NO_SORT_HEADER },
-  { "wxLC_SINGLE_SEL", wxLC_SINGLE_SEL },
-  { "wxLC_SORT_ASCENDING", wxLC_SORT_ASCENDING },
-  { "wxLC_SORT_DESCENDING", wxLC_SORT_DESCENDING },
+  { T("wxLC_ICON"), wxLC_ICON },
+  { T("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
+  { T("wxLC_LIST("), wxLC_LIST },
+  { T("wxLC_REPORT("), wxLC_REPORT },
+  { T("wxLC_ALIGN_TOP"), wxLC_ALIGN_TOP },
+  { T("wxLC_ALIGN_LEFT("), wxLC_ALIGN_LEFT },
+  { T("wxLC_AUTOARRANGE"), wxLC_AUTOARRANGE },
+  { T("wxLC_USER_TEXT("), wxLC_USER_TEXT },
+  { T("wxLC_EDIT_LABELS"), wxLC_EDIT_LABELS },
+  { T("wxLC_NO_HEADER"), wxLC_NO_HEADER },
+  { T("wxLC_NO_SORT_HEADER"), wxLC_NO_SORT_HEADER },
+  { T("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
+  { T("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
+  { T("wxLC_SORT_DESCENDING"), wxLC_SORT_DESCENDING },

 
   /* wxSpinButton */
 
   /* wxSpinButton */

-  { "wxSP_VERTICAL", wxSP_VERTICAL},
-  { "wxSP_HORIZONTAL", wxSP_HORIZONTAL},
-  { "wxSP_ARROW_KEYS", wxSP_ARROW_KEYS},
-  { "wxSP_WRAP", wxSP_WRAP},
+  { T("wxSP_VERTICAL"), wxSP_VERTICAL},
+  { T("wxSP_HORIZONTAL"), wxSP_HORIZONTAL},
+  { T("wxSP_ARROW_KEYS"), wxSP_ARROW_KEYS},
+  { T("wxSP_WRAP"), wxSP_WRAP},

 
   /* wxSplitterWnd */
 
   /* wxSplitterWnd */

-  { "wxSP_NOBORDER", wxSP_NOBORDER},
-  { "wxSP_3D", wxSP_3D},
-  { "wxSP_BORDER", wxSP_BORDER},
+  { T("wxSP_NOBORDER"), wxSP_NOBORDER},
+  { T("wxSP_3D"), wxSP_3D},
+  { T("wxSP_BORDER"), wxSP_BORDER},

 
   /* wxTabCtrl */
 
   /* wxTabCtrl */

-  { "wxTC_MULTILINE", wxTC_MULTILINE},
-  { "wxTC_RIGHTJUSTIFY", wxTC_RIGHTJUSTIFY},
-  { "wxTC_FIXEDWIDTH", wxTC_FIXEDWIDTH},
-  { "wxTC_OWNERDRAW", wxTC_OWNERDRAW},
+  { T("wxTC_MULTILINE"), wxTC_MULTILINE},
+  { T("wxTC_RIGHTJUSTIFY"), wxTC_RIGHTJUSTIFY},
+  { T("wxTC_FIXEDWIDTH"), wxTC_FIXEDWIDTH},
+  { T("wxTC_OWNERDRAW"), wxTC_OWNERDRAW},

 
   /* wxStatusBar95 */
 
   /* wxStatusBar95 */

-  { "wxST_SIZEGRIP", wxST_SIZEGRIP},
+  { T("wxST_SIZEGRIP"), wxST_SIZEGRIP},

 
   /* wxControl */
 
   /* wxControl */

-  { "wxFIXED_LENGTH", wxFIXED_LENGTH},
-  { "wxALIGN_LEFT", wxALIGN_LEFT},
-  { "wxALIGN_CENTER", wxALIGN_CENTER},
-  { "wxALIGN_CENTRE", wxALIGN_CENTRE},
-  { "wxALIGN_RIGHT", wxALIGN_RIGHT},
-  { "wxCOLOURED", wxCOLOURED},
-  
+  { T("wxFIXED_LENGTH"), wxFIXED_LENGTH},
+  { T("wxALIGN_LEFT("), wxALIGN_LEFT},
+  { T("wxALIGN_CENTER"), wxALIGN_CENTER},
+  { T("wxALIGN_CENTRE"), wxALIGN_CENTRE},
+  { T("wxALIGN_RIGHT("), wxALIGN_RIGHT},
+  { T("wxCOLOURED"), wxCOLOURED},
+

   /* wxToolBar */
   /* wxToolBar */

-  { "wxTB_3DBUTTONS", wxTB_3DBUTTONS},
-  { "wxTB_HORIZONTAL", wxTB_HORIZONTAL},
-  { "wxTB_VERTICAL", wxTB_VERTICAL},
-  { "wxTB_FLAT", wxTB_FLAT},
+  { T("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
+  { T("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
+  { T("wxTB_VERTICAL"), wxTB_VERTICAL},
+  { T("wxTB_FLAT("), wxTB_FLAT},
+
+  /* wxDialog */
+  { T("wxDIALOG_MODAL"), wxDIALOG_MODAL },

 
   /* Generic */
 
   /* Generic */

-  { "wxVSCROLL", wxVSCROLL },
-  { "wxHSCROLL", wxHSCROLL },
-  { "wxCAPTION", wxCAPTION },
-  { "wxSTAY_ON_TOP", wxSTAY_ON_TOP},
-  { "wxICONIZE", wxICONIZE},
-  { "wxMINIMIZE", wxICONIZE},
-  { "wxMAXIMIZE", wxMAXIMIZE},
-  { "wxSDI", 0},
-  { "wxMDI_PARENT", 0},
-  { "wxMDI_CHILD", 0},
-  { "wxTHICK_FRAME", wxTHICK_FRAME},
-  { "wxRESIZE_BORDER", wxRESIZE_BORDER},
-  { "wxSYSTEM_MENU", wxSYSTEM_MENU},
-  { "wxMINIMIZE_BOX", wxMINIMIZE_BOX},
-  { "wxMAXIMIZE_BOX", wxMAXIMIZE_BOX},
-  { "wxRESIZE_BOX", wxRESIZE_BOX},
-  { "wxDEFAULT_FRAME", wxDEFAULT_FRAME},
-  { "wxDEFAULT_DIALOG_STYLE", wxDEFAULT_DIALOG_STYLE},
-  { "wxBORDER", wxBORDER},
-  { "wxRETAINED", wxRETAINED},
-  { "wxNATIVE_IMPL", 0},
-  { "wxEXTENDED_IMPL", 0},
-  { "wxBACKINGSTORE", wxBACKINGSTORE},
-//  { "wxFLAT", wxFLAT},
-//  { "wxMOTIF_RESIZE", wxMOTIF_RESIZE},
-  { "wxFIXED_LENGTH", 0},
-  { "wxDOUBLE_BORDER", wxDOUBLE_BORDER},
-  { "wxSUNKEN_BORDER", wxSUNKEN_BORDER},
-  { "wxRAISED_BORDER", wxRAISED_BORDER},
-  { "wxSIMPLE_BORDER", wxSIMPLE_BORDER},
-  { "wxSTATIC_BORDER", wxSTATIC_BORDER},
-  { "wxTRANSPARENT_WINDOW", wxTRANSPARENT_WINDOW},
-  { "wxNO_BORDER", wxNO_BORDER},
-  { "wxCLIP_CHILDREN", wxCLIP_CHILDREN},
-
-  { "wxTINY_CAPTION_HORIZ", wxTINY_CAPTION_HORIZ},
-  { "wxTINY_CAPTION_VERT", wxTINY_CAPTION_VERT},
+  { T("wxVSCROLL"), wxVSCROLL },
+  { T("wxHSCROLL"), wxHSCROLL },
+  { T("wxCAPTION"), wxCAPTION },
+  { T("wxSTAY_ON_TOP"), wxSTAY_ON_TOP},
+  { T("wxICONIZE"), wxICONIZE},
+  { T("wxMINIMIZE"), wxICONIZE},
+  { T("wxMAXIMIZE"), wxMAXIMIZE},
+  { T("wxSDI"), 0},
+  { T("wxMDI_PARENT("), 0},
+  { T("wxMDI_CHILD"), 0},
+  { T("wxTHICK_FRAME"), wxTHICK_FRAME},
+  { T("wxRESIZE_BORDER"), wxRESIZE_BORDER},
+  { T("wxSYSTEM_MENU"), wxSYSTEM_MENU},
+  { T("wxMINIMIZE_BOX"), wxMINIMIZE_BOX},
+  { T("wxMAXIMIZE_BOX"), wxMAXIMIZE_BOX},
+  { T("wxRESIZE_BOX"), wxRESIZE_BOX},
+  { T("wxDEFAULT_FRAME_STYLE"), wxDEFAULT_FRAME_STYLE},
+  { T("wxDEFAULT_FRAME"), wxDEFAULT_FRAME_STYLE},
+  { T("wxDEFAULT_DIALOG_STYLE"), wxDEFAULT_DIALOG_STYLE},
+  { T("wxBORDER"), wxBORDER},
+  { T("wxRETAINED"), wxRETAINED},
+  { T("wxNATIVE_IMPL"), 0},
+  { T("wxEXTENDED_IMPL"), 0},
+  { T("wxBACKINGSTORE"), wxBACKINGSTORE},
+//  { T("wxFLAT("), wxFLAT},
+//  { T("wxMOTIF_RESIZE"), wxMOTIF_RESIZE},
+  { T("wxFIXED_LENGTH"), 0},
+  { T("wxDOUBLE_BORDER"), wxDOUBLE_BORDER},
+  { T("wxSUNKEN_BORDER"), wxSUNKEN_BORDER},
+  { T("wxRAISED_BORDER"), wxRAISED_BORDER},
+  { T("wxSIMPLE_BORDER"), wxSIMPLE_BORDER},
+  { T("wxSTATIC_BORDER"), wxSTATIC_BORDER},
+  { T("wxTRANSPARENT_WINDOW"), wxTRANSPARENT_WINDOW},
+  { T("wxNO_BORDER"), wxNO_BORDER},
+  { T("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
+  { T("wxTAB_TRAVERSAL"), 0}, // Compatibility only
+
+  { T("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
+  { T("wxTINY_CAPTION_VERT("), wxTINY_CAPTION_VERT},

 
   // Text font families
 
   // Text font families

-  { "wxDEFAULT", wxDEFAULT},
-  { "wxDECORATIVE", wxDECORATIVE},
-  { "wxROMAN", wxROMAN},
-  { "wxSCRIPT", wxSCRIPT},
-  { "wxSWISS", wxSWISS},
-  { "wxMODERN", wxMODERN},
-  { "wxTELETYPE", wxTELETYPE},
-  { "wxVARIABLE", wxVARIABLE},
-  { "wxFIXED", wxFIXED},
-  { "wxNORMAL", wxNORMAL},
-  { "wxLIGHT", wxLIGHT},
-  { "wxBOLD", wxBOLD},
-  { "wxITALIC", wxITALIC},
-  { "wxSLANT", wxSLANT},
-  { "wxSOLID", wxSOLID},
-  { "wxDOT", wxDOT},
-  { "wxLONG_DASH", wxLONG_DASH},
-  { "wxSHORT_DASH", wxSHORT_DASH},
-  { "wxDOT_DASH", wxDOT_DASH},
-  { "wxUSER_DASH", wxUSER_DASH},
-  { "wxTRANSPARENT", wxTRANSPARENT},
-  { "wxSTIPPLE", wxSTIPPLE},
-  { "wxBDIAGONAL_HATCH", wxBDIAGONAL_HATCH},
-  { "wxCROSSDIAG_HATCH", wxCROSSDIAG_HATCH},
-  { "wxFDIAGONAL_HATCH", wxFDIAGONAL_HATCH},
-  { "wxCROSS_HATCH", wxCROSS_HATCH},
-  { "wxHORIZONTAL_HATCH", wxHORIZONTAL_HATCH},
-  { "wxVERTICAL_HATCH", wxVERTICAL_HATCH},
-  { "wxJOIN_BEVEL", wxJOIN_BEVEL},
-  { "wxJOIN_MITER", wxJOIN_MITER},
-  { "wxJOIN_ROUND", wxJOIN_ROUND},
-  { "wxCAP_ROUND", wxCAP_ROUND},
-  { "wxCAP_PROJECTING", wxCAP_PROJECTING},
-  { "wxCAP_BUTT", wxCAP_BUTT},
+  { T("wxDEFAULT("), wxDEFAULT},
+  { T("wxDECORATIVE"), wxDECORATIVE},
+  { T("wxROMAN"), wxROMAN},
+  { T("wxSCRIPT("), wxSCRIPT},
+  { T("wxSWISS"), wxSWISS},
+  { T("wxMODERN"), wxMODERN},
+  { T("wxTELETYPE"), wxTELETYPE},
+  { T("wxVARIABLE"), wxVARIABLE},
+  { T("wxFIXED"), wxFIXED},
+  { T("wxNORMAL"), wxNORMAL},
+  { T("wxLIGHT("), wxLIGHT},
+  { T("wxBOLD"), wxBOLD},
+  { T("wxITALIC"), wxITALIC},
+  { T("wxSLANT("), wxSLANT},
+  { T("wxSOLID"), wxSOLID},
+  { T("wxDOT("), wxDOT},
+  { T("wxLONG_DASH"), wxLONG_DASH},
+  { T("wxSHORT_DASH"), wxSHORT_DASH},
+  { T("wxDOT_DASH"), wxDOT_DASH},
+  { T("wxUSER_DASH"), wxUSER_DASH},
+  { T("wxTRANSPARENT("), wxTRANSPARENT},
+  { T("wxSTIPPLE"), wxSTIPPLE},
+  { T("wxBDIAGONAL_HATCH"), wxBDIAGONAL_HATCH},
+  { T("wxCROSSDIAG_HATCH"), wxCROSSDIAG_HATCH},
+  { T("wxFDIAGONAL_HATCH"), wxFDIAGONAL_HATCH},
+  { T("wxCROSS_HATCH"), wxCROSS_HATCH},
+  { T("wxHORIZONTAL_HATCH"), wxHORIZONTAL_HATCH},
+  { T("wxVERTICAL_HATCH"), wxVERTICAL_HATCH},
+  { T("wxJOIN_BEVEL"), wxJOIN_BEVEL},
+  { T("wxJOIN_MITER"), wxJOIN_MITER},
+  { T("wxJOIN_ROUND"), wxJOIN_ROUND},
+  { T("wxCAP_ROUND"), wxCAP_ROUND},
+  { T("wxCAP_PROJECTING"), wxCAP_PROJECTING},
+  { T("wxCAP_BUTT("), wxCAP_BUTT},

 
   // Logical ops
 
   // Logical ops

-  { "wxCLEAR", wxCLEAR},
-  { "wxXOR", wxXOR},
-  { "wxINVERT", wxINVERT},
-  { "wxOR_REVERSE", wxOR_REVERSE},
-  { "wxAND_REVERSE", wxAND_REVERSE},
-  { "wxCOPY", wxCOPY},
-  { "wxAND", wxAND},
-  { "wxAND_INVERT", wxAND_INVERT},
-  { "wxNO_OP", wxNO_OP},
-  { "wxNOR", wxNOR},
-  { "wxEQUIV", wxEQUIV},
-  { "wxSRC_INVERT", wxSRC_INVERT},
-  { "wxOR_INVERT", wxOR_INVERT},
-  { "wxNAND", wxNAND},
-  { "wxOR", wxOR},
-  { "wxSET", wxSET},
-
-  { "wxFLOOD_SURFACE", wxFLOOD_SURFACE},
-  { "wxFLOOD_BORDER", wxFLOOD_BORDER},
-  { "wxODDEVEN_RULE", wxODDEVEN_RULE},
-  { "wxWINDING_RULE", wxWINDING_RULE},
-  { "wxHORIZONTAL", wxHORIZONTAL},
-  { "wxVERTICAL", wxVERTICAL},
-  { "wxBOTH", wxBOTH},
-  { "wxCENTER_FRAME", wxCENTER_FRAME},
-  { "wxOK", wxOK},
-  { "wxYES_NO", wxYES_NO},
-  { "wxCANCEL", wxCANCEL},
-  { "wxYES", wxYES},
-  { "wxNO", wxNO},
-  { "wxICON_EXCLAMATION", wxICON_EXCLAMATION},
-  { "wxICON_HAND", wxICON_HAND},
-  { "wxICON_QUESTION", wxICON_QUESTION},
-  { "wxICON_INFORMATION", wxICON_INFORMATION},
-  { "wxICON_STOP", wxICON_STOP},
-  { "wxICON_ASTERISK", wxICON_ASTERISK},
-  { "wxICON_MASK", wxICON_MASK},
-  { "wxCENTRE", wxCENTRE},
-  { "wxCENTER", wxCENTRE},
-  { "wxUSER_COLOURS", wxUSER_COLOURS},
-  { "wxVERTICAL_LABEL", 0},
-  { "wxHORIZONTAL_LABEL", 0},
+  { T("wxCLEAR"), wxCLEAR},
+  { T("wxXOR"), wxXOR},
+  { T("wxINVERT("), wxINVERT},
+  { T("wxOR_REVERSE"), wxOR_REVERSE},
+  { T("wxAND_REVERSE"), wxAND_REVERSE},
+  { T("wxCOPY"), wxCOPY},
+  { T("wxAND"), wxAND},
+  { T("wxAND_INVERT("), wxAND_INVERT},
+  { T("wxNO_OP"), wxNO_OP},
+  { T("wxNOR"), wxNOR},
+  { T("wxEQUIV"), wxEQUIV},
+  { T("wxSRC_INVERT("), wxSRC_INVERT},
+  { T("wxOR_INVERT("), wxOR_INVERT},
+  { T("wxNAND"), wxNAND},
+  { T("wxOR"), wxOR},
+  { T("wxSET("), wxSET},
+
+  { T("wxFLOOD_SURFACE"), wxFLOOD_SURFACE},
+  { T("wxFLOOD_BORDER"), wxFLOOD_BORDER},
+  { T("wxODDEVEN_RULE"), wxODDEVEN_RULE},
+  { T("wxWINDING_RULE"), wxWINDING_RULE},
+  { T("wxHORIZONTAL"), wxHORIZONTAL},
+  { T("wxVERTICAL"), wxVERTICAL},
+  { T("wxBOTH"), wxBOTH},
+  { T("wxCENTER_FRAME"), wxCENTER_FRAME},
+  { T("wxOK"), wxOK},
+  { T("wxYES_NO"), wxYES_NO},
+  { T("wxCANCEL"), wxCANCEL},
+  { T("wxYES"), wxYES},
+  { T("wxNO"), wxNO},
+  { T("wxICON_EXCLAMATION"), wxICON_EXCLAMATION},
+  { T("wxICON_HAND"), wxICON_HAND},
+  { T("wxICON_QUESTION"), wxICON_QUESTION},
+  { T("wxICON_INFORMATION"), wxICON_INFORMATION},
+  { T("wxICON_STOP"), wxICON_STOP},
+  { T("wxICON_ASTERISK"), wxICON_ASTERISK},
+  { T("wxICON_MASK"), wxICON_MASK},
+  { T("wxCENTRE"), wxCENTRE},
+  { T("wxCENTER"), wxCENTRE},
+  { T("wxUSER_COLOURS"), wxUSER_COLOURS},
+  { T("wxVERTICAL_LABEL"), 0},
+  { T("wxHORIZONTAL_LABEL"), 0},

 
   // Bitmap types (not strictly styles)
 
   // Bitmap types (not strictly styles)

-  { "wxBITMAP_TYPE_XPM", wxBITMAP_TYPE_XPM},
-  { "wxBITMAP_TYPE_XBM", wxBITMAP_TYPE_XBM},
-  { "wxBITMAP_TYPE_BMP", wxBITMAP_TYPE_BMP},
-  { "wxBITMAP_TYPE_RESOURCE", wxBITMAP_TYPE_BMP_RESOURCE},
-  { "wxBITMAP_TYPE_BMP_RESOURCE", wxBITMAP_TYPE_BMP_RESOURCE},
-  { "wxBITMAP_TYPE_GIF", wxBITMAP_TYPE_GIF},
-  { "wxBITMAP_TYPE_TIF", wxBITMAP_TYPE_TIF},
-  { "wxBITMAP_TYPE_ICO", wxBITMAP_TYPE_ICO},
-  { "wxBITMAP_TYPE_ICO_RESOURCE", wxBITMAP_TYPE_ICO_RESOURCE},
-  { "wxBITMAP_TYPE_CUR", wxBITMAP_TYPE_CUR},
-  { "wxBITMAP_TYPE_CUR_RESOURCE", wxBITMAP_TYPE_CUR_RESOURCE},
-  { "wxBITMAP_TYPE_XBM_DATA", wxBITMAP_TYPE_XBM_DATA},
-  { "wxBITMAP_TYPE_XPM_DATA", wxBITMAP_TYPE_XPM_DATA},
-  { "wxBITMAP_TYPE_ANY", wxBITMAP_TYPE_ANY}
+  { T("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
+  { T("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},
+  { T("wxBITMAP_TYPE_BMP"), wxBITMAP_TYPE_BMP},
+  { T("wxBITMAP_TYPE_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
+  { T("wxBITMAP_TYPE_BMP_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
+  { T("wxBITMAP_TYPE_GIF"), wxBITMAP_TYPE_GIF},
+  { T("wxBITMAP_TYPE_TIF"), wxBITMAP_TYPE_TIF},
+  { T("wxBITMAP_TYPE_ICO"), wxBITMAP_TYPE_ICO},
+  { T("wxBITMAP_TYPE_ICO_RESOURCE"), wxBITMAP_TYPE_ICO_RESOURCE},
+  { T("wxBITMAP_TYPE_CUR"), wxBITMAP_TYPE_CUR},
+  { T("wxBITMAP_TYPE_CUR_RESOURCE"), wxBITMAP_TYPE_CUR_RESOURCE},
+  { T("wxBITMAP_TYPE_XBM_DATA"), wxBITMAP_TYPE_XBM_DATA},
+  { T("wxBITMAP_TYPE_XPM_DATA"), wxBITMAP_TYPE_XPM_DATA},
+  { T("wxBITMAP_TYPE_ANY"), wxBITMAP_TYPE_ANY}

 };
 
 static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));
 };
 
 static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxResourceBitListStruct));


@@ -1954,14 +2043,15 @@ static int wxResourceBitListCount = (sizeof(wxResourceBitListTable)/sizeof(wxRes
 long wxParseWindowStyle(const wxString& bitListString)
 {
   int i = 0;
 long wxParseWindowStyle(const wxString& bitListString)
 {
   int i = 0;

-  char *word;
+  wxChar *word;

   long bitList = 0;
   long bitList = 0;

-  while ((word = wxResourceParseWord((char*) (const char*) bitListString, &i)))
+  word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);
+  while (word != NULL)

   {
     bool found = FALSE;
     int j;
     for (j = 0; j < wxResourceBitListCount; j++)
   {
     bool found = FALSE;
     int j;
     for (j = 0; j < wxResourceBitListCount; j++)

-      if (strcmp(wxResourceBitListTable[j].word, word) == 0)
+      if (wxStrcmp(wxResourceBitListTable[j].word, word) == 0)

       {
         bitList |= wxResourceBitListTable[j].bits;
         found = TRUE;
       {
         bitList |= wxResourceBitListTable[j].bits;
         found = TRUE;


@@ -1972,6 +2062,7 @@ long wxParseWindowStyle(const wxString& bitListString)
       wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
       return 0;
     }
       wxLogWarning(_("Unrecognized style %s whilst parsing resource."), word);
       return 0;
     }

+    word = wxResourceParseWord(WXSTRINGCAST bitListString, &i);

   }
   return bitList;
 }
   }
   return bitList;
 }


@@ -1980,25 +2071,25 @@ long wxParseWindowStyle(const wxString& 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(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table)
 {
   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() == T("")) || (item->GetType() != T("wxBitmap")))

     {
     {

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

       return wxNullBitmap;
     }
     int thisDepth = wxDisplayDepth();
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;
       return wxNullBitmap;
     }
     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)


@@ -2091,8 +2182,8 @@ wxBitmap wxResourceCreateBitmap(const wxString& 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?"), (const char*) name);
-          return (wxBitmap *) NULL;
+                         "Forgot to use wxResourceLoadBitmapData?"), (const wxChar*) name);
+          return wxNullBitmap;

         }
         return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
 #else
         }
         return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
 #else


@@ -2107,10 +2198,10 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         if (!item)
         {
           wxLogWarning(_("Failed to find XPM resource %s.\n"
         if (!item)
         {
           wxLogWarning(_("Failed to find XPM resource %s.\n"

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

         }
         }

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

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


@@ -2126,7 +2217,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
   }
   else
   {
   }
   else
   {

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

     return wxNullBitmap;
   }
 }
     return wxNullBitmap;
   }
 }


@@ -2135,25 +2226,25 @@ wxBitmap wxResourceCreateBitmap(const wxString& 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(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     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() == T("")) || wxStrcmp(item->GetType(), T("wxIcon")) != 0)

     {
     {

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

       return wxNullIcon;
     }
     int thisDepth = wxDisplayDepth();
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;
       return wxNullIcon;
     }
     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)


@@ -2246,10 +2337,10 @@ wxIcon wxResourceCreateIcon(const wxString& 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?"), (const char*) name);
-          return (wxIcon *) NULL;
+                         "Forgot to use wxResourceLoadIconData?"), (const wxChar*) name);
+          return wxNullIcon;

         }
         }

-        return 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


@@ -2279,7 +2370,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
       default:
       {
 #ifdef __WXGTK__
       default:
       {
 #ifdef __WXGTK__

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

 #else
         return wxIcon(name, bitmapType);
 #endif
 #else
         return wxIcon(name, bitmapType);
 #endif


@@ -2290,8 +2381,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
   }
   else
   {
   }
   else
   {

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

   }
 }
 
   }
 }
 


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

-    if ((child->GetType() != "") && (child->GetType() == "wxMenuSeparator"))
+    if ((child->GetType() != T("")) && (child->GetType() == T("wxMenuSeparator")))

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


@@ -2323,9 +2414,9 @@ wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *ta
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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

-  if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))
+  if (menuResource && (menuResource->GetType() != T("")) && (menuResource->GetType() == T("wxMenu")))

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


@@ -2347,9 +2438,9 @@ 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() != "") && (menuResource->GetType() == "wxMenu"))
+  if (menuResource && (menuResource->GetType() != T("")) && (menuResource->GetType() == T("wxMenu")))

 //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
     return wxResourceCreateMenu(menuResource);
   return (wxMenu *) NULL;
 //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
     return wxResourceCreateMenu(menuResource);
   return (wxMenu *) NULL;


@@ -2360,7 +2451,7 @@ bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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


@@ -2368,7 +2459,7 @@ bool wxResourceParseFile(const wxString& filename, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

   return table->ParseResourceFile(filename);
 }
 
   return table->ParseResourceFile(filename);
 }
 


@@ -2377,7 +2468,7 @@ bool wxResourceRegisterBitmapData(const wxString& name, char bits[], int width,
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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


@@ -2405,8 +2496,8 @@ bool wxResourceAddIdentifier(const wxString& name, int value, wxResourceTable *t
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
-  table->identifiers.Put(name, (wxObject *)value);
+
+  table->identifiers.Put(name, (wxObject *)(long)value);

   return TRUE;
 }
 
   return TRUE;
 }
 


@@ -2414,8 +2505,8 @@ int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

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

 }
 
 /*
 }
 
 /*


@@ -2426,8 +2517,8 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

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

   if (!fd)
   {
     return FALSE;
   if (!fd)
   {
     return FALSE;


@@ -2437,12 +2528,12 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
       wxGetResourceToken(fd);
     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
       wxGetResourceToken(fd);

-      char *name = copystring(wxResourceBuffer);
+      wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));

       wxGetResourceToken(fd);
       wxGetResourceToken(fd);

-      char *value = copystring(wxResourceBuffer);
-      if (isdigit(value[0]))
+      wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+      if (wxIsdigit(value[0]))

       {
       {

-        int val = (int)atol(value);
+        int val = (int)wxAtol(value);

         wxResourceAddIdentifier(name, val, table);
       }
       delete[] name;
         wxResourceAddIdentifier(name, val, table);
       }
       delete[] name;


@@ -2477,49 +2568,53 @@ static int ungetc_string()
 
 bool wxEatWhiteSpaceString(char *s)
 {
 
 bool wxEatWhiteSpaceString(char *s)
 {

-  int ch = getc_string(s);
-  if (ch == EOF)
-    return TRUE;
-    
-  if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
-  {
-    ungetc_string();
-    return TRUE;
-  }
+  int ch = 0;

 
 

-  // Eat whitespace
-  while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-    ch = getc_string(s);
-  // Check for comment
-  if (ch == '/')
-  {
-    ch = getc_string(s);
-    if (ch == '*')
-    {
-      bool finished = FALSE;
-      while (!finished)
+   while ((ch = getc_string(s)) != EOF)

       {
       {

-        ch = getc_string(s);
-        if (ch == EOF)
-          return FALSE;
-        if (ch == '*')
-        {
-          int newCh = getc_string(s);
-          if (newCh == '/')
-            finished = TRUE;
-          else
-          {
+      switch (ch)
+         {
+         case ' ':
+         case 0x0a:
+         case 0x0d:
+         case 0x09:
+            break;
+         case '/':
+            {
+            int prev_ch = ch;
+            ch = getc_string(s);
+            if (ch == EOF)
+               {
+               ungetc_string();
+               return TRUE;
+               }
+
+            if (ch == '*')
+               {
+               // Eat C comment
+               prev_ch = 0;
+               while ((ch = getc_string(s)) != EOF)
+                  {
+                  if (ch == '/' && prev_ch == '*')
+                     break;
+                  prev_ch = ch;
+                  }
+               }
+            else
+               {
+               ungetc_string();
+               ungetc_string();
+               return TRUE;
+               }
+            }
+            break;
+         default:

             ungetc_string();
             ungetc_string();

-          }
-        }
+            return TRUE;
+
+         }

       }
       }

-    }
-    else // False alarm
-      return FALSE;
-  }
-  else if (ch != EOF)
-    ungetc_string();
-  return wxEatWhiteSpaceString(s);
+   return FALSE;

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


@@ -2575,7 +2670,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;


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

- 
+

 bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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


@@ -2606,12 +2701,12 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
   if (strcmp(wxResourceBuffer, "#define") == 0)
   {
     wxGetResourceTokenString(s);
   if (strcmp(wxResourceBuffer, "#define") == 0)
   {
     wxGetResourceTokenString(s);

-    char *name = copystring(wxResourceBuffer);
+    wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));

     wxGetResourceTokenString(s);
     wxGetResourceTokenString(s);

-    char *value = copystring(wxResourceBuffer);
-    if (isalpha(value[0]))
+    wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
+    if (wxIsdigit(value[0]))

     {
     {

-      int val = (int)atol(value);
+      int val = (int)wxAtol(value);

       wxResourceAddIdentifier(name, val, table);
     }
     else
       wxResourceAddIdentifier(name, val, table);
     }
     else


@@ -2623,7 +2718,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     }
     delete[] name;
     delete[] value;
     }
     delete[] name;
     delete[] value;

- 
+

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


@@ -2649,10 +2744,10 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
 */
   else if (strcmp(wxResourceBuffer, "static") != 0)
   {
 */
   else if (strcmp(wxResourceBuffer, "static") != 0)
   {

-    char buf[300];
-    strcpy(buf, _("Found "));
-    strncat(buf, wxResourceBuffer, 30);
-    strcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));
+    wxChar buf[300];
+    wxStrcpy(buf, _("Found "));
+    wxStrncat(buf, wxConvCurrent->cMB2WX(wxResourceBuffer), 30);
+    wxStrcat(buf, _(", expected static, #include or #define\nwhilst parsing resource."));

     wxLogWarning(buf);
     return FALSE;
   }
     wxLogWarning(buf);
     return FALSE;
   }


@@ -2670,7 +2765,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& 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))
   {


@@ -2684,9 +2779,10 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     wxLogWarning(_("Expected '*' whilst parsing resource."));
     return FALSE;
   }
     wxLogWarning(_("Expected '*' whilst parsing resource."));
     return FALSE;
   }

-  char nameBuf[100];
-  strncpy(nameBuf, wxResourceBuffer+1, 99);
-    
+  wxChar nameBuf[100];
+  wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
+  nameBuf[99] = 0;
+

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


@@ -2728,11 +2824,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);


@@ -2760,15 +2856,15 @@ bool wxResourceParseString(char *s, wxResourceTable *table)
  * resource loading facility
  */
 
  * resource loading facility
  */
 

-bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table)
+bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceName, const wxResourceTable *table)

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

-    
-  wxItemResource *resource = table->FindResource((const char *)resourceName);
+
+  wxItemResource *resource = table->FindResource((const wxChar *)resourceName);

 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
 //  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() == T("")) ||
+    ! ((resource->GetType() == T("wxDialog")) || (resource->GetType() == T("wxPanel"))))

     return FALSE;
 
   wxString title(resource->GetTitle());
     return FALSE;
 
   wxString title(resource->GetTitle());


@@ -2799,7 +2895,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
   }
   else
   {
   }
   else
   {

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

       return FALSE;
   }
 
       return FALSE;
   }
 


@@ -2817,7 +2913,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
   }
 
   // Should have some kind of font at this point
   }
 
   // Should have some kind of font at this point

-  if (!GetFont()->Ok())
+  if (!GetFont().Ok())

       SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
   if (!GetBackgroundColour().Ok())
       SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
       SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
   if (!GetBackgroundColour().Ok())
       SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));


@@ -2838,7 +2934,7 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
   while (node)
   {
     wxItemResource *childResource = (wxItemResource *)node->Data();
   while (node)
   {
     wxItemResource *childResource = (wxItemResource *)node->Data();

-    
+

     (void) CreateItem(childResource, resource, table);
 
     node = node->Next();
     (void) CreateItem(childResource, resource, table);
 
     node = node->Next();


@@ -2846,11 +2942,18 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
   return TRUE;
 }
 
   return TRUE;
 }
 

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

 {
   if (!table)
     table = wxDefaultResourceTable;
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
 {
   if (!table)
     table = wxDefaultResourceTable;
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 

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

 #endif // wxUSE_WX_RESOURCES
 #endif // wxUSE_WX_RESOURCES