memory leak plugged

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index fcce235d26a78327b20081eb8e7f5d301cf93d50..031a211c74df3753e26ec98207bcbd638238b8d6 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -39,12 +39,14 @@
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"
 #include "wx/button.h"
 #include "wx/bmpbuttn.h"
 #include "wx/radiobox.h"

+#include "wx/radiobut.h"

 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"
 #include "wx/statbox.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/settings.h"
 #include "wx/slider.h"
 #include "wx/statbox.h"

+#include "wx/statbmp.h"

 #if wxUSE_GAUGE
 #include "wx/gauge.h"
 #endif
 #if wxUSE_GAUGE
 #include "wx/gauge.h"
 #endif


@@ -53,6 +55,10 @@
 #include "wx/intl.h"
 #endif
 
 #include "wx/intl.h"
 #endif
 

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

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


@@ -93,10 +99,10 @@ bool wxResourceParseIncludeFile(const wxString& f, wxResourceTable *table = (wxR
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 
 
 wxResourceTable *wxDefaultResourceTable = (wxResourceTable *) NULL;
 

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

 
 void wxInitializeResourceSystem()
 {
 
 void wxInitializeResourceSystem()
 {


@@ -148,7 +154,7 @@ wxItemResource::~wxItemResource()
 /*
  * Resource table
  */
 /*
  * Resource table
  */

- 
+

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


@@ -157,7 +163,7 @@ wxResourceTable::~wxResourceTable()
 {
   ClearTable();
 }
 {
   ClearTable();
 }

-    
+

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


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

-    
+

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


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

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

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

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

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


@@ -588,7 +610,7 @@ wxItemResource *wxResourceInterpretDialog(wxResourceTable& table, wxExpr *expr,
   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;


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

-  
+

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


@@ -797,6 +819,19 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
   controlItem->SetId(id);
 
   if (controlType == "wxButton")
   controlItem->SetId(id);
 
   if (controlType == "wxButton")

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

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


@@ -852,6 +887,19 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
    }
   }
   else if (controlType == "wxMessage" || controlType == "wxStaticText")
    }
   }
   else if (controlType == "wxMessage" || controlType == "wxStaticText")

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

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


@@ -859,9 +907,9 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       wxString str(expr->Nth(count)->StringValue());
       controlItem->SetValue4(str);
       count ++;
       wxString str(expr->Nth(count)->StringValue());
       controlItem->SetValue4(str);
       count ++;

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

     }
     }

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

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


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

-      
+

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


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

-// Forward declaration 
+// Forward declaration

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


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

-  
+

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


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

-      
+

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


@@ -1208,7 +1256,7 @@ wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
   expr->GetAttributeValue("menu", &listExpr);
   if (!listExpr)
     return (wxItemResource *) NULL;
   expr->GetAttributeValue("menu", &listExpr);
   if (!listExpr)
     return (wxItemResource *) NULL;

-  
+

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


@@ -1219,7 +1267,7 @@ wxItemResource *wxResourceInterpretMenu(wxResourceTable& table, wxExpr *expr)
   {
     menuResource->SetName(name);
   }
   {
     menuResource->SetName(name);
   }

-  
+

   return menuResource;
 }
 
   return menuResource;
 }
 


@@ -1233,7 +1281,7 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
   wxItemResource *resource = new wxItemResource;
   resource->SetType("wxMenu");
 //  resource->SetType(wxTYPE_MENU);
   wxItemResource *resource = new wxItemResource;
   resource->SetType("wxMenu");
 //  resource->SetType(wxTYPE_MENU);

-  
+

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


@@ -1247,7 +1295,7 @@ wxItemResource *wxResourceInterpretMenuBar(wxResourceTable& table, wxExpr *expr)
   {
     resource->SetName(name);
   }
   {
     resource->SetName(name);
   }

-  
+

   return resource;
 }
 
   return resource;
 }
 


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

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

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

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

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

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

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


@@ -1326,14 +1374,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;
 }
 


@@ -1362,7 +1410,7 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
   int weight = wxNORMAL;
   int underline = 0;
   wxString faceName("");
   int weight = wxNORMAL;
   int underline = 0;
   wxString faceName("");

-  
+

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


