fixed wxTaskBarIcon compilation

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index d6c56f61d43e1f32dc3bdd1301dded1ad8ec953c..63151ab13ba1daf4be381ce2ec475d33d56b02a9 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -53,6 +53,9 @@
 #include "wx/intl.h"
 #endif
 
 #include "wx/intl.h"
 #endif
 

+#include "wx/treebase.h"
+#include "wx/listctrl.h"
+

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


@@ -175,10 +178,10 @@ void wxResourceTable::AddResource(wxItemResource *item)
         name = item->GetTitle();
     if (name == wxT(""))
         name = wxT("no name");
         name = item->GetTitle();
     if (name == wxT(""))
         name = wxT("no name");

-    
+

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

-    
+

     Put(name, item);
 }
 
     Put(name, item);
 }
 


@@ -202,7 +205,7 @@ bool wxResourceTable::DeleteResource(const wxString& name)
             }
             node = Next();
         }
             }
             node = Next();
         }

-        
+

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


@@ -214,7 +217,7 @@ bool wxResourceTable::ParseResourceFile( wxInputStream *is )
 {
     wxExprDatabase db;
     int len = is->StreamSize() ;
 {
     wxExprDatabase db;
     int len = is->StreamSize() ;

-    
+

     bool eof = FALSE;
     while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
     {
     bool eof = FALSE;
     while ( is->TellI() + 10 < len) // it's a hack because the streams dont support EOF
     {


@@ -226,12 +229,8 @@ bool wxResourceTable::ParseResourceFile( wxInputStream *is )
 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 = wxFopen(filename, _T("r"));
     FILE *fd = wxFopen(filename, _T("r"));

-#endif

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


@@ -251,7 +250,7 @@ bool wxResourceTable::ParseResourceData(const wxString& data)
         wxLogWarning(_("Ill-formed resource file syntax."));
         return FALSE;
     }
         wxLogWarning(_("Ill-formed resource file syntax."));
         return FALSE;
     }

-    
+

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


@@ -305,12 +304,12 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
     int id = childResource->GetId();
     if ( id == 0 )
         id = -1;
     int id = childResource->GetId();
     if ( id == 0 )
         id = -1;

-    
+

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

-    
+

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

-    
+

     wxPoint pos;
     wxSize size;
     if (dlgUnits)
     wxPoint pos;
     wxSize size;
     if (dlgUnits)


@@ -323,7 +322,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         pos = wxPoint(childResource->GetX(), childResource->GetY());
         size = wxSize(childResource->GetWidth(), childResource->GetHeight());
     }
         pos = wxPoint(childResource->GetX(), childResource->GetY());
         size = wxSize(childResource->GetWidth(), childResource->GetHeight());
     }

-    
+

     if (itemType == wxString(wxT("wxButton")) || itemType == wxString(wxT("wxBitmapButton")))
     {
         if (childResource->GetValue4() != wxT(""))
     if (itemType == wxString(wxT("wxButton")) || itemType == wxString(wxT("wxBitmapButton")))
     {
         if (childResource->GetValue4() != wxT(""))


@@ -363,7 +362,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
             if (!bitmap.Ok())
                 bitmap.LoadFile("cross_bmp", wxBITMAP_TYPE_BMP_RESOURCE);
 #endif
             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());


@@ -384,7 +383,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
     {
         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());

-        
+

         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
     }
 #if wxUSE_GAUGE
         ((wxCheckBox *)control)->SetValue((childResource->GetValue1() != 0));
     }
 #if wxUSE_GAUGE


@@ -392,7 +391,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
     {
         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());

-        
+

         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
     }
 #endif
         ((wxGauge *)control)->SetValue((int)childResource->GetValue1());
     }
 #endif


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

-        
+

     }
 #endif
     else if (itemType == wxString(wxT("wxSlider")))
     }
 #endif
     else if (itemType == wxString(wxT("wxSlider")))


@@ -451,7 +450,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         }
         control = new wxListBox(parent, id, pos, size,
             noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
         }
         control = new wxListBox(parent, id, pos, size,
             noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());

-        
+

         if (strings)
             delete[] strings;
     }
         if (strings)
             delete[] strings;
     }


@@ -475,7 +474,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         }
         control = new wxChoice(parent, id, pos, size,
             noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
         }
         control = new wxChoice(parent, id, pos, size,
             noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());

-        
+

         if (strings)
             delete[] strings;
     }
         if (strings)
             delete[] strings;
     }


@@ -500,7 +499,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         }
         control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,
             noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
         }
         control = new wxComboBox(parent, id, childResource->GetValue4(), pos, size,
             noStrings, strings, childResource->GetStyle(), wxDefaultValidator, childResource->GetName());

-        
+

         if (strings)
             delete[] strings;
     }
         if (strings)
             delete[] strings;
     }


@@ -526,11 +525,11 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,
             noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
             childResource->GetName());
         control = new wxRadioBox(parent, (wxWindowID) id, wxString(childResource->GetTitle()), pos, size,
             noStrings, strings, (int)childResource->GetValue1(), childResource->GetStyle(), wxDefaultValidator,
             childResource->GetName());

-        
+

         if (strings)
             delete[] strings;
     }
         if (strings)
             delete[] strings;
     }

