::bindInsertParams() was leaving some column bindings uninitialized if the column...

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index f194ea4167a29e649be6b3c84f5b8c8ea1d089d6..c32447bfa775e8c9f4987fe6c2c265d244add3b1 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -39,7 +39,6 @@
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"

-#include "wx/radiobut.h"

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


@@ -48,15 +47,13 @@
 #include "wx/icon.h"
 #include "wx/statbox.h"
 #include "wx/statbmp.h"
 #include "wx/icon.h"
 #include "wx/statbox.h"
 #include "wx/statbmp.h"

-#if wxUSE_GAUGE

 #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_RADIOBUTTON
+#if wxUSE_RADIOBTN

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


@@ -82,6 +79,7 @@
 #include "wx/wxexpr.h"
 
 #include "wx/settings.h"
 #include "wx/wxexpr.h"
 
 #include "wx/settings.h"

+#include "wx/stream.h"

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


@@ -96,6 +94,7 @@ wxItemResource *wxResourceInterpretIcon(wxResourceTable& table, wxExpr *expr);
 wxFont wxResourceInterpretFontSpec(wxExpr *expr);
 
 bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);
 wxFont wxResourceInterpretFontSpec(wxExpr *expr);
 
 bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table = (wxResourceTable *) NULL);

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

 bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxResourceTable *) NULL);
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxResourceTable *) NULL);
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;


@@ -122,10 +121,8 @@ void wxLogWarning(char *msg)
   wxMessageBox(msg, _("Warning"), wxOK);
 }
 
   wxMessageBox(msg, _("Warning"), wxOK);
 }
 

-#if !USE_SHARED_LIBRARY

 IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)
 IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject)
 IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable)

