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 63cfce31b3e960e7ca6a4bb5dd9759e74c8f9fa5..cbff8918cfe78eeee6e44971a5434e74a1b0328b 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -93,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()
 {


@@ -1423,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
  */


@@ -1770,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 },
 


@@ -2893,4 +2898,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