Applied #10639 (Not all previewed fonts are displayed with the correct nameface)

[wxWidgets.git] / src / osx / cocoa / filedlg.mm

diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index dfb81bc98dec7ce5c44a0f1f7744600479418030..33ece870253945a8d0389d5b6fdad8ce9562491f 100644 (file)
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -153,11 +153,11 @@ int wxFileDialog::ShowModal()
 
     m_path = wxEmptyString;
     m_fileNames.Clear();
 
     m_path = wxEmptyString;
     m_fileNames.Clear();

-    
+

     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;
     wxNonOwnedWindow* parentWindow = NULL;
     int returnCode = -1;

-    
-    if (GetParent()) 
+
+    if (GetParent())

     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }
     {
         parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
     }


@@ -176,33 +176,32 @@ int wxFileDialog::ShowModal()
         if ( HasFlag(wxFD_OVERWRITE_PROMPT) )
         {
         }
         if ( HasFlag(wxFD_OVERWRITE_PROMPT) )
         {
         }

-    
-        // avoid multiple event handlers on stack
-        if ( 0 /*parentWindow*/)
+
+/*
+        if (parentWindow)

         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();

-            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-            [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString() 
-                modalForWindow: nativeParent modalDelegate: sheetDelegate 
-                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+            [sPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
+                modalForWindow: nativeParent modalDelegate: sheetDelegate
+                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];
             [sheetDelegate release];
         }
         else
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];
             [sheetDelegate release];
         }
         else

+*/

         {
             returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         }
         {
             returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         }

-        
+

         if (returnCode == NSOKButton )
         {
             panel = sPanel;
             result = wxID_OK;
 
         if (returnCode == NSOKButton )
         {
             panel = sPanel;
             result = wxID_OK;
 

-            wxCFStringRef filename( [[sPanel filename] retain] );
-
-            m_path = filename.AsString();
+            m_path = wxCFStringRef::AsString([sPanel filename]);

             m_fileName = wxFileNameFromPath(m_path);
             m_dir = wxPathOnly( m_path );
         }
             m_fileName = wxFileNameFromPath(m_path);
             m_dir = wxPathOnly( m_path );
         }


@@ -217,23 +216,24 @@ int wxFileDialog::ShowModal()
         [oPanel setCanChooseFiles:YES];
         [oPanel setMessage:cf.AsNSString()];
 
         [oPanel setCanChooseFiles:YES];
         [oPanel setMessage:cf.AsNSString()];
 

-        // avoid multiple event handlers on stack
-        if ( 0 /*parentWindow*/)
+/*
+        if (parentWindow)

         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();

-            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
-            [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString() 
-                types: types modalForWindow: nativeParent 
-                modalDelegate: sheetDelegate 
-                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) 
+            ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
+            [oPanel beginSheetForDirectory:dir.AsNSString() file:file.AsNSString()
+                types: types modalForWindow: nativeParent
+                modalDelegate: sheetDelegate
+                didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)

                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];
             [sheetDelegate release];
         }
         else
                 contextInfo: nil];
             [sheetDelegate waitForSheetToFinish];
             returnCode = [sheetDelegate code];
             [sheetDelegate release];
         }
         else

+*/

         {
         {

-            returnCode = [oPanel runModalForDirectory:dir.AsNSString() 
+            returnCode = [oPanel runModalForDirectory:dir.AsNSString()

                         file:file.AsNSString() types:types];
         }
         if (returnCode == NSOKButton )
                         file:file.AsNSString() types:types];
         }
         if (returnCode == NSOKButton )


@@ -243,8 +243,7 @@ int wxFileDialog::ShowModal()
             NSArray* filenames = [oPanel filenames];
             for ( size_t i = 0 ; i < [filenames count] ; ++ i )
             {
             NSArray* filenames = [oPanel filenames];
             for ( size_t i = 0 ; i < [filenames count] ; ++ i )
             {

-                wxCFStringRef filename( [(NSString*) [filenames objectAtIndex:i] retain] );
-                wxString fnstr = filename.AsString();
+                wxString fnstr = wxCFStringRef::AsString([filenames objectAtIndex:i]);

                 m_paths.Add( fnstr );
                 m_fileNames.Add( wxFileNameFromPath(fnstr) );
                 if ( i == 0 )
                 m_paths.Add( fnstr );
                 m_fileNames.Add( wxFileNameFromPath(fnstr) );
                 if ( i == 0 )