-#endif

 
 wxItemResource::wxItemResource()
 {
 
 wxItemResource::wxItemResource()
 {


@@ -174,10 +171,10 @@ wxItemResource *wxResourceTable::FindResource(const wxString& name) const
 void wxResourceTable::AddResource(wxItemResource *item)
 {
   wxString name = item->GetName();
 void wxResourceTable::AddResource(wxItemResource *item)
 {
   wxString name = item->GetName();

-  if (name == _T(""))
+  if (name == wxT(""))

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

-  if (name == _T(""))
-    name = _T("no name");
+  if (name == wxT(""))
+    name = wxT("no name");

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


@@ -194,7 +191,8 @@ bool wxResourceTable::DeleteResource(const wxString& name)
     // parent's child list.
     BeginFind();
     wxNode *node = (wxNode *) NULL;
     // 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))


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

+      node = Next();

     }
 
     delete item;
     }
 
     delete item;


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

+bool wxResourceTable::ParseResourceFile( wxInputStream *is )
+{
+  wxExprDatabase db;
+       int len = is->StreamSize() ;
+
+  bool eof = FALSE;
+  while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
+  {
+               wxResourceReadOneResource(is, db, &eof, this) ;
+  }
+  return wxResourceInterpretResources(*this, db);
+}
+

 bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
   wxExprDatabase db;
 
 bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
   wxExprDatabase db;
 

+#ifdef __WXMAC__
+  FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r");
+#else  

   FILE *fd = fopen(filename.fn_str(), "r");
   FILE *fd = fopen(filename.fn_str(), "r");

+#endif

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


@@ -244,7 +260,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(_T("wxXBMData"));
+  item->SetType(wxT("wxXBMData"));

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


@@ -258,7 +274,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(_T("wxXPMData"));
+  item->SetType(wxT("wxXPMData"));

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


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

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

       {
       {

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

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


@@ -328,10 +344,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(_T("wxMessage")) || itemType == wxString(_T("wxStaticText")) ||
-         itemType == wxString(_T("wxStaticBitmap")))
+   else if (itemType == wxString(wxT("wxMessage")) || itemType == wxString(wxT("wxStaticText")) ||
+         itemType == wxString(wxT("wxStaticBitmap")))

       {
       {

-        if (childResource->GetValue4() != _T(""))
+        if (childResource->GetValue4() != wxT("") || itemType == wxString(wxT("wxStaticBitmap")) )

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


@@ -341,6 +357,12 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
             ((wxItemResource*) childResource)->SetBitmap(bitmap);
           }
 #if wxUSE_BITMAP_MESSAGE
             ((wxItemResource*) childResource)->SetBitmap(bitmap);
           }
 #if wxUSE_BITMAP_MESSAGE

+#ifdef __WXMSW__
+          // Use a default bitmap
+          if (!bitmap.Ok())
+             bitmap.LoadFile("cross_bmp", wxBITMAP_TYPE_BMP_RESOURCE);
+#endif
+

           if (bitmap.Ok())
            control = new wxStaticBitmap(parent, id, bitmap, pos, size,
              childResource->GetStyle(), childResource->GetName());
           if (bitmap.Ok())
            control = new wxStaticBitmap(parent, id, bitmap, pos, size,
              childResource->GetStyle(), childResource->GetName());


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

-   else if (itemType == wxString(_T("wxText")) || itemType == wxString(_T("wxTextCtrl")) || itemType == wxString(_T("wxMultiText")))
+   else if (itemType == wxString(wxT("wxText")) || itemType == wxString(wxT("wxTextCtrl")) || itemType == wxString(wxT("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(_T("wxCheckBox")))
+   else if (itemType == wxString(wxT("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());


@@ -365,7 +387,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(_T("wxGauge")))
+   else if (itemType == wxString(wxT("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());


@@ -373,8 +395,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(_T("wxRadioButton")))
+#if wxUSE_RADIOBTN
+   else if (itemType == wxString(wxT("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,


@@ -382,7 +404,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
       }
 #endif
 #if wxUSE_SCROLLBAR
       }
 #endif
 #if wxUSE_SCROLLBAR

-   else if (itemType == wxString(_T("wxScrollBar")))
+   else if (itemType == wxString(wxT("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());


@@ -397,18 +419,18 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
 
       }
 #endif
 
       }
 #endif

-   else if (itemType == wxString(_T("wxSlider")))
+   else if (itemType == wxString(wxT("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(_T("wxGroupBox")) || itemType == wxString(_T("wxStaticBox")))
+   else if (itemType == wxString(wxT("wxGroupBox")) || itemType == wxString(wxT("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(_T("wxListBox")))
+   else if (itemType == wxString(wxT("wxListBox")))

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


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

-   else if (itemType == wxString(_T("wxChoice")))
+   else if (itemType == wxString(wxT("wxChoice")))

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


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

-   else if (itemType == wxString(_T("wxComboBox")))
+   else if (itemType == wxString(wxT("wxComboBox")))

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


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

-   else if (itemType == wxString(_T("wxRadioBox")))
+   else if (itemType == wxString(wxT("wxRadioBox")))

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


@@ -533,25 +555,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 == _T("dialog"))
+    if (functor == wxT("dialog"))

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

-    else if (functor == _T("panel"))
+    else if (functor == wxT("panel"))

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

-    else if (functor == _T("menubar"))
+    else if (functor == wxT("menubar"))

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

-    else if (functor == _T("menu"))
+    else if (functor == wxT("menu"))

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

-    else if (functor == _T("string"))
+    else if (functor == wxT("string"))

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

-    else if (functor == _T("bitmap"))
+    else if (functor == wxT("bitmap"))

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

-    else if (functor == _T("icon"))
+    else if (functor == wxT("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() != _T(""))
+      if (item->GetName() != wxT(""))

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


@@ -562,26 +584,26 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
 
 static const wxChar *g_ValidControlClasses[] =
 {
 
 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")
+    wxT("wxButton"),
+    wxT("wxBitmapButton"),
+    wxT("wxMessage"),
+    wxT("wxStaticText"),
+    wxT("wxStaticBitmap"),
+    wxT("wxText"),
+    wxT("wxTextCtrl"),
+    wxT("wxMultiText"),
+    wxT("wxListBox"),
+    wxT("wxRadioBox"),
+    wxT("wxRadioButton"),
+    wxT("wxCheckBox"),
+    wxT("wxBitmapCheckBox"),
+    wxT("wxGroupBox"),
+    wxT("wxStaticBox"),
+    wxT("wxSlider"),
+    wxT("wxGauge"),
+    wxT("wxScrollBar"),
+    wxT("wxChoice"),
+    wxT("wxComboBox")

 };
 
 static bool wxIsValidControlClass(const wxString& c)
 };
 
 static bool wxIsValidControlClass(const wxString& c)


@@ -598,15 +620,15 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
 {
   wxItemResource *dialogItem = new wxItemResource;
   if (isPanel)
 {
   wxItemResource *dialogItem = new wxItemResource;
   if (isPanel)

-    dialogItem->SetType(_T("wxPanel"));
+    dialogItem->SetType(wxT("wxPanel"));

   else
   else

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

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


@@ -617,36 +639,36 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
   wxExpr *labelFontExpr = (wxExpr *) NULL;
   wxExpr *buttonFontExpr = (wxExpr *) NULL;
   wxExpr *fontExpr = (wxExpr *) NULL;
   wxExpr *labelFontExpr = (wxExpr *) NULL;
   wxExpr *buttonFontExpr = (wxExpr *) NULL;
   wxExpr *fontExpr = (wxExpr *) NULL;

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

 
   int useDialogUnits = 0;
 
   int useDialogUnits = 0;

-  expr->GetAttributeValue(_T("use_dialog_units"), useDialogUnits);
+  expr->GetAttributeValue(wxT("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(_T("use_system_defaults"), useDefaults);
+  expr->GetAttributeValue(wxT("use_system_defaults"), useDefaults);

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

-  long id = 0;
-  expr->GetAttributeValue(_T("id"), id);
+  int id = 0;
+  expr->GetAttributeValue(wxT("id"), id);

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

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

   {
     windowStyle = wxParseWindowStyle(style);
   }
   {
     windowStyle = wxParseWindowStyle(style);
   }


@@ -659,7 +681,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
   dialogItem->SetTitle(title);
   dialogItem->SetSize(x, y, width, height);
 
   dialogItem->SetTitle(title);
   dialogItem->SetSize(x, y, width, height);
 

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

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


@@ -669,7 +691,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 != _T(""))
+  if (labelColourHex != wxT(""))

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


@@ -679,7 +701,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 != _T(""))
+  if (buttonColourHex != wxT(""))

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


@@ -704,7 +726,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 != _T("") && controlKeyword == _T("control"))
+      if (controlKeyword != wxT("") && controlKeyword == wxT("control"))

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


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

-  if (controlType == _T("wxButton"))
+  if (controlType == wxT("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)))
   {
     // 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)))


@@ -830,16 +852,16 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         wxString str(expr->Nth(count)->StringValue());
         count ++;
 
         wxString str(expr->Nth(count)->StringValue());
         count ++;
 

-        if (str != _T(""))
+        if (str != wxT(""))

         {
             controlItem->SetValue4(str);
         {
             controlItem->SetValue4(str);

-            controlItem->SetType(_T("wxBitmapButton"));
+            controlItem->SetType(wxT("wxBitmapButton"));

         }
     }
     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 == _T("wxBitmapButton"))
+  else if (controlType == wxT("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)))


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

-  else if (controlType == _T("wxCheckBox"))
+  else if (controlType == wxT("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))


@@ -862,8 +884,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 == _T("wxRadioButton"))
+#if wxUSE_RADIOBTN
+  else if (controlType == wxT("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))


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

-  else if (controlType == _T("wxText") || controlType == _T("wxTextCtrl") || controlType == _T("wxMultiText"))
+  else if (controlType == wxT("wxText") || controlType == wxT("wxTextCtrl") || controlType == wxT("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)))


@@ -886,15 +908,15 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
 
       if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
      {
 
       if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
      {

-        // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
-       // Do nothing - no label font any more
-      count ++;
-        if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
-          controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+       // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
+       // Skip past the obsolete label font spec if there are two consecutive specs
+       if (expr->Nth(count+1) && expr->Nth(count+1)->Type() == PrologList)
+         count ++;
+       controlItem->SetFont(wxResourceInterpretFontSpec(expr->Nth(count)));

      }
    }
   }
      }
    }
   }

-  else if (controlType == _T("wxMessage") || controlType == _T("wxStaticText"))
+  else if (controlType == wxT("wxMessage") || controlType == wxT("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)))
   {
     // 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)))


@@ -902,12 +924,12 @@ 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 ++;

-      controlItem->SetType(_T("wxStaticText"));
+      controlItem->SetType(wxT("wxStaticText"));

     }
     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 == _T("wxStaticBitmap"))
+  else if (controlType == wxT("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)))


@@ -919,12 +941,12 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     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 == _T("wxGroupBox") || controlType == _T("wxStaticBox"))
+  else if (controlType == wxT("wxGroupBox") || controlType == wxT("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 == _T("wxGauge"))
+  else if (controlType == wxT("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))


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

-  else if (controlType == _T("wxSlider"))
+  else if (controlType == wxT("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))


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

-  else if (controlType == _T("wxScrollBar"))
+  else if (controlType == wxT("wxScrollBar"))

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


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

-  else if (controlType == _T("wxListBox"))
+  else if (controlType == wxT("wxListBox"))

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


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

-  else if (controlType == _T("wxChoice"))
+  else if (controlType == wxT("wxChoice"))

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


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

-  else if (controlType == _T("wxComboBox"))
+  else if (controlType == wxT("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))


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

-  else if (controlType == _T("wxRadioBox"))
+  else if (controlType == wxT("wxRadioBox"))

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


@@ -1182,13 +1204,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(_T("wxMenuSeparator"));
+    item->SetType(wxT("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(_T("wxMenu")); // Well, menu item, but doesn't matter.
+    item->SetType(wxT("wxMenu")); // Well, menu item, but doesn't matter.

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


@@ -1261,7 +1283,7 @@ 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(_T("menu"), &listExpr);
+  expr->GetAttributeValue(wxT("menu"), &listExpr);

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


@@ -1271,7 +1293,7 @@ wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
     return (wxItemResource *) NULL;
 
   wxString name;
     return (wxItemResource *) NULL;
 
   wxString name;

-  if (expr->GetAttributeValue(_T("name"), name))
+  if (expr->GetAttributeValue(wxT("name"), name))

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


@@ -1282,12 +1304,12 @@ wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
 wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
 {
   wxExpr *listExpr = (wxExpr *) NULL;
 wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
 {
   wxExpr *listExpr = (wxExpr *) NULL;

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

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

-  resource->SetType(_T("wxMenu"));
+  resource->SetType(wxT("wxMenu"));

 //  resource->SetType(wxTYPE_MENU);
 
   wxExpr *element = listExpr->GetFirst();
 //  resource->SetType(wxTYPE_MENU);
 
   wxExpr *element = listExpr->GetFirst();


@@ -1299,7 +1321,7 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
   }
 
   wxString name;
   }
 
   wxString name;

-  if (expr->GetAttributeValue(_T("name"), name))
+  if (expr->GetAttributeValue(wxT("name"), name))

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


@@ -1316,9 +1338,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(_T("wxBitmap"));
+  bitmapItem->SetType(wxT("wxBitmap"));

   wxString name;
   wxString name;

-  if (expr->GetAttributeValue(_T("name"), name))
+  if (expr->GetAttributeValue(wxT("name"), name))

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


@@ -1329,7 +1351,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 == _T("bitmap") || bitmapKeyword == _T("icon"))
+      if (bitmapKeyword == wxT("bitmap") || bitmapKeyword == wxT("icon"))

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


@@ -1337,7 +1359,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(_T("wxBitmap"));
+          bitmapSpec->SetType(wxT("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.


@@ -1347,25 +1369,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() != _T(""))
+          if (nameExpr && nameExpr->StringValue() != wxT(""))

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

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

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

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

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

-            if (plat == _T("windows") || plat == _T("WINDOWS"))
+            if (plat == wxT("windows") || plat == wxT("WINDOWS"))

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

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

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

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

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


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

-    item->SetType(_T("wxIcon"));
+    item->SetType(wxT("wxIcon"));

     return item;
   }
   else
     return item;
   }
   else


@@ -1417,7 +1439,7 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
   int style = wxNORMAL;
   int weight = wxNORMAL;
   int underline = 0;
   int style = wxNORMAL;
   int weight = wxNORMAL;
   int underline = 0;

-  wxString faceName(_T(""));
+  wxString faceName(wxT(""));

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


@@ -1531,11 +1553,54 @@ static bool wxEatWhiteSpace(FILE *fd)
          default:
             ungetc(ch, fd);
             return TRUE;
          default:
             ungetc(ch, fd);
             return TRUE;

-            
+

          }
       }
    return FALSE;
 }
          }
       }
    return FALSE;
 }

+static bool wxEatWhiteSpace(wxInputStream *is)
+{
+  int ch = is->GetC() ;
+  if ((ch != ' ') && (ch != '/') && (ch != ' ') && (ch != 10) && (ch != 13) && (ch != 9))
+  {
+    is->Ungetch(ch);
+    return TRUE;
+  }
+
+  // Eat whitespace
+  while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
+    ch = is->GetC();
+  // Check for comment
+  if (ch == '/')
+  {
+    ch = is->GetC();
+    if (ch == '*')
+    {
+      bool finished = FALSE;
+      while (!finished)
+      {
+        ch = is->GetC();
+        if (ch == EOF)
+          return FALSE;
+        if (ch == '*')
+        {
+          int newCh = is->GetC();
+          if (newCh == '/')
+            finished = TRUE;
+          else
+          {
+                                       is->Ungetch(ch);
+          }
+        }
+      }
+    }
+    else // False alarm
+      return FALSE;
+  }
+  else
+    is->Ungetch(ch);
+  return wxEatWhiteSpace(is);
+}

 
 bool wxGetResourceToken(FILE *fd)
 {
 
 bool wxGetResourceToken(FILE *fd)
 {


@@ -1600,6 +1665,71 @@ bool wxGetResourceToken(FILE *fd)
   return TRUE;
 }
 
   return TRUE;
 }
 

+bool wxGetResourceToken(wxInputStream *is)
+{
+  if (!wxResourceBuffer)
+    wxReallocateResourceBuffer();
+  wxResourceBuffer[0] = 0;
+  wxEatWhiteSpace(is);
+
+  int ch = is->GetC() ;
+  if (ch == '"')
+  {
+    // Get string
+    wxResourceBufferCount = 0;
+    ch = is->GetC();
+    while (ch != '"')
+    {
+      int actualCh = ch;
+      if (ch == EOF)
+      {
+        wxResourceBuffer[wxResourceBufferCount] = 0;
+        return FALSE;
+      }
+      // Escaped characters
+      else if (ch == '\\')
+      {
+        int newCh = is->GetC();
+        if (newCh == '"')
+          actualCh = '"';
+        else if (newCh == 10)
+          actualCh = 10;
+        else if (newCh == 13) // mac
+          actualCh = 10;
+        else
+        {
+                       is->Ungetch(newCh);
+        }
+      }
+
+      if (wxResourceBufferCount >= wxResourceBufferSize-1)
+        wxReallocateResourceBuffer();
+      wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
+      wxResourceBufferCount ++;
+      ch = is->GetC();
+    }
+    wxResourceBuffer[wxResourceBufferCount] = 0;
+  }
+  else
+  {
+    wxResourceBufferCount = 0;
+    // Any other token
+    while (ch != ' ' && ch != EOF && ch != ' ' && ch != 13 && ch != 9 && ch != 10)
+    {
+      if (wxResourceBufferCount >= wxResourceBufferSize-1)
+        wxReallocateResourceBuffer();
+      wxResourceBuffer[wxResourceBufferCount] = (char)ch;
+      wxResourceBufferCount ++;
+
+      ch = is->GetC();
+    }
+    wxResourceBuffer[wxResourceBufferCount] = 0;
+    if (ch == EOF)
+      return FALSE;
+  }
+  return TRUE;
+}
+

 /*
  * Files are in form:
   static char *name = "....";
 /*
  * Files are in form:
   static char *name = "....";


@@ -1624,7 +1754,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxGetResourceToken(fd);
     wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxGetResourceToken(fd);
     wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));

-    if (wxIsalpha(value[0]))
+    if (wxIsdigit(value[0]))

     {
       int val = (int)wxAtol(value);
       wxResourceAddIdentifier(name, val, table);
     {
       int val = (int)wxAtol(value);
       wxResourceAddIdentifier(name, val, table);


@@ -1646,10 +1776,10 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     wxGetResourceToken(fd);
     wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxChar *actualName = name;
     wxGetResourceToken(fd);
     wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxChar *actualName = name;

-    if (name[0] == _T('"'))
+    if (name[0] == wxT('"'))

       actualName = name + 1;
     int len = wxStrlen(name);
       actualName = name + 1;
     int len = wxStrlen(name);

-    if ((len > 0) && (name[len-1] == _T('"')))
+    if ((len > 0) && (name[len-1] == wxT('"')))

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


@@ -1736,6 +1866,135 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
   return TRUE;
 }
 
   return TRUE;
 }
 

+bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof, wxResourceTable *table)
+{
+  if (!table)
+    table = wxDefaultResourceTable;
+
+  // static or #define
+  if (!wxGetResourceToken(fd))
+  {
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (strcmp(wxResourceBuffer, "#define") == 0)
+  {
+    wxGetResourceToken(fd);
+    char *name = copystring(wxResourceBuffer);
+    wxGetResourceToken(fd);
+    char *value = copystring(wxResourceBuffer);
+    if (isalpha(value[0]))
+    {
+      int val = (int)atol(value);
+      wxResourceAddIdentifier(name, val, table);
+    }
+    else
+    {
+      wxLogWarning(_("#define %s must be an integer."), name);
+      delete[] name;
+      delete[] value;
+      return FALSE;
+    }
+    delete[] name;
+    delete[] value;
+
+    return TRUE;
+  }
+  else if (strcmp(wxResourceBuffer, "#include") == 0)
+  {
+    wxGetResourceToken(fd);
+    char *name = copystring(wxResourceBuffer);
+    char *actualName = name;
+    if (name[0] == '"')
+      actualName = name + 1;
+    int len = strlen(name);
+    if ((len > 0) && (name[len-1] == '"'))
+      name[len-1] = 0;
+    if (!wxResourceParseIncludeFile(actualName, table))
+    {
+      wxLogWarning(_("Could not find resource include file %s."), actualName);
+    }
+    delete[] name;
+    return TRUE;
+  }
+  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."));
+    wxLogWarning(buf);
+    return FALSE;
+  }
+
+  // char
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (strcmp(wxResourceBuffer, "char") != 0)
+  {
+    wxLogWarning(_("Expected 'char' whilst parsing resource."));
+    return FALSE;
+  }
+
+  // *name
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (wxResourceBuffer[0] != '*')
+  {
+    wxLogWarning(_("Expected '*' whilst parsing resource."));
+    return FALSE;
+  }
+  char nameBuf[100];
+  strncpy(nameBuf, wxResourceBuffer+1, 99);
+
+  // =
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+
+  if (strcmp(wxResourceBuffer, "=") != 0)
+  {
+    wxLogWarning(_("Expected '=' whilst parsing resource."));
+    return FALSE;
+  }
+
+  // String
+  if (!wxGetResourceToken(fd))
+  {
+    wxLogWarning(_("Unexpected end of file whilst parsing resource."));
+    *eof = TRUE;
+    return FALSE;
+  }
+  else
+  {
+    if (!db.ReadPrologFromString(wxResourceBuffer))
+    {
+      wxLogWarning(_("%s: ill-formed resource file syntax."), nameBuf);
+      return FALSE;
+    }
+  }
+  // Semicolon
+  if (!wxGetResourceToken(fd))
+  {
+    *eof = TRUE;
+  }
+  return TRUE;
+}
+

 /*
  * Parses string window style into integer window style
  */
 /*
  * Parses string window style into integer window style
  */


@@ -1754,7 +2013,7 @@ wxChar* wxResourceParseWord(wxChar*s, int *i)
   int len = wxStrlen(s);
   int j = 0;
   int ii = *i;
   int len = wxStrlen(s);
   int j = 0;
   int ii = *i;

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

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


@@ -1764,7 +2023,7 @@ wxChar* wxResourceParseWord(wxChar*s, int *i)
 
   // Eat whitespace and conjunction characters
   while ((ii < len) &&
 
   // Eat whitespace and conjunction characters
   while ((ii < len) &&

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

   {
     ii ++;
   }
   {
     ii ++;
   }


@@ -1784,257 +2043,259 @@ struct wxResourceBitListStruct
 static wxResourceBitListStruct wxResourceBitListTable[] =
 {
   /* wxListBox */
 static wxResourceBitListStruct wxResourceBitListTable[] =
 {
   /* wxListBox */

-  { _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 },
+  { wxT("wxSINGLE"), wxLB_SINGLE },
+  { wxT("wxMULTIPLE"), wxLB_MULTIPLE },
+  { wxT("wxEXTENDED"), wxLB_EXTENDED },
+  { wxT("wxLB_SINGLE"), wxLB_SINGLE },
+  { wxT("wxLB_MULTIPLE"), wxLB_MULTIPLE },
+  { wxT("wxLB_EXTENDED"), wxLB_EXTENDED },
+  { wxT("wxLB_NEEDED_SB"), wxLB_NEEDED_SB },
+  { wxT("wxLB_ALWAYS_SB"), wxLB_ALWAYS_SB },
+  { wxT("wxLB_SORT"), wxLB_SORT },
+  { wxT("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
+  { wxT("wxLB_HSCROLL"), wxLB_HSCROLL },

 
   /* wxComboxBox */
 
   /* wxComboxBox */

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

 
   /* wxGauge */
 
   /* wxGauge */

-  { _T("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
-  { _T("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
-  { _T("wxGA_VERTICAL"), wxGA_VERTICAL },
+  { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
+  { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
+  { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },

 
   /* wxTextCtrl */
 
   /* wxTextCtrl */

-  { _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},
+  { wxT("wxPASSWORD"), wxPASSWORD},
+  { wxT("wxPROCESS_ENTER"), wxPROCESS_ENTER},
+  { wxT("wxTE_PASSWORD"), wxTE_PASSWORD},
+  { wxT("wxTE_READONLY"), wxTE_READONLY},
+  { wxT("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
+  { wxT("wxTE_MULTILINE"), wxTE_MULTILINE},
+  { wxT("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},

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

-  { _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 },
+  { wxT("wxRB_GROUP"), wxRB_GROUP },
+  { wxT("wxRA_SPECIFY_COLS"), wxRA_SPECIFY_COLS },
+  { wxT("wxRA_SPECIFY_ROWS"), wxRA_SPECIFY_ROWS },
+  { wxT("wxRA_HORIZONTAL"), wxRA_HORIZONTAL },
+  { wxT("wxRA_VERTICAL"), wxRA_VERTICAL },

 
   /* wxSlider */
 
   /* wxSlider */

-  { _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 },
+  { wxT("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
+  { wxT("wxSL_VERTICAL"), wxSL_VERTICAL },
+  { wxT("wxSL_AUTOTICKS"), wxSL_AUTOTICKS },
+  { wxT("wxSL_LABELS"), wxSL_LABELS },
+  { wxT("wxSL_LEFT"), wxSL_LEFT },
+  { wxT("wxSL_TOP"), wxSL_TOP },
+  { wxT("wxSL_RIGHT"), wxSL_RIGHT },
+  { wxT("wxSL_BOTTOM"), wxSL_BOTTOM },
+  { wxT("wxSL_BOTH"), wxSL_BOTH },
+  { wxT("wxSL_SELRANGE"), wxSL_SELRANGE },

 
   /* wxScrollBar */
 
   /* wxScrollBar */

-  { _T("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
-  { _T("wxSB_VERTICAL"), wxSB_VERTICAL },
+  { wxT("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
+  { wxT("wxSB_VERTICAL"), wxSB_VERTICAL },

 
   /* wxButton */
 
   /* wxButton */

-  { _T("wxBU_AUTODRAW"), wxBU_AUTODRAW },
-  { _T("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },
+  { wxT("wxBU_AUTODRAW"), wxBU_AUTODRAW },
+  { wxT("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },

 
   /* wxTreeCtrl */
 
   /* wxTreeCtrl */

-  { _T("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
-  { _T("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
-  { _T("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },
+  { wxT("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
+  { wxT("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
+  { wxT("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },

 
   /* wxListCtrl */
 
   /* wxListCtrl */

-  { _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 },
+  { wxT("wxLC_ICON"), wxLC_ICON },
+  { wxT("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
+  { wxT("wxLC_LIST"), wxLC_LIST },
+  { wxT("wxLC_REPORT"), wxLC_REPORT },
+  { wxT("wxLC_ALIGN_TOP"), wxLC_ALIGN_TOP },
+  { wxT("wxLC_ALIGN_LEFT"), wxLC_ALIGN_LEFT },
+  { wxT("wxLC_AUTOARRANGE"), wxLC_AUTOARRANGE },
+  { wxT("wxLC_USER_TEXT"), wxLC_USER_TEXT },
+  { wxT("wxLC_EDIT_LABELS"), wxLC_EDIT_LABELS },
+  { wxT("wxLC_NO_HEADER"), wxLC_NO_HEADER },
+  { wxT("wxLC_NO_SORT_HEADER"), wxLC_NO_SORT_HEADER },
+  { wxT("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
+  { wxT("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
+  { wxT("wxLC_SORT_DESCENDING"), wxLC_SORT_DESCENDING },

 
   /* wxSpinButton */
 
   /* wxSpinButton */

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

 
   /* wxSplitterWnd */
 
   /* wxSplitterWnd */

-  { _T("wxSP_NOBORDER"), wxSP_NOBORDER},
-  { _T("wxSP_3D"), wxSP_3D},
-  { _T("wxSP_BORDER"), wxSP_BORDER},
+  { wxT("wxSP_NOBORDER"), wxSP_NOBORDER},
+  { wxT("wxSP_3D"), wxSP_3D},
+  { wxT("wxSP_BORDER"), wxSP_BORDER},

 
   /* wxTabCtrl */
 
   /* wxTabCtrl */

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

 
   /* wxStatusBar95 */
 
   /* wxStatusBar95 */

-  { _T("wxST_SIZEGRIP"), wxST_SIZEGRIP},
+  { wxT("wxST_SIZEGRIP"), wxST_SIZEGRIP},

 
   /* wxControl */
 
   /* wxControl */

-  { _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},
+  { wxT("wxFIXED_LENGTH"), wxFIXED_LENGTH},
+  { wxT("wxALIGN_LEFT"), wxALIGN_LEFT},
+  { wxT("wxALIGN_CENTER"), wxALIGN_CENTER},
+  { wxT("wxALIGN_CENTRE"), wxALIGN_CENTRE},
+  { wxT("wxALIGN_RIGHT"), wxALIGN_RIGHT},
+  { wxT("wxCOLOURED"), wxCOLOURED},

 
   /* wxToolBar */
 
   /* wxToolBar */

-  { _T("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
-  { _T("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
-  { _T("wxTB_VERTICAL"), wxTB_VERTICAL},
-  { _T("wxTB_FLAT"), wxTB_FLAT},
+  { wxT("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
+  { wxT("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
+  { wxT("wxTB_VERTICAL"), wxTB_VERTICAL},
+  { wxT("wxTB_FLAT"), wxTB_FLAT},

 
   /* wxDialog */
 
   /* wxDialog */

-  { _T("wxDIALOG_MODAL"), wxDIALOG_MODAL },
+  { wxT("wxDIALOG_MODAL"), wxDIALOG_MODAL },

 
   /* Generic */
 
   /* Generic */

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

 
   // Text font families
 
   // Text font families

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

 
   // Logical ops
 
   // Logical ops

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

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

-  { _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}
+  { wxT("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
+  { wxT("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},
+  { wxT("wxBITMAP_TYPE_BMP"), wxBITMAP_TYPE_BMP},
+  { wxT("wxBITMAP_TYPE_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
+  { wxT("wxBITMAP_TYPE_BMP_RESOURCE"), wxBITMAP_TYPE_BMP_RESOURCE},
+  { wxT("wxBITMAP_TYPE_GIF"), wxBITMAP_TYPE_GIF},
+  { wxT("wxBITMAP_TYPE_TIF"), wxBITMAP_TYPE_TIF},
+  { wxT("wxBITMAP_TYPE_ICO"), wxBITMAP_TYPE_ICO},
+  { wxT("wxBITMAP_TYPE_ICO_RESOURCE"), wxBITMAP_TYPE_ICO_RESOURCE},
+  { wxT("wxBITMAP_TYPE_CUR"), wxBITMAP_TYPE_CUR},
+  { wxT("wxBITMAP_TYPE_CUR_RESOURCE"), wxBITMAP_TYPE_CUR_RESOURCE},
+  { wxT("wxBITMAP_TYPE_XBM_DATA"), wxBITMAP_TYPE_XBM_DATA},
+  { wxT("wxBITMAP_TYPE_XPM_DATA"), wxBITMAP_TYPE_XPM_DATA},
+  { wxT("wxBITMAP_TYPE_ANY"), wxBITMAP_TYPE_ANY}

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


@@ -2044,7 +2305,8 @@ long wxParseWindowStyle(const wxString& bitListString)
   int i = 0;
   wxChar *word;
   long bitList = 0;
   int i = 0;
   wxChar *word;
   long bitList = 0;

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

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


@@ -2060,6 +2322,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;
 }


@@ -2077,7 +2340,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {

-    if ((item->GetType() == _T("")) || (item->GetType() != _T("wxBitmap")))
+    if ((item->GetType() == wxT("")) || (item->GetType() != wxT("wxBitmap")))

     {
       wxLogWarning(_("%s not a bitmap resource specification."), (const wxChar*) resource);
       return wxNullBitmap;
     {
       wxLogWarning(_("%s not a bitmap resource specification."), (const wxChar*) resource);
       return wxNullBitmap;


@@ -2185,8 +2448,8 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
 #else
         wxLogWarning(_("No XBM facility available!"));
         return wxBitmap(item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3()) ;
 #else
         wxLogWarning(_("No XBM facility available!"));

-#endif

         break;
         break;

+#endif

       }
       case wxBITMAP_TYPE_XPM_DATA:
       {
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {


@@ -2201,13 +2464,12 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         return wxBitmap((char **)item->GetValue1());
 #else
         wxLogWarning(_("No XPM facility available!"));
         return wxBitmap((char **)item->GetValue1());
 #else
         wxLogWarning(_("No XPM facility available!"));

-#endif

         break;
         break;

+#endif

       }
       default:
       {
         return wxBitmap(name, bitmapType);
       }
       default:
       {
         return wxBitmap(name, bitmapType);

-        break;

       }
     }
     return wxNullBitmap;
       }
     }
     return wxNullBitmap;


@@ -2232,7 +2494,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {
   wxItemResource *item = table->FindResource(resource);
   if (item)
   {

-    if ((item->GetType() == _T("")) || wxStrcmp(item->GetType(), _T("wxIcon")) != 0)
+    if ((item->GetType() == wxT("")) || wxStrcmp(item->GetType(), wxT("wxIcon")) != 0)

     {
       wxLogWarning(_("%s not an icon resource specification."), (const wxChar*) resource);
       return wxNullIcon;
     {
       wxLogWarning(_("%s not an icon resource specification."), (const wxChar*) resource);
       return wxNullIcon;


@@ -2340,8 +2602,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
 #else
         wxLogWarning(_("No XBM facility available!"));
         return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
 #else
         wxLogWarning(_("No XBM facility available!"));

-#endif

         break;
         break;

+#endif

       }
       case wxBITMAP_TYPE_XPM_DATA:
       {
       }
       case wxBITMAP_TYPE_XPM_DATA:
       {


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

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

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


@@ -2413,7 +2675,7 @@ wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *ta
     table = wxDefaultResourceTable;
 
   wxItemResource *menuResource = table->FindResource(resource);
     table = wxDefaultResourceTable;
 
   wxItemResource *menuResource = table->FindResource(resource);

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

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


@@ -2437,7 +2699,7 @@ wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
     table = wxDefaultResourceTable;
 
   wxItemResource *menuResource = table->FindResource(resource);
     table = wxDefaultResourceTable;
 
   wxItemResource *menuResource = table->FindResource(resource);

-  if (menuResource && (menuResource->GetType() != _T("")) && (menuResource->GetType() == _T("wxMenu")))
+  if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("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;


@@ -2494,7 +2756,7 @@ 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;
 }
 


@@ -2503,7 +2765,7 @@ 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);

 }
 
 /*
 }
 
 /*


@@ -2608,7 +2870,7 @@ bool wxEatWhiteSpaceString(char *s)
          default:
             ungetc_string();
             return TRUE;
          default:
             ungetc_string();
             return TRUE;

-            
+

          }
       }
    return FALSE;
          }
       }
    return FALSE;


@@ -2701,7 +2963,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxGetResourceTokenString(s);
     wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxChar *name = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));
     wxGetResourceTokenString(s);
     wxChar *value = copystring(wxConvCurrent->cMB2WX(wxResourceBuffer));

-    if (wxIsalpha(value[0]))
+    if (wxIsdigit(value[0]))

     {
       int val = (int)wxAtol(value);
       wxResourceAddIdentifier(name, val, table);
     {
       int val = (int)wxAtol(value);
       wxResourceAddIdentifier(name, val, table);


@@ -2860,8 +3122,8 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
 
   wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
 
   wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))

-  if (!resource || (resource->GetType() == _T("")) ||
-    ! ((resource->GetType() == _T("wxDialog")) || (resource->GetType() == _T("wxPanel"))))
+  if (!resource || (resource->GetType() == wxT("")) ||
+    ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))

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


@@ -2887,7 +3149,7 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
   else if (IsKindOf(CLASSINFO(wxPanel)))
   {
     wxPanel* panel = (wxPanel *)this;
   else if (IsKindOf(CLASSINFO(wxPanel)))
   {
     wxPanel* panel = (wxPanel *)this;

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

       return FALSE;
   }
   else
       return FALSE;
   }
   else