test for timegm() added

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

diff --git a/src/common/resource.cpp b/src/common/resource.cpp
index b3391f9ac76ebe3fbe2a9669b04690364212a372..e070a680b4e8514dcd9ba0be1c96aefab3967cf9 100644 (file)
--- a/src/common/resource.cpp
+++ b/src/common/resource.cpp
@@ -214,7 +214,11 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename)
 {
   wxExprDatabase db;
 
 {
   wxExprDatabase db;
 

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

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

+#endif

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


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

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

       return FALSE;
   }
   else
       return FALSE;
   }
   else