@@ -1397,6 +1445,9 @@ wxFont wxResourceInterpretFontSpec(wxExpr *expr)
   return font;
 }
 
   return font;
 }
 

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

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


@@ -1518,7 +1569,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;


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

- 
+

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

-    
+

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


@@ -1566,7 +1617,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)


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

-    
+

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


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

-    
+

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


@@ -1666,7 +1717,7 @@ bool wxResourceReadOneResource(FILE *fd, wxExprDatabase& db, bool *eof, wxResour
 /*
  * Parses string window style into integer window style
  */
 /*
  * Parses string window style into integer window style
  */

- 
+

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


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

-  
+

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

-  
+

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


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

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

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


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

-  
+

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


@@ -1990,16 +2043,16 @@ long wxParseWindowStyle(const wxString& bitListString)
  * Load a bitmap from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */
  * Load a bitmap from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */

- 
+

 wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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

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

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


@@ -2008,7 +2061,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;

-    
+

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


@@ -2102,7 +2155,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"
                          "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"
                          "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);

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

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


@@ -2118,7 +2171,7 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
         {
           wxLogWarning(_("Failed to find XPM resource %s.\n"
                          "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);
         {
           wxLogWarning(_("Failed to find XPM resource %s.\n"
                          "Forgot to use wxResourceLoadBitmapData?"), (const char*) name);

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

         }
         return wxBitmap(item->GetValue1());
 #else
         }
         return wxBitmap(item->GetValue1());
 #else


@@ -2145,12 +2198,12 @@ wxBitmap wxResourceCreateBitmap(const wxString& resource, wxResourceTable *table
  * Load an icon from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */
  * Load an icon from a wxWindows resource, choosing an optimum
  * depth and appropriate type.
  */

- 
+

 wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;
 wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
 {
   if (!table)
     table = wxDefaultResourceTable;

-  
+

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


@@ -2163,7 +2216,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;
     long thisNoColours = (long)pow(2.0, (double)thisDepth);
 
     wxItemResource *optResource = (wxItemResource *) NULL;

-    
+

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


@@ -2257,7 +2310,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"
                          "Forgot to use wxResourceLoadIconData?"), (const char*) name);
         {
           wxLogWarning(_("Failed to find XBM resource %s.\n"
                          "Forgot to use wxResourceLoadIconData?"), (const char*) name);

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

         }
         return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
 #else
         }
         return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
 #else


@@ -2301,7 +2354,7 @@ wxIcon wxResourceCreateIcon(const wxString& resource, wxResourceTable *table)
   else
   {
     wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);
   else
   {
     wxLogWarning(_("Icon resource specification %s not found."), (const char*) resource);

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

   }
 }
 
   }
 }
 


@@ -2333,7 +2386,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() != "") && (menuResource->GetType() == "wxMenu"))
   {
   wxItemResource *menuResource = table->FindResource(resource);
   if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))
   {


@@ -2357,7 +2410,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() != "") && (menuResource->GetType() == "wxMenu"))
 //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))
   wxItemResource *menuResource = table->FindResource(resource);
   if (menuResource && (menuResource->GetType() != "") && (menuResource->GetType() == "wxMenu"))
 //  if (menuResource && (menuResource->GetType() == wxTYPE_MENU))


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

-    
+

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


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

-    
+

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


@@ -2387,7 +2440,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);
 }
 


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

-    
+

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


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

-    
+

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


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

-    
+

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


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

-    
+

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


@@ -2585,7 +2638,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;


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

- 
+

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

-    
+

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


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

- 
+

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


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

-    
+

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


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

-    
+

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


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

-    
+

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

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

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


@@ -2774,11 +2827,11 @@ bool wxWindow::LoadFromResource(wxWindow *parent, const wxString& resourceName,
 {
   if (!table)
     table = wxDefaultResourceTable;
 {
   if (!table)
     table = wxDefaultResourceTable;

-    
+

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

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

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


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

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

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


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

-    
+

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


@@ -2867,4 +2920,7 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 
     #pragma warning(default:4706)   // assignment within conditional expression
 #endif // VC++
 

+#endif
+  // BC++/Win16
+

 #endif // wxUSE_WX_RESOURCES
 #endif // wxUSE_WX_RESOURCES