-    
+

     if ((parentResource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
     {
         // Don't set font; will be inherited from parent.
     if ((parentResource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
     {
         // Don't set font; will be inherited from parent.


@@ -540,7 +539,7 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
         if (control && childResource->GetFont().Ok())
         {
             control->SetFont(childResource->GetFont());
         if (control && childResource->GetFont().Ok())
         {
             control->SetFont(childResource->GetFont());

-            
+

 #ifdef __WXMSW__
             // Force the layout algorithm since the size changes the layout
             if (control->IsKindOf(CLASSINFO(wxRadioBox)))
 #ifdef __WXMSW__
             // Force the layout algorithm since the size changes the layout
             if (control->IsKindOf(CLASSINFO(wxRadioBox)))


@@ -564,7 +563,7 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
     {
         wxExpr *clause = (wxExpr *)node->Data();
         wxString functor(clause->Functor());
     {
         wxExpr *clause = (wxExpr *)node->Data();
         wxString functor(clause->Functor());

-        
+

         wxItemResource *item = (wxItemResource *) NULL;
         if (functor == wxT("dialog"))
             item = wxResourceInterpretDialog(table, clause);
         wxItemResource *item = (wxItemResource *) NULL;
         if (functor == wxT("dialog"))
             item = wxResourceInterpretDialog(table, clause);


@@ -580,7 +579,7 @@ bool wxResourceInterpretResources(wxResourceTable& table, wxExprDatabase& db)
             item = wxResourceInterpretBitmap(table, clause);
         else if (functor == wxT("icon"))
             item = wxResourceInterpretIcon(table, clause);
             item = wxResourceInterpretBitmap(table, clause);
         else if (functor == wxT("icon"))
             item = wxResourceInterpretIcon(table, clause);

-        
+

         if (item)
         {
             // Remove any existing resource of same name
         if (item)
         {
             // Remove any existing resource of same name


@@ -640,11 +639,11 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     wxString backColourHex = wxT("");
     wxString labelColourHex = wxT("");
     wxString buttonColourHex = wxT("");
     wxString backColourHex = wxT("");
     wxString labelColourHex = wxT("");
     wxString buttonColourHex = wxT("");

-    
+

     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;
     int x = 0; int y = 0; int width = -1; int height = -1;
     int isModal = 0;
     wxExpr *labelFontExpr = (wxExpr *) NULL;


@@ -664,21 +663,21 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     expr->GetAttributeValue(wxT("background_colour"), backColourHex);
     expr->GetAttributeValue(wxT("label_colour"), labelColourHex);
     expr->GetAttributeValue(wxT("button_colour"), buttonColourHex);
     expr->GetAttributeValue(wxT("background_colour"), backColourHex);
     expr->GetAttributeValue(wxT("label_colour"), labelColourHex);
     expr->GetAttributeValue(wxT("button_colour"), buttonColourHex);

-    
+

     int useDialogUnits = 0;
     expr->GetAttributeValue(wxT("use_dialog_units"), useDialogUnits);
     if (useDialogUnits != 0)
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);
     int useDialogUnits = 0;
     expr->GetAttributeValue(wxT("use_dialog_units"), useDialogUnits);
     if (useDialogUnits != 0)
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_DIALOG_UNITS);

-    
+

     int useDefaults = 0;
     expr->GetAttributeValue(wxT("use_system_defaults"), useDefaults);
     if (useDefaults != 0)
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);
     int useDefaults = 0;
     expr->GetAttributeValue(wxT("use_system_defaults"), useDefaults);
     if (useDefaults != 0)
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_USE_DEFAULTS);

-    
+

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

-    
+

     if (style != wxT(""))
     {
         windowStyle = wxParseWindowStyle(style);
     if (style != wxT(""))
     {
         windowStyle = wxParseWindowStyle(style);


@@ -687,7 +686,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     dialogItem->SetValue1(isModal);
     if (windowStyle & wxDIALOG_MODAL) // Uses style in wxWin 2
         dialogItem->SetValue1(TRUE);
     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);


@@ -696,8 +695,8 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
     if (style.Find(wxT("VERTICAL_LABEL")) != -1)
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
     else if (style.Find(wxT("HORIZONTAL_LABEL")) != -1)
     if (style.Find(wxT("VERTICAL_LABEL")) != -1)
         dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
     else if (style.Find(wxT("HORIZONTAL_LABEL")) != -1)

-        dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);   
-    
+        dialogItem->SetResourceStyle(dialogItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
+

     if (backColourHex != wxT(""))
     {
         int r = 0;
     if (backColourHex != wxT(""))
     {
         int r = 0;


@@ -728,14 +727,14 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
         b = wxHexToDec(buttonColourHex.Mid(4, 2));
         dialogItem->SetButtonColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
     }
         b = wxHexToDec(buttonColourHex.Mid(4, 2));
         dialogItem->SetButtonColour(wxColour((unsigned char)r,(unsigned char)g,(unsigned char)b));
     }

-    
+

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

-    
+

     // Now parse all controls
     wxExpr *controlExpr = expr->GetFirst();
     while (controlExpr)
     // Now parse all controls
     wxExpr *controlExpr = expr->GetFirst();
     while (controlExpr)


@@ -765,10 +764,10 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
 wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
 {
     wxItemResource *controlItem = new wxItemResource;
 wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
 {
     wxItemResource *controlItem = new wxItemResource;

-    
+

     // First, find the standard features of a control definition:
     // [optional integer/string id], control name, title, style, name, x, y, width, height
     // First, find the standard features of a control definition:
     // [optional integer/string id], control name, title, style, name, x, y, width, height

-    
+

     wxString controlType;
     wxString style;
     wxString title;
     wxString controlType;
     wxString style;
     wxString title;


@@ -777,9 +776,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     long windowStyle = 0;
     int x = 0; int y = 0; int width = -1; int height = -1;
     int count = 0;
     long windowStyle = 0;
     int x = 0; int y = 0; int width = -1; int height = -1;
     int count = 0;

-    
+

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

-    
+

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


@@ -813,12 +812,12 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         controlType = expr->Nth(1)->StringValue();
         count = 2;
     }
         controlType = expr->Nth(1)->StringValue();
         count = 2;
     }

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if ( expr1 )
         title = expr1->StringValue();
     expr1 = expr->Nth(count);
     count ++;
     if ( expr1 )
         title = expr1->StringValue();

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
     expr1 = expr->Nth(count);
     count ++;
     if (expr1)


@@ -826,32 +825,32 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         style = expr1->StringValue();
         windowStyle = wxParseWindowStyle(style);
     }
         style = expr1->StringValue();
         windowStyle = wxParseWindowStyle(style);
     }

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         name = expr1->StringValue();
     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         name = expr1->StringValue();

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         x = (int)expr1->IntegerValue();
     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         x = (int)expr1->IntegerValue();

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         y = (int)expr1->IntegerValue();
     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         y = (int)expr1->IntegerValue();

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         width = (int)expr1->IntegerValue();
     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         width = (int)expr1->IntegerValue();

-    
+

     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         height = (int)expr1->IntegerValue();
     expr1 = expr->Nth(count);
     count ++;
     if (expr1)
         height = (int)expr1->IntegerValue();

-    
+

     controlItem->SetStyle(windowStyle);
     controlItem->SetName(name);
     controlItem->SetTitle(title);
     controlItem->SetStyle(windowStyle);
     controlItem->SetName(name);
     controlItem->SetTitle(title);


@@ -864,7 +863,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
     else if (style.Find(wxT("HORIZONTAL_LABEL")) != -1)
         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);
         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_VERTICAL_LABEL);
     else if (style.Find(wxT("HORIZONTAL_LABEL")) != -1)
         controlItem->SetResourceStyle(controlItem->GetResourceStyle() | wxRESOURCE_HORIZONTAL_LABEL);

-   
+

     if (controlType == wxT("wxButton"))
     {
         // Check for bitmap resource name (in case loading old-style resource file)
     if (controlType == wxT("wxButton"))
     {
         // Check for bitmap resource name (in case loading old-style resource file)


@@ -872,7 +871,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         {
             wxString str(expr->Nth(count)->StringValue());
             count ++;
         {
             wxString str(expr->Nth(count)->StringValue());
             count ++;

-            
+

             if (str != wxT(""))
             {
                 controlItem->SetValue4(str);
             if (str != wxT(""))
             {
                 controlItem->SetValue4(str);


@@ -926,7 +925,7 @@ 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->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
             if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
             {
                 // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));


@@ -974,13 +973,13 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         {
             controlItem->SetValue1(expr->Nth(count)->IntegerValue());
             count ++;
         {
             controlItem->SetValue1(expr->Nth(count)->IntegerValue());
             count ++;

-            
+

             // Check for range
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
                 controlItem->SetValue2(expr->Nth(count)->IntegerValue());
                 count ++;
             // Check for range
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
                 controlItem->SetValue2(expr->Nth(count)->IntegerValue());
                 count ++;

-                
+

                 if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
                 {
                     // Skip past the obsolete label font spec if there are two consecutive specs
                 if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
                 {
                     // Skip past the obsolete label font spec if there are two consecutive specs


@@ -998,25 +997,25 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         {
             controlItem->SetValue1(expr->Nth(count)->IntegerValue());
             count ++;
         {
             controlItem->SetValue1(expr->Nth(count)->IntegerValue());
             count ++;

-            
+

             // Check for min
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
                 controlItem->SetValue2(expr->Nth(count)->IntegerValue());
                 count ++;
             // Check for min
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
                 controlItem->SetValue2(expr->Nth(count)->IntegerValue());
                 count ++;

-                
+

                 // Check for max
                 if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
                 {
                     controlItem->SetValue3(expr->Nth(count)->IntegerValue());
                     count ++;
                 // Check for max
                 if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
                 {
                     controlItem->SetValue3(expr->Nth(count)->IntegerValue());
                     count ++;

-                    
+

                     if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
                     {
                         // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
                         // do nothing
                         count ++;
                     if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
                     {
                         // controlItem->SetLabelFont(wxResourceInterpretFontSpec(expr->Nth(count)));
                         // do nothing
                         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)));
                     }


@@ -1031,19 +1030,19 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         {
             controlItem->SetValue1(expr->Nth(count)->IntegerValue());
             count ++;
         {
             controlItem->SetValue1(expr->Nth(count)->IntegerValue());
             count ++;

-            
+

             // PAGE LENGTH
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
                 controlItem->SetValue2(expr->Nth(count)->IntegerValue());
                 count ++;
             // PAGE LENGTH
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
                 controlItem->SetValue2(expr->Nth(count)->IntegerValue());
                 count ++;

-                
+

                 // OBJECT LENGTH
                 if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
                 {
                     controlItem->SetValue3(expr->Nth(count)->IntegerValue());
                     count ++;
                 // OBJECT LENGTH
                 if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
                 {
                     controlItem->SetValue3(expr->Nth(count)->IntegerValue());
                     count ++;

-                    
+

                     // VIEW LENGTH
                     if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
                         controlItem->SetValue5(expr->Nth(count)->IntegerValue());
                     // VIEW LENGTH
                     if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
                         controlItem->SetValue5(expr->Nth(count)->IntegerValue());


@@ -1054,8 +1053,8 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     else if (controlType == wxT("wxListBox"))
     {
         wxExpr *valueList = (wxExpr *) NULL;
     else if (controlType == wxT("wxListBox"))
     {
         wxExpr *valueList = (wxExpr *) NULL;

-        
-        if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+
+        if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))

         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();
         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();


@@ -1072,7 +1071,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
             /*
             controlItem->SetValue1(wxLB_SINGLE);
             */
             /*
             controlItem->SetValue1(wxLB_SINGLE);
             */

-            if ((mult = expr->Nth(count)) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))
+            if (((mult = expr->Nth(count)) != 0) && ((mult->Type() == PrologString)||(mult->Type() == PrologWord)))

             {
             /*
             wxString m(mult->StringValue());
             {
             /*
             wxString m(mult->StringValue());


@@ -1097,7 +1096,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     {
         wxExpr *valueList = (wxExpr *) NULL;
         // Check for default value list
     {
         wxExpr *valueList = (wxExpr *) NULL;
         // Check for default value list

-        if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+        if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))

         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();
         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();


@@ -1107,9 +1106,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
                 stringExpr = stringExpr->GetNext();
             }
             controlItem->SetStringValues(stringList);
                 stringExpr = stringExpr->GetNext();
             }
             controlItem->SetStringValues(stringList);

-            
+

             count ++;
             count ++;

-            
+

             if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
             {
                 // Skip past the obsolete label font spec if there are two consecutive specs
             if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
             {
                 // Skip past the obsolete label font spec if there are two consecutive specs


@@ -1127,12 +1126,12 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
         {
             wxString str(textValue->StringValue());
             controlItem->SetValue4(str);
         {
             wxString str(textValue->StringValue());
             controlItem->SetValue4(str);

-            
+

             count ++;
             count ++;

-            
+

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

-            if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+            if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))

             {
                 wxStringList stringList;
                 wxExpr *stringExpr = valueList->GetFirst();
             {
                 wxStringList stringList;
                 wxExpr *stringExpr = valueList->GetFirst();


@@ -1142,9 +1141,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
                     stringExpr = stringExpr->GetNext();
                 }
                 controlItem->SetStringValues(stringList);
                     stringExpr = stringExpr->GetNext();
                 }
                 controlItem->SetStringValues(stringList);

-                
+

                 count ++;
                 count ++;

-                
+

                 if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
                 {
                     // Skip past the obsolete label font spec if there are two consecutive specs
                 if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
                 {
                     // Skip past the obsolete label font spec if there are two consecutive specs


@@ -1161,7 +1160,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
     {
         wxExpr *valueList = (wxExpr *) NULL;
         // Check for default value list
     {
         wxExpr *valueList = (wxExpr *) NULL;
         // Check for default value list

-        if ((valueList = expr->Nth(count)) && (valueList->Type() == PrologList))
+        if (((valueList = expr->Nth(count)) != 0) && (valueList->Type() == PrologList))

         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();
         {
             wxStringList stringList;
             wxExpr *stringExpr = valueList->GetFirst();


@@ -1172,7 +1171,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
             }
             controlItem->SetStringValues(stringList);
             count ++;
             }
             controlItem->SetStringValues(stringList);
             count ++;

-            
+

             // majorDim (number of rows or cols)
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {
             // majorDim (number of rows or cols)
             if (expr->Nth(count) && (expr->Nth(count)->Type() == PrologInteger))
             {


@@ -1181,7 +1180,7 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
             }
             else
                 controlItem->SetValue1(0);
             }
             else
                 controlItem->SetValue1(0);

-            
+

             if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
             {
                 // Skip past the obsolete label font spec if there are two consecutive specs
             if (expr->Nth(count) && expr->Nth(count)->Type() == PrologList)
             {
                 // Skip past the obsolete label font spec if there are two consecutive specs


@@ -1210,12 +1209,12 @@ 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 *checkableExpr = expr->Nth(3);
     wxExpr *labelExpr = expr->Nth(0);
     wxExpr *idExpr = expr->Nth(1);
     wxExpr *helpExpr = expr->Nth(2);
     wxExpr *checkableExpr = expr->Nth(3);

-    
+

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


@@ -1257,12 +1256,12 @@ wxItemResource *wxResourceInterpretMenuItem(wxResourceTable& table, wxExpr *expr
         }
         if (checkableExpr)
             item->SetValue2(checkableExpr->IntegerValue());
         }
         if (checkableExpr)
             item->SetValue2(checkableExpr->IntegerValue());

-        
+

         // Find the first expression that's a list, for submenu
         wxExpr *subMenuExpr = expr->GetFirst();
         while (subMenuExpr && (subMenuExpr->Type() != PrologList))
             subMenuExpr = subMenuExpr->GetNext();
         // Find the first expression that's a list, for submenu
         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);


@@ -1300,18 +1299,18 @@ wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
     expr->GetAttributeValue(wxT("menu"), &listExpr);
     if (!listExpr)
         return (wxItemResource *) NULL;
     expr->GetAttributeValue(wxT("menu"), &listExpr);
     if (!listExpr)
         return (wxItemResource *) NULL;

-    
+

     wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);
     wxItemResource *menuResource = wxResourceInterpretMenuItem(table, listExpr);

-    
+

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

-    
+

     wxString name;
     if (expr->GetAttributeValue(wxT("name"), name))
     {
         menuResource->SetName(name);
     }
     wxString name;
     if (expr->GetAttributeValue(wxT("name"), name))
     {
         menuResource->SetName(name);
     }

-    
+

     return menuResource;
 }
 
     return menuResource;
 }
 


@@ -1321,11 +1320,11 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
     expr->GetAttributeValue(wxT("menu"), &listExpr);
     if (!listExpr)
         return (wxItemResource *) NULL;
     expr->GetAttributeValue(wxT("menu"), &listExpr);
     if (!listExpr)
         return (wxItemResource *) NULL;

-    
+

     wxItemResource *resource = new wxItemResource;
     resource->SetType(wxT("wxMenu"));
     //  resource->SetType(wxTYPE_MENU);
     wxItemResource *resource = new wxItemResource;
     resource->SetType(wxT("wxMenu"));
     //  resource->SetType(wxTYPE_MENU);

-    
+

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


@@ -1333,13 +1332,13 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
         resource->GetChildren().Append(menuResource);
         element = element->GetNext();
     }
         resource->GetChildren().Append(menuResource);
         element = element->GetNext();
     }

-    
+

     wxString name;
     if (expr->GetAttributeValue(wxT("name"), name))
     {
         resource->SetName(name);
     }
     wxString name;
     if (expr->GetAttributeValue(wxT("name"), name))
     {
         resource->SetName(name);
     }

-    
+

     return resource;
 }
 
     return resource;
 }
 


@@ -1374,7 +1373,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
                     wxItemResource *bitmapSpec = new wxItemResource;
                     //          bitmapSpec->SetType(wxTYPE_BITMAP);
                     bitmapSpec->SetType(wxT("wxBitmap"));
                     wxItemResource *bitmapSpec = new wxItemResource;
                     //          bitmapSpec->SetType(wxTYPE_BITMAP);
                     bitmapSpec->SetType(wxT("wxBitmap"));

-                    
+

                     // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
                     // where everything after 'filename' is optional.
                     wxExpr *nameExpr = listExpr->Nth(0);
                     // List is of form: [filename, bitmaptype, platform, colours, xresolution, yresolution]
                     // where everything after 'filename' is optional.
                     wxExpr *nameExpr = listExpr->Nth(0);


@@ -1393,7 +1392,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
                     }
                     else
                         bitmapSpec->SetValue1(0);
                     }
                     else
                         bitmapSpec->SetValue1(0);

-                    
+

                     if (platformExpr && platformExpr->StringValue() != wxT(""))
                     {
                         wxString plat(platformExpr->StringValue());
                     if (platformExpr && platformExpr->StringValue() != wxT(""))
                     {
                         wxString plat(platformExpr->StringValue());


@@ -1408,7 +1407,7 @@ wxItemResource *wxResourceInterpretBitmap(wxResourceTable& WXUNUSED(table), wxEx
                     }
                     else
                         bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);
                     }
                     else
                         bitmapSpec->SetValue2(RESOURCE_PLATFORM_ANY);

-                    
+

                     if (coloursExpr)
                         bitmapSpec->SetValue3(coloursExpr->IntegerValue());
                     int xres = 0;
                     if (coloursExpr)
                         bitmapSpec->SetValue3(coloursExpr->IntegerValue());
                     int xres = 0;


@@ -1418,14 +1417,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;
 }
 


@@ -1447,14 +1446,14 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
 {
     if (expr->Type() != PrologList)
         return wxNullFont;
 {
     if (expr->Type() != PrologList)
         return wxNullFont;

-    
+

     int point = 10;
     int family = wxSWISS;
     int style = wxNORMAL;
     int weight = wxNORMAL;
     int underline = 0;
     wxString faceName(wxT(""));
     int point = 10;
     int family = wxSWISS;
     int style = wxNORMAL;
     int weight = wxNORMAL;
     int underline = 0;
     wxString faceName(wxT(""));

-    
+

     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);


@@ -1463,7 +1462,7 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
     wxExpr *faceNameExpr = expr->Nth(5);
     if (pointExpr)
         point = (int)pointExpr->IntegerValue();
     wxExpr *faceNameExpr = expr->Nth(5);
     if (pointExpr)
         point = (int)pointExpr->IntegerValue();

-    
+

     wxString str;
     if (familyExpr)
     {
     wxString str;
     if (familyExpr)
     {


@@ -1484,7 +1483,7 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
         underline = (int)underlineExpr->IntegerValue();
     if (faceNameExpr)
         faceName = faceNameExpr->StringValue();
         underline = (int)underlineExpr->IntegerValue();
     if (faceNameExpr)
         faceName = faceNameExpr->StringValue();

-    
+

     wxFont font(point, family, style, weight, (underline != 0), faceName);
     return font;
 }
     wxFont font(point, family, style, weight, (underline != 0), faceName);
     return font;
 }


@@ -1519,7 +1518,7 @@ bool wxReallocateResourceBuffer()
 static bool wxEatWhiteSpace(FILE *fd)
 {
     int ch = 0;
 static bool wxEatWhiteSpace(FILE *fd)
 {
     int ch = 0;

-    
+

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


@@ -1538,7 +1537,7 @@ static bool wxEatWhiteSpace(FILE *fd)
                     ungetc(prev_ch, fd);
                     return TRUE;
                 }
                     ungetc(prev_ch, fd);
                     return TRUE;
                 }

-                
+

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


@@ -1567,7 +1566,7 @@ static bool wxEatWhiteSpace(FILE *fd)
         default:
             ungetc(ch, fd);
             return TRUE;
         default:
             ungetc(ch, fd);
             return TRUE;

-            
+

         }
     }
     return FALSE;
         }
     }
     return FALSE;


@@ -1580,7 +1579,7 @@ static bool wxEatWhiteSpace(wxInputStream *is)
         is->Ungetch(ch);
         return TRUE;
     }
         is->Ungetch(ch);
         return TRUE;
     }

-    
+

     // Eat whitespace
     while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
         ch = is->GetC();
     // Eat whitespace
     while (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
         ch = is->GetC();


@@ -1622,7 +1621,7 @@ bool wxGetResourceToken(FILE *fd)
         wxReallocateResourceBuffer();
     wxResourceBuffer[0] = 0;
     wxEatWhiteSpace(fd);
         wxReallocateResourceBuffer();
     wxResourceBuffer[0] = 0;
     wxEatWhiteSpace(fd);

-    
+

     int ch = getc(fd);
     if (ch == '"')
     {
     int ch = getc(fd);
     if (ch == '"')
     {


@@ -1650,7 +1649,7 @@ bool wxGetResourceToken(FILE *fd)
                     ungetc(newCh, fd);
                 }
             }
                     ungetc(newCh, fd);
                 }
             }

-            
+

             if (wxResourceBufferCount >= wxResourceBufferSize-1)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
             if (wxResourceBufferCount >= wxResourceBufferSize-1)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;


@@ -1669,7 +1668,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;


@@ -1685,7 +1684,7 @@ bool wxGetResourceToken(wxInputStream *is)
         wxReallocateResourceBuffer();
     wxResourceBuffer[0] = 0;
     wxEatWhiteSpace(is);
         wxReallocateResourceBuffer();
     wxResourceBuffer[0] = 0;
     wxEatWhiteSpace(is);

-    
+

     int ch = is->GetC() ;
     if (ch == '"')
     {
     int ch = is->GetC() ;
     if (ch == '"')
     {


@@ -1715,7 +1714,7 @@ bool wxGetResourceToken(wxInputStream *is)
                     is->Ungetch(newCh);
                 }
             }
                     is->Ungetch(newCh);
                 }
             }

-            
+

             if (wxResourceBufferCount >= wxResourceBufferSize-1)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
             if (wxResourceBufferCount >= wxResourceBufferSize-1)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;


@@ -1734,7 +1733,7 @@ bool wxGetResourceToken(wxInputStream *is)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)ch;
             wxResourceBufferCount ++;
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)ch;
             wxResourceBufferCount ++;

-            
+

             ch = is->GetC();
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;
             ch = is->GetC();
         }
         wxResourceBuffer[wxResourceBufferCount] = 0;


@@ -1754,14 +1753,14 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     // static or #define
     if (!wxGetResourceToken(fd))
     {
         *eof = TRUE;
         return FALSE;
     }
     // static or #define
     if (!wxGetResourceToken(fd))
     {
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
         wxGetResourceToken(fd);
     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
         wxGetResourceToken(fd);


@@ -1782,7 +1781,7 @@ 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)
         return TRUE;
     }
     else if (strcmp(wxResourceBuffer, "#include") == 0)


@@ -1811,7 +1810,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
         wxLogWarning(buf);
         return FALSE;
     }
         wxLogWarning(buf);
         return FALSE;
     }

-    
+

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


@@ -1819,13 +1818,13 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "char") != 0)
     {
         wxLogWarning(_("Expected 'char' whilst parsing resource."));
         return FALSE;
     }
     if (strcmp(wxResourceBuffer, "char") != 0)
     {
         wxLogWarning(_("Expected 'char' whilst parsing resource."));
         return FALSE;
     }

-    
+

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


@@ -1833,7 +1832,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (wxResourceBuffer[0] != '*')
     {
         wxLogWarning(_("Expected '*' whilst parsing resource."));
     if (wxResourceBuffer[0] != '*')
     {
         wxLogWarning(_("Expected '*' whilst parsing resource."));


@@ -1842,7 +1841,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
     nameBuf[99] = 0;
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
     nameBuf[99] = 0;

-    
+

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


@@ -1850,13 +1849,13 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         wxLogWarning(_("Expected '=' whilst parsing resource."));
         return FALSE;
     }
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         wxLogWarning(_("Expected '=' whilst parsing resource."));
         return FALSE;
     }

-    
+

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


@@ -1884,14 +1883,14 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     // static or #define
     if (!wxGetResourceToken(fd))
     {
         *eof = TRUE;
         return FALSE;
     }
     // static or #define
     if (!wxGetResourceToken(fd))
     {
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
         wxGetResourceToken(fd);
     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
         wxGetResourceToken(fd);


@@ -1912,7 +1911,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
         }
         delete[] name;
         delete[] value;
         }
         delete[] name;
         delete[] value;

-        
+

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


@@ -1941,7 +1940,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
         wxLogWarning(buf);
         return FALSE;
     }
         wxLogWarning(buf);
         return FALSE;
     }

-    
+

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


@@ -1949,13 +1948,13 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "char") != 0)
     {
         wxLogWarning(_("Expected 'char' whilst parsing resource."));
         return FALSE;
     }
     if (strcmp(wxResourceBuffer, "char") != 0)
     {
         wxLogWarning(_("Expected 'char' whilst parsing resource."));
         return FALSE;
     }

-    
+

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


@@ -1963,7 +1962,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (wxResourceBuffer[0] != '*')
     {
         wxLogWarning(_("Expected '*' whilst parsing resource."));
     if (wxResourceBuffer[0] != '*')
     {
         wxLogWarning(_("Expected '*' whilst parsing resource."));


@@ -1971,7 +1970,7 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
     }
     char nameBuf[100];
     strncpy(nameBuf, wxResourceBuffer+1, 99);
     }
     char nameBuf[100];
     strncpy(nameBuf, wxResourceBuffer+1, 99);

-    
+

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


@@ -1979,13 +1978,13 @@ bool wxResourceReadOneResource(wxInputStream *fd, wxExprDatabase& db, bool *eof,
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         wxLogWarning(_("Expected '=' whilst parsing resource."));
         return FALSE;
     }
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         wxLogWarning(_("Expected '=' whilst parsing resource."));
         return FALSE;
     }

-    
+

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


@@ -2022,7 +2021,7 @@ wxChar* wxResourceParseWord(wxChar*s, int *i)
 {
     if (!s)
         return (wxChar*) NULL;
 {
     if (!s)
         return (wxChar*) NULL;

-    
+

     static wxChar buf[150];
     int len = wxStrlen(s);
     int j = 0;
     static wxChar buf[150];
     int len = wxStrlen(s);
     int j = 0;


@@ -2034,7 +2033,7 @@ wxChar* wxResourceParseWord(wxChar*s, int *i)
         ii ++;
     }
     buf[j] = 0;
         ii ++;
     }
     buf[j] = 0;

-    
+

     // Eat whitespace and conjunction characters
     while ((ii < len) &&
         ((s[ii] == wxT(' ')) || (s[ii] == wxT('|')) || (s[ii] == wxT(','))))
     // Eat whitespace and conjunction characters
     while ((ii < len) &&
         ((s[ii] == wxT(' ')) || (s[ii] == wxT('|')) || (s[ii] == wxT(','))))


@@ -2068,18 +2067,18 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxLB_SORT"), wxLB_SORT },
     { wxT("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
     { wxT("wxLB_HSCROLL"), wxLB_HSCROLL },
     { wxT("wxLB_SORT"), wxLB_SORT },
     { wxT("wxLB_OWNERDRAW"), wxLB_OWNERDRAW },
     { wxT("wxLB_HSCROLL"), wxLB_HSCROLL },

-    
+

     /* wxComboxBox */
     { wxT("wxCB_SIMPLE"), wxCB_SIMPLE },
     { wxT("wxCB_DROPDOWN"), wxCB_DROPDOWN },
     { wxT("wxCB_READONLY"), wxCB_READONLY },
     { wxT("wxCB_SORT"), wxCB_SORT },
     /* wxComboxBox */
     { wxT("wxCB_SIMPLE"), wxCB_SIMPLE },
     { wxT("wxCB_DROPDOWN"), wxCB_DROPDOWN },
     { wxT("wxCB_READONLY"), wxCB_READONLY },
     { wxT("wxCB_SORT"), wxCB_SORT },

-    
+

     /* wxGauge */
     { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
     { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
     { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },
     /* wxGauge */
     { wxT("wxGA_PROGRESSBAR"), wxGA_PROGRESSBAR },
     { wxT("wxGA_HORIZONTAL"), wxGA_HORIZONTAL },
     { wxT("wxGA_VERTICAL"), wxGA_VERTICAL },

-    
+

     /* wxTextCtrl */
     { wxT("wxPASSWORD"), wxPASSWORD},
     { wxT("wxPROCESS_ENTER"), wxPROCESS_ENTER},
     /* wxTextCtrl */
     { wxT("wxPASSWORD"), wxPASSWORD},
     { wxT("wxPROCESS_ENTER"), wxPROCESS_ENTER},


@@ -2088,14 +2087,14 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
     { wxT("wxTE_MULTILINE"), wxTE_MULTILINE},
     { wxT("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},
     { wxT("wxTE_PROCESS_ENTER"), wxTE_PROCESS_ENTER},
     { wxT("wxTE_MULTILINE"), wxTE_MULTILINE},
     { wxT("wxTE_NO_VSCROLL"), wxTE_NO_VSCROLL},

-    
+

     /* wxRadioBox/wxRadioButton */
     { 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 },
     /* wxRadioBox/wxRadioButton */
     { 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 */
     { wxT("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
     { wxT("wxSL_VERTICAL"), wxSL_VERTICAL },
     /* wxSlider */
     { wxT("wxSL_HORIZONTAL"), wxSL_HORIZONTAL },
     { wxT("wxSL_VERTICAL"), wxSL_VERTICAL },


@@ -2107,20 +2106,20 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxSL_BOTTOM"), wxSL_BOTTOM },
     { wxT("wxSL_BOTH"), wxSL_BOTH },
     { wxT("wxSL_SELRANGE"), wxSL_SELRANGE },
     { wxT("wxSL_BOTTOM"), wxSL_BOTTOM },
     { wxT("wxSL_BOTH"), wxSL_BOTH },
     { wxT("wxSL_SELRANGE"), wxSL_SELRANGE },

-    
+

     /* wxScrollBar */
     { wxT("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
     { wxT("wxSB_VERTICAL"), wxSB_VERTICAL },
     /* wxScrollBar */
     { wxT("wxSB_HORIZONTAL"), wxSB_HORIZONTAL },
     { wxT("wxSB_VERTICAL"), wxSB_VERTICAL },

-    
+

     /* wxButton */
     { wxT("wxBU_AUTODRAW"), wxBU_AUTODRAW },
     { wxT("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },
     /* wxButton */
     { wxT("wxBU_AUTODRAW"), wxBU_AUTODRAW },
     { wxT("wxBU_NOAUTODRAW"), wxBU_NOAUTODRAW },

-    
+

     /* wxTreeCtrl */
     { wxT("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
     { wxT("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
     { wxT("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },
     /* wxTreeCtrl */
     { wxT("wxTR_HAS_BUTTONS"), wxTR_HAS_BUTTONS },
     { wxT("wxTR_EDIT_LABELS"), wxTR_EDIT_LABELS },
     { wxT("wxTR_LINES_AT_ROOT"), wxTR_LINES_AT_ROOT },

-    
+

     /* wxListCtrl */
     { wxT("wxLC_ICON"), wxLC_ICON },
     { wxT("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },
     /* wxListCtrl */
     { wxT("wxLC_ICON"), wxLC_ICON },
     { wxT("wxLC_SMALL_ICON"), wxLC_SMALL_ICON },


@@ -2136,27 +2135,27 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
     { wxT("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
     { wxT("wxLC_SORT_DESCENDING"), wxLC_SORT_DESCENDING },
     { wxT("wxLC_SINGLE_SEL"), wxLC_SINGLE_SEL },
     { wxT("wxLC_SORT_ASCENDING"), wxLC_SORT_ASCENDING },
     { wxT("wxLC_SORT_DESCENDING"), wxLC_SORT_DESCENDING },

-    
+

     /* wxSpinButton */
     { wxT("wxSP_VERTICAL"), wxSP_VERTICAL},
     { wxT("wxSP_HORIZONTAL"), wxSP_HORIZONTAL},
     { wxT("wxSP_ARROW_KEYS"), wxSP_ARROW_KEYS},
     { wxT("wxSP_WRAP"), wxSP_WRAP},
     /* wxSpinButton */
     { wxT("wxSP_VERTICAL"), wxSP_VERTICAL},
     { wxT("wxSP_HORIZONTAL"), wxSP_HORIZONTAL},
     { wxT("wxSP_ARROW_KEYS"), wxSP_ARROW_KEYS},
     { wxT("wxSP_WRAP"), wxSP_WRAP},

-    
+

     /* wxSplitterWnd */
     { wxT("wxSP_NOBORDER"), wxSP_NOBORDER},
     { wxT("wxSP_3D"), wxSP_3D},
     { wxT("wxSP_BORDER"), wxSP_BORDER},
     /* wxSplitterWnd */
     { wxT("wxSP_NOBORDER"), wxSP_NOBORDER},
     { wxT("wxSP_3D"), wxSP_3D},
     { wxT("wxSP_BORDER"), wxSP_BORDER},

-    
+

     /* wxTabCtrl */
     { wxT("wxTC_MULTILINE"), wxTC_MULTILINE},
     { wxT("wxTC_RIGHTJUSTIFY"), wxTC_RIGHTJUSTIFY},
     { wxT("wxTC_FIXEDWIDTH"), wxTC_FIXEDWIDTH},
     { wxT("wxTC_OWNERDRAW"), wxTC_OWNERDRAW},
     /* wxTabCtrl */
     { wxT("wxTC_MULTILINE"), wxTC_MULTILINE},
     { wxT("wxTC_RIGHTJUSTIFY"), wxTC_RIGHTJUSTIFY},
     { wxT("wxTC_FIXEDWIDTH"), wxTC_FIXEDWIDTH},
     { wxT("wxTC_OWNERDRAW"), wxTC_OWNERDRAW},

-    
+

     /* wxStatusBar95 */
     { wxT("wxST_SIZEGRIP"), wxST_SIZEGRIP},
     /* wxStatusBar95 */
     { wxT("wxST_SIZEGRIP"), wxST_SIZEGRIP},

-    
+

     /* wxControl */
     { wxT("wxFIXED_LENGTH"), wxFIXED_LENGTH},
     { wxT("wxALIGN_LEFT"), wxALIGN_LEFT},
     /* wxControl */
     { wxT("wxFIXED_LENGTH"), wxFIXED_LENGTH},
     { wxT("wxALIGN_LEFT"), wxALIGN_LEFT},


@@ -2164,16 +2163,16 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxALIGN_CENTRE"), wxALIGN_CENTRE},
     { wxT("wxALIGN_RIGHT"), wxALIGN_RIGHT},
     { wxT("wxCOLOURED"), wxCOLOURED},
     { wxT("wxALIGN_CENTRE"), wxALIGN_CENTRE},
     { wxT("wxALIGN_RIGHT"), wxALIGN_RIGHT},
     { wxT("wxCOLOURED"), wxCOLOURED},

-    
+

     /* wxToolBar */
     { wxT("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
     { wxT("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
     { wxT("wxTB_VERTICAL"), wxTB_VERTICAL},
     { wxT("wxTB_FLAT"), wxTB_FLAT},
     /* wxToolBar */
     { wxT("wxTB_3DBUTTONS"), wxTB_3DBUTTONS},
     { wxT("wxTB_HORIZONTAL"), wxTB_HORIZONTAL},
     { wxT("wxTB_VERTICAL"), wxTB_VERTICAL},
     { wxT("wxTB_FLAT"), wxTB_FLAT},

-    
+

     /* wxDialog */
     { wxT("wxDIALOG_MODAL"), wxDIALOG_MODAL },
     /* wxDialog */
     { wxT("wxDIALOG_MODAL"), wxDIALOG_MODAL },

-    
+

     /* Generic */
     { wxT("wxVSCROLL"), wxVSCROLL },
     { wxT("wxHSCROLL"), wxHSCROLL },
     /* Generic */
     { wxT("wxVSCROLL"), wxVSCROLL },
     { wxT("wxHSCROLL"), wxHSCROLL },


@@ -2212,10 +2211,10 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
     { wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},
     { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only
     { wxT("wxCLIP_CHILDREN"), wxCLIP_CHILDREN},
     { wxT("wxCLIP_SIBLINGS"), wxCLIP_SIBLINGS},
     { wxT("wxTAB_TRAVERSAL"), 0}, // Compatibility only

-    
+

     { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
     { wxT("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},
     { wxT("wxTINY_CAPTION_HORIZ"), wxTINY_CAPTION_HORIZ},
     { wxT("wxTINY_CAPTION_VERT"), wxTINY_CAPTION_VERT},

-    
+

     // Text font families
     { wxT("wxDEFAULT"), wxDEFAULT},
     { wxT("wxDECORATIVE"), wxDECORATIVE},
     // Text font families
     { wxT("wxDEFAULT"), wxDEFAULT},
     { wxT("wxDECORATIVE"), wxDECORATIVE},


@@ -2251,7 +2250,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxCAP_ROUND"), wxCAP_ROUND},
     { wxT("wxCAP_PROJECTING"), wxCAP_PROJECTING},
     { wxT("wxCAP_BUTT"), wxCAP_BUTT},
     { wxT("wxCAP_ROUND"), wxCAP_ROUND},
     { wxT("wxCAP_PROJECTING"), wxCAP_PROJECTING},
     { wxT("wxCAP_BUTT"), wxCAP_BUTT},

-    
+

     // Logical ops
     { wxT("wxCLEAR"), wxCLEAR},
     { wxT("wxXOR"), wxXOR},
     // Logical ops
     { wxT("wxCLEAR"), wxCLEAR},
     { wxT("wxXOR"), wxXOR},


@@ -2269,7 +2268,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxNAND"), wxNAND},
     { wxT("wxOR"), wxOR},
     { wxT("wxSET"), wxSET},
     { 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("wxFLOOD_SURFACE"), wxFLOOD_SURFACE},
     { wxT("wxFLOOD_BORDER"), wxFLOOD_BORDER},
     { wxT("wxODDEVEN_RULE"), wxODDEVEN_RULE},


@@ -2295,7 +2294,7 @@ static wxResourceBitListStruct wxResourceBitListTable[] =
     { wxT("wxUSER_COLOURS"), wxUSER_COLOURS},
     { wxT("wxVERTICAL_LABEL"), 0},
     { wxT("wxHORIZONTAL_LABEL"), 0},
     { wxT("wxUSER_COLOURS"), wxUSER_COLOURS},
     { wxT("wxVERTICAL_LABEL"), 0},
     { wxT("wxHORIZONTAL_LABEL"), 0},

-    
+

     // Bitmap types (not strictly styles)
     { wxT("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
     { wxT("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},
     // Bitmap types (not strictly styles)
     { wxT("wxBITMAP_TYPE_XPM"), wxBITMAP_TYPE_XPM},
     { wxT("wxBITMAP_TYPE_XBM"), wxBITMAP_TYPE_XBM},


@@ -2351,7 +2350,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

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


@@ -2362,9 +2361,9 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         }
         int thisDepth = wxDisplayDepth();
         long thisNoColours = (long)pow(2.0, (double)thisDepth);
         }
         int thisDepth = wxDisplayDepth();
         long thisNoColours = (long)pow(2.0, (double)thisDepth);

-        
+

         wxItemResource *optResource = (wxItemResource *) NULL;
         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)


@@ -2378,7 +2377,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             int xRes = child->GetWidth();
             int yRes = child->GetHeight();
             */
             int xRes = child->GetWidth();
             int yRes = child->GetHeight();
             */

-            
+

             switch (platform)
             {
             case RESOURCE_PLATFORM_ANY:
             switch (platform)
             {
             case RESOURCE_PLATFORM_ANY:


@@ -2445,7 +2444,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         // If no matching resource, fail.
         if (!optResource)
             return wxNullBitmap;
         // If no matching resource, fail.
         if (!optResource)
             return wxNullBitmap;

-        
+

         wxString name = optResource->GetName();
         int bitmapType = (int)optResource->GetValue1();
         switch (bitmapType)
         wxString name = optResource->GetName();
         int bitmapType = (int)optResource->GetValue1();
         switch (bitmapType)


@@ -2468,7 +2467,6 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {
             }
         case wxBITMAP_TYPE_XPM_DATA:
             {

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

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


@@ -2476,14 +2474,10 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
                     return wxNullBitmap;
                 }
                 return wxBitmap((char **)item->GetValue1());
                     return wxNullBitmap;
                 }
                 return wxBitmap((char **)item->GetValue1());

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

             }
         default:
             {
             }
         default:
             {

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

             }
         }
 #ifndef __WXGTK__
             }
         }
 #ifndef __WXGTK__


@@ -2506,7 +2500,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

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


@@ -2517,9 +2511,9 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         }
         int thisDepth = wxDisplayDepth();
         long thisNoColours = (long)pow(2.0, (double)thisDepth);
         }
         int thisDepth = wxDisplayDepth();
         long thisNoColours = (long)pow(2.0, (double)thisDepth);

-        
+

         wxItemResource *optResource = (wxItemResource *) NULL;
         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)


@@ -2533,7 +2527,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             int xRes = child->GetWidth();
             int yRes = child->GetHeight();
             */
             int xRes = child->GetWidth();
             int yRes = child->GetHeight();
             */

-            
+

             switch (platform)
             {
             case RESOURCE_PLATFORM_ANY:
             switch (platform)
             {
             case RESOURCE_PLATFORM_ANY:


@@ -2600,7 +2594,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         // If no matching resource, fail.
         if (!optResource)
             return wxNullIcon;
         // If no matching resource, fail.
         if (!optResource)
             return wxNullIcon;

-        
+

         wxString name = optResource->GetName();
         int bitmapType = (int)optResource->GetValue1();
         switch (bitmapType)
         wxString name = optResource->GetName();
         int bitmapType = (int)optResource->GetValue1();
         switch (bitmapType)


@@ -2625,7 +2619,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             {
                 // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
                 /*
             {
                 // *** XPM ICON NOT YET IMPLEMENTED IN WXWINDOWS ***
                 /*

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

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


@@ -2635,9 +2628,6 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
                 return NULL;
                 }
                 return wxIcon((char **)item->GetValue1());
                 return NULL;
                 }
                 return wxIcon((char **)item->GetValue1());

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

                 */
                 wxLogWarning(_("No XPM icon facility available!"));
                 break;
                 */
                 wxLogWarning(_("No XPM icon facility available!"));
                 break;


@@ -2646,10 +2636,10 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
             {
 #ifdef __WXGTK__
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);
             {
 #ifdef __WXGTK__
                 wxLogWarning(_("Icon resource specification %s not found."), (const wxChar*) resource);

+                break;

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

-                break;

             }
         }
         return wxNullIcon;
             }
         }
         return wxNullIcon;


@@ -2661,6 +2651,8 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
   }
 }
 
   }
 }
 

+#if wxUSE_MENUS
+

 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;
 wxMenu *wxResourceCreateMenu(wxItemResource *item)
 {
     wxMenu *menu = new wxMenu;


@@ -2689,7 +2681,7 @@ wxMenuBar *wxResourceCreateMenuBar(const wxString& resource, wxResourceTable *ta
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     wxItemResource *menuResource = table->FindResource(resource);
     if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("wxMenu")))
     {
     wxItemResource *menuResource = table->FindResource(resource);
     if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("wxMenu")))
     {


@@ -2713,7 +2705,7 @@ wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     wxItemResource *menuResource = table->FindResource(resource);
     if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("wxMenu")))
         //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
     wxItemResource *menuResource = table->FindResource(resource);
     if (menuResource && (menuResource->GetType() != wxT("")) && (menuResource->GetType() == wxT("wxMenu")))
         //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))


@@ -2721,12 +2713,14 @@ wxMenu *wxResourceCreateMenu(const wxString& resource, wxResourceTable *table)
     return (wxMenu *) NULL;
 }
 
     return (wxMenu *) NULL;
 }
 

+#endif // wxUSE_MENUS
+

 // Global equivalents (so don't have to refer to default table explicitly)
 bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;
 // Global equivalents (so don't have to refer to default table explicitly)
 bool wxResourceParseData(const wxString& resource, wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

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


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

-    
+

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


@@ -2743,7 +2737,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);
 }
 


@@ -2751,7 +2745,7 @@ bool wxResourceRegisterBitmapData(const wxString& name, char **data, wxResourceT
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     return table->RegisterResourceBitmapData(name, data);
 }
 
     return table->RegisterResourceBitmapData(name, data);
 }
 


@@ -2759,7 +2753,7 @@ void wxResourceClear(wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     table->ClearTable();
 }
 
     table->ClearTable();
 }
 


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

-    
+

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


@@ -2780,7 +2774,7 @@ int wxResourceGetIdentifier(const wxString& name, wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

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


@@ -2792,7 +2786,7 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table)
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

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


@@ -2844,7 +2838,7 @@ static int ungetc_string()
 bool wxEatWhiteSpaceString(char *s)
 {
     int ch = 0;
 bool wxEatWhiteSpaceString(char *s)
 {
     int ch = 0;

-    
+

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


@@ -2863,7 +2857,7 @@ bool wxEatWhiteSpaceString(char *s)
                     ungetc_string();
                     return TRUE;
                 }
                     ungetc_string();
                     return TRUE;
                 }

-                
+

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


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

-            
+

         }
     }
     return FALSE;
         }
     }
     return FALSE;


@@ -2898,7 +2892,7 @@ bool wxGetResourceTokenString(char *s)
         wxReallocateResourceBuffer();
     wxResourceBuffer[0] = 0;
     wxEatWhiteSpaceString(s);
         wxReallocateResourceBuffer();
     wxResourceBuffer[0] = 0;
     wxEatWhiteSpaceString(s);

-    
+

     int ch = getc_string(s);
     if (ch == '"')
     {
     int ch = getc_string(s);
     if (ch == '"')
     {


@@ -2926,7 +2920,7 @@ bool wxGetResourceTokenString(char *s)
                     ungetc_string();
                 }
             }
                     ungetc_string();
                 }
             }

-            
+

             if (wxResourceBufferCount >= wxResourceBufferSize-1)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;
             if (wxResourceBufferCount >= wxResourceBufferSize-1)
                 wxReallocateResourceBuffer();
             wxResourceBuffer[wxResourceBufferCount] = (char)actualCh;


@@ -2945,7 +2939,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;


@@ -2965,14 +2959,14 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     // static or #define
     if (!wxGetResourceTokenString(s))
     {
         *eof = TRUE;
         return FALSE;
     }
     // static or #define
     if (!wxGetResourceTokenString(s))
     {
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
         wxGetResourceTokenString(s);
     if (strcmp(wxResourceBuffer, "#define") == 0)
     {
         wxGetResourceTokenString(s);


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

-        
+

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


@@ -3026,7 +3020,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
         wxLogWarning(buf);
         return FALSE;
     }
         wxLogWarning(buf);
         return FALSE;
     }

-    
+

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


@@ -3034,13 +3028,13 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "char") != 0)
     {
         wxLogWarning(_("Expected 'char' whilst parsing resource."));
         return FALSE;
     }
     if (strcmp(wxResourceBuffer, "char") != 0)
     {
         wxLogWarning(_("Expected 'char' whilst parsing resource."));
         return FALSE;
     }

-    
+

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


@@ -3048,7 +3042,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (wxResourceBuffer[0] != '*')
     {
         wxLogWarning(_("Expected '*' whilst parsing resource."));
     if (wxResourceBuffer[0] != '*')
     {
         wxLogWarning(_("Expected '*' whilst parsing resource."));


@@ -3057,7 +3051,7 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
     nameBuf[99] = 0;
     wxChar nameBuf[100];
     wxMB2WX(nameBuf, wxResourceBuffer+1, 99);
     nameBuf[99] = 0;

-    
+

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


@@ -3065,13 +3059,13 @@ bool wxResourceReadOneResourceString(char *s, wxExprDatabase& db, bool *eof, wxR
         *eof = TRUE;
         return FALSE;
     }
         *eof = TRUE;
         return FALSE;
     }

-    
+

     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         wxLogWarning(_("Expected '=' whilst parsing resource."));
         return FALSE;
     }
     if (strcmp(wxResourceBuffer, "=") != 0)
     {
         wxLogWarning(_("Expected '=' whilst parsing resource."));
         return FALSE;
     }

-    
+

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


@@ -3099,10 +3093,10 @@ 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
     if (s)
     {
     // Turn backslashes into spaces
     if (s)
     {


@@ -3115,10 +3109,10 @@ bool wxResourceParseString(char *s, wxResourceTable *table)
                 s[i+1] = ' ';
             }
     }
                 s[i+1] = ' ';
             }
     }

-    
+

     wxExprDatabase db;
     wxResourceStringPtr = 0;
     wxExprDatabase db;
     wxResourceStringPtr = 0;

-    
+

     bool eof = FALSE;
     while (wxResourceReadOneResourceString(s, db, &eof, table) && !eof)
     {
     bool eof = FALSE;
     while (wxResourceReadOneResourceString(s, db, &eof, table) && !eof)
     {


@@ -3135,13 +3129,13 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
 {
     if (!table)
         table = wxDefaultResourceTable;
 {
     if (!table)
         table = wxDefaultResourceTable;

-    
+

     wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
     //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
     if (!resource || (resource->GetType() == wxT("")) ||
         ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))
         return FALSE;
     wxItemResource *resource = table->FindResource((const wxChar *)resourceName);
     //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
     if (!resource || (resource->GetType() == wxT("")) ||
         ! ((resource->GetType() == wxT("wxDialog")) || (resource->GetType() == wxT("wxPanel"))))
         return FALSE;

-    
+

     wxString title(resource->GetTitle());
     long theWindowStyle = resource->GetStyle();
     bool isModal = (resource->GetValue1() != 0) ;
     wxString title(resource->GetTitle());
     long theWindowStyle = resource->GetStyle();
     bool isModal = (resource->GetValue1() != 0) ;


@@ -3150,30 +3144,34 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
     int width = resource->GetWidth();
     int height = resource->GetHeight();
     wxString name = resource->GetName();
     int width = resource->GetWidth();
     int height = resource->GetHeight();
     wxString name = resource->GetName();

-    
-    if (IsKindOf(CLASSINFO(wxDialog)))
-    {
-        wxDialog *dialogBox = (wxDialog *)this;
-        long modalStyle = isModal ? wxDIALOG_MODAL : 0;
-        if (!dialogBox->Create(parent, -1, title, wxPoint(x, y), wxSize(width, height), theWindowStyle|modalStyle, name))
-            return FALSE;
-        
-        // Only reset the client size if we know we're not going to do it again below.
-        if ((resource->GetResourceStyle() & wxRESOURCE_DIALOG_UNITS) == 0)
-            dialogBox->SetClientSize(width, height);
-    }
-    else if (IsKindOf(CLASSINFO(wxPanel)))
-    {
-        wxPanel* panel = (wxPanel *)this;
-        if (!panel->Create(parent, -1, wxPoint(x, y), wxSize(width, height), theWindowStyle | wxTAB_TRAVERSAL, name))
-            return FALSE;
-    }
-    else
+
+    // this is used for loading wxWizard pages from WXR
+    if ( parent != this )

     {
     {

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

     }
     }

-    
+

     if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
     {
         // No need to do this since it's done in wxPanel or wxDialog constructor.
     if ((resource->GetResourceStyle() & wxRESOURCE_USE_DEFAULTS) != 0)
     {
         // No need to do this since it's done in wxPanel or wxDialog constructor.


@@ -3186,32 +3184,32 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa
         if (resource->GetBackgroundColour().Ok())
             SetBackgroundColour(resource->GetBackgroundColour());
     }
         if (resource->GetBackgroundColour().Ok())
             SetBackgroundColour(resource->GetBackgroundColour());
     }

-    
+

     // Should have some kind of font at this point
     if (!GetFont().Ok())
         SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
     if (!GetBackgroundColour().Ok())
         SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));
     // Should have some kind of font at this point
     if (!GetFont().Ok())
         SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT));
     if (!GetBackgroundColour().Ok())
         SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE));

-    
+

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

-        
+

         wxPoint pt = ConvertDialogToPixels(wxPoint(x, y));
         Move(pt.x, pt.y);
     }
         wxPoint pt = ConvertDialogToPixels(wxPoint(x, y));
         Move(pt.x, pt.y);
     }

-    
+

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

-        
+

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

-        
+

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