X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..f2c2fa4d62b34608e21b04f8010149945aebda70:/src/common/resource.cpp diff --git a/src/common/resource.cpp b/src/common/resource.cpp index b3391f9ac7..22337514a1 100644 --- a/src/common/resource.cpp +++ b/src/common/resource.cpp @@ -119,10 +119,8 @@ void wxLogWarning(char *msg) wxMessageBox(msg, _("Warning"), wxOK); } -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxItemResource, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxResourceTable, wxHashTable) -#endif wxItemResource::wxItemResource() { @@ -214,7 +212,11 @@ bool wxResourceTable::ParseResourceFile(const wxString& filename) { wxExprDatabase db; +#ifdef __WXMAC__ + FILE *fd = fopen(wxUnix2MacFilename(filename.fn_str()), "r"); +#else FILE *fd = fopen(filename.fn_str(), "r"); +#endif if (!fd) return FALSE; bool eof = FALSE; @@ -2890,7 +2892,7 @@ bool wxWindowBase::LoadFromResource(wxWindow *parent, const wxString& resourceNa 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