added directories for Motif headers and libs under Solaris to the search path

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

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

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

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


@@ -36,6 +42,7 @@
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"
 #include "wx/listbox.h"
 #include "wx/choice.h"
 #include "wx/checkbox.h"

+#include "wx/settings.h"

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


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

-#if wxUSE_WX_RESOURCES
-

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


@@ -88,10 +93,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()
 {


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

- 
+

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


@@ -152,7 +157,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);


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

-    
+

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


@@ -374,10 +379,15 @@ wxControl *wxResourceTable::CreateItem(wxWindow *parent, const wxItemResource* c
       {
         control = new wxScrollBar(parent, id, pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());
       {
         control = new wxScrollBar(parent, id, pos, size,
            childResource->GetStyle(), wxDefaultValidator, childResource->GetName());

+/*

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

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

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


@@ -578,7 +588,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;


@@ -622,7 +632,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;


@@ -787,6 +797,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)))


@@ -842,6 +865,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)))


@@ -849,9 +885,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")
   {


@@ -959,26 +995,31 @@ wxItemResource *wxResourceInterpretControl(wxResourceTable& table, wxExpr *expr)
       }
       controlItem->SetStringValues(stringList);
      count ++;
       }
       controlItem->SetStringValues(stringList);
      count ++;

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

       // Check for wxSINGLE/wxMULTIPLE
       wxExpr *mult = (wxExpr *) NULL;
       // Check for wxSINGLE/wxMULTIPLE
       wxExpr *mult = (wxExpr *) NULL;

+/*

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

+*/

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

+/*

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

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

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

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

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

+*/
+       // Ignore the value

        count ++;
        count ++;

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

          count ++;
          count ++;

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

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


@@ -1018,7 +1059,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))


@@ -1091,7 +1132,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);
 
 /*


@@ -1101,7 +1142,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);


@@ -1155,7 +1196,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);


@@ -1193,7 +1234,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)


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

-  
+

   return menuResource;
 }
 
   return menuResource;
 }
 


@@ -1218,7 +1259,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)
   {


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

-  
+

   return resource;
 }
 
   return resource;
 }
 


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

-            
+

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


@@ -1311,14 +1352,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;
 }
 


@@ -1347,7 +1388,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);


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

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

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


@@ -1503,7 +1547,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;


@@ -1518,12 +1562,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))
   {


@@ -1551,7 +1595,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)


@@ -1594,7 +1638,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))
   {


@@ -1610,7 +1654,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))
   {


@@ -1651,7 +1695,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


@@ -1707,13 +1751,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 },


@@ -1729,6 +1773,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 },
 


@@ -1800,7 +1846,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},


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

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

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


@@ -1974,12 +2021,12 @@ 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)
   {


@@ -1992,7 +2039,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)


@@ -2086,7 +2133,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


@@ -2102,7 +2149,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


@@ -2129,12 +2176,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)
   {


@@ -2147,7 +2194,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)


@@ -2241,9 +2288,9 @@ 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((char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());
+        return wxIcon((const char **)item->GetValue1(), (int)item->GetValue2(), (int)item->GetValue3());

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


@@ -2285,7 +2332,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;

   }
 }
 
   }
 }
 


@@ -2317,7 +2364,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"))
   {


@@ -2341,7 +2388,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))


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

-    
+

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


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

-    
+

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


@@ -2371,7 +2418,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);
 }
 


@@ -2399,7 +2446,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;
 }


@@ -2408,7 +2455,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);
 }
 


@@ -2420,7 +2467,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)
   {


@@ -2474,7 +2521,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();


@@ -2569,7 +2616,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;


@@ -2584,12 +2631,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))
   {


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

- 
+

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


@@ -2664,7 +2711,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))
   {


@@ -2680,7 +2727,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))
   {


@@ -2722,11 +2769,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);


@@ -2758,7 +2805,7 @@ 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))
   if (!resource || !resource->GetType() ||
   wxItemResource *resource = table->FindResource((const char *)resourceName);
 //  if (!resource || (resource->GetType() != wxTYPE_DIALOG_BOX))
   if (!resource || !resource->GetType() ||


@@ -2811,7 +2858,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));


@@ -2832,7 +2879,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();


@@ -2847,4 +2894,11 @@ wxControl *wxWindow::CreateItem(const wxItemResource *resource, const wxItemReso
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 
   return table->CreateItem((wxWindow *)this, resource, parentResource);
 }
 

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

 #endif // wxUSE_WX_RESOURCES
 #endif // wxUSE_WX_RESOURCES