Ticket #55115: patch-wxw-303.diff

lib-src/FileDialog/mac/FileDialogPrivate.h

@@ -96 +96 @@
     int m_firstFileTypeFilter;
     wxArrayString m_currentExtensions;
     WX_NSObject m_delegate;
+#if !wxCHECK_VERSION(3, 0, 3)
     WX_NSObject m_sheetDelegate;
+#endif
     wxString m_noOverwritePromptFilename;
 #endif
 

lib-src/FileDialog/mac/FileDialogPrivate.mm

@@ -141 +141 @@
 {
     m_filterIndex = -1;
     m_delegate = nil;
+#if !wxCHECK_VERSION(3, 0, 3)
     m_sheetDelegate = nil;
+#endif
     m_filterPanel = NULL;
     m_filterChoice = NULL;
 }
@@ -152 +154 @@
     long style, const wxPoint& pos, const wxSize& sz, const wxString& name)
 {
     FileDialogBase::Create(parent, message, defaultDir, defaultFileName, wildCard, style, pos, sz, name);
-
+#if !wxCHECK_VERSION(3, 0, 3)
     m_sheetDelegate = [[ModalDialogDelegate alloc] init];
     [(ModalDialogDelegate*)m_sheetDelegate setImplementation: this];
+#endif
 }
 
 FileDialog::~FileDialog()
 {
+#if !wxCHECK_VERSION(3, 0, 3)
     [m_sheetDelegate release];
+#endif
 }
 
 bool FileDialog::SupportsExtraControl() const
@@ -309 +314 @@
         [sPanel setAllowsOtherFileTypes:NO];
         
         NSWindow* nativeParent = parentWindow->GetWXWindow();
+#if wxCHECK_VERSION(3, 0, 3)
+        // the ModalDialogDelegate class is no longer exported, but the
+        // beginSheetForDirectory: message has been deprecated since 10.6 
+        // Use the modern equivalent:
+        [sPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() isDirectory:YES]];
+        [sPanel setNameFieldStringValue:file.AsNSString()];
+        [sPanel beginSheetModalForWindow:nativeParent completionHandler:^(NSInteger result) {
+            if (result == NSFileHandlingPanelOKButton) {
+                NSLog(@"Saved file %@", [sPanel URL]);
+            }
+        }];
+#else
         [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
-            modalForWindow: nativeParent modalDelegate: m_sheetDelegate
+            modalForWindow: nativeParent
+            modalDelegate: m_sheetDelegate
             didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
             contextInfo: nil];
+#endif
     }
-    else 
+    else
     {
         NSOpenPanel* oPanel = [NSOpenPanel openPanel];
         
@@ -328 +347 @@
         [oPanel setAllowsMultipleSelection: (HasFlag(wxFD_MULTIPLE) ? YES : NO )];
         
         NSWindow* nativeParent = parentWindow->GetWXWindow();
+#if wxCHECK_VERSION(3, 0, 3)
+        [oPanel setDirectoryURL:[NSURL fileURLWithPath:dir.AsNSString() isDirectory:YES]];
+        [oPanel setNameFieldStringValue:file.AsNSString()];
+        [oPanel setAllowedFileTypes:types];
+        [oPanel beginSheetModalForWindow:nativeParent completionHandler:^(NSInteger result) {
+            if (result == NSFileHandlingPanelOKButton) {
+                NSLog(@"Opened file(s) %@", [oPanel URLs]);
+            }
+        }];
+#else
         [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
             types: types modalForWindow: nativeParent
             modalDelegate: m_sheetDelegate
             didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
             contextInfo: nil];
+#endif
     }
 }