implement propert background style semantics for OS X

[wxWidgets.git] / utils / wxrc / wxrc.cpp

diff --git a/utils/wxrc/wxrc.cpp b/utils/wxrc/wxrc.cpp
index fef806dec4516408526bfb93e25d5d81dca59d6c..0080c4e75ff13256f366dcbb1aedd33e0d5cff55 100644 (file)
--- a/utils/wxrc/wxrc.cpp
+++ b/utils/wxrc/wxrc.cpp
@@ -120,9 +120,10 @@ public:
             name == _T("notebookpage") ||
             name == _T("separator") ||
             name == _T("sizeritem") ||
+            name == _T("wxMenu") ||
             name == _T("wxMenuBar") ||
             name == _T("wxMenuItem") ||
-            name == _T("wxStaticBoxSizer") )
+            name.EndsWith(_T("Sizer")) )
         {
             return false;
         }
@@ -273,7 +274,7 @@ int XmlResApp::OnRun()
               wxCMD_LINE_VAL_STRING,
               wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_OPTION_MANDATORY },
 
-        wxCMD_LINE_DESC_END 
+        wxCMD_LINE_DESC_END
     };
 
     wxCmdLineParser parser(cmdLineDesc, argc, argv);
@@ -416,7 +417,7 @@ wxArrayString XmlResApp::PrepareTempFiles()
         }
 
         wxString name, ext, path;
-        wxSplitPath(parFiles[i], &path, &name, &ext);
+        wxFileName::SplitPath(parFiles[i], &path, &name, &ext);
 
         FindFilesInXML(doc.GetRoot(), flist, path);
         if (flagH)
@@ -581,7 +582,7 @@ static wxString FileToCppArray(wxString filename, int num)
     wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
 
     const size_t lng = wx_truncate_cast(size_t, offset);
-    wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset,
+    wxASSERT_MSG( static_cast<wxFileOffset>(lng) == offset,
                   wxT("Huge file not supported") );
 
     snum.Printf(_T("%i"), num);
@@ -735,7 +736,7 @@ static wxString FileToPythonArray(wxString filename, int num)
     wxASSERT_MSG( offset >= 0 , wxT("Invalid file length") );
 
     const size_t lng = wx_truncate_cast(size_t, offset);
-    wxASSERT_MSG( wx_static_cast(wxFileOffset, lng) == offset,
+    wxASSERT_MSG( static_cast<wxFileOffset>(lng) == offset,
                   wxT("Huge file not supported") );
 
     snum.Printf(_T("%i"), num);