Ticket #1111: atlas_wxwidgets_osx_v3.patch

atlas/AtlasUI/ArchiveViewer/ArchiveViewer.cpp

@@ -461 +461 @@
             wxString filename = wxString( utf16tow(file.filename).c_str() );
             int lastSlash = filename.Find(_T('\\'), true);
             if (lastSlash != -1)
-                dirs.insert(filename.Mid(0, lastSlash+1).wc_str());
+                dirs.insert( std::wstring(filename.Mid(0, lastSlash+1)) );
         }
 
         // Construct the directory tree:
@@ -587 +587 @@
         path = GetDefaultOpenDirectory();
     }
 
-    wxFileDialog dlg (this, _("Select archive file to open"), path, name, _("BAR files (*.bar)|*.bar|All files (*.*)|*.*"), wxOPEN);
+    wxFileDialog dlg (this, _("Select archive file to open"), path, name, _("BAR files (*.bar)|*.bar|All files (*.*)|*.*"), wxFD_OPEN);
 
     if (dlg.ShowModal() != wxID_OK)
         return;

atlas/AtlasUI/FileConverter/FileConverter.cpp

@@ -95 +95 @@
         extns += wxString(_T("|")) + _("All files") + _T(" (*.*)|*.*");
 
         wxFileDialog dlg (this, _("Select file(s) to convert"), defaultDir, _T(""),
-            extns, wxOPEN|/*wxFILE_MUST_EXIST|*/wxMULTIPLE); // for some reason, it complains that files don't exist when they actually do...
+            extns, wxFD_OPEN|/*wxFILE_MUST_EXIST|*/wxFD_MULTIPLE); // for some reason, it complains that files don't exist when they actually do...
         if (dlg.ShowModal() == wxID_OK)
         {
             wxArrayString files;