fixing multiple extensions in one filter, turning off temporarily sheets code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59710 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/osx/cocoa/filedlg.mm

@@ -30,6 +30,7 @@
 #endif
 
 #include "wx/filename.h"
+#include "wx/tokenzr.h"
 
 #include "wx/osx/private.h"
 
@@ -102,8 +103,11 @@ NSArray* GetTypesFromFilter( const wxString filter )
         const size_t extCount = extensions.GetCount();
         for ( size_t i = 0 ; i < extCount; i++ )
         {
-            wxString extension = extensions[i];
-
+            wxString extensiongroup = extensions[i];
+            wxStringTokenizer tokenizer( extensiongroup , wxT(";") ) ;
+            while ( tokenizer.HasMoreTokens() )
+            {
+                wxString extension = tokenizer.GetNextToken() ;
                 // Remove leading '*'
                 if (extension.length() && (extension.GetChar(0) == '*'))
                     extension = extension.Mid( 1 );
@@ -119,7 +123,6 @@ NSArray* GetTypesFromFilter( const wxString filter )
                     return nil;
                 }
 
-
                 if ( types == nil )
                     types = [[NSMutableArray alloc] init];
 
@@ -131,6 +134,8 @@ NSArray* GetTypesFromFilter( const wxString filter )
                 // extension -> mactypes
 #endif
             }
+
+        }
     }
     return types;
 }
@@ -172,7 +177,8 @@ int wxFileDialog::ShowModal()
         {
         }
     
-        if (parentWindow)
+        // avoid multiple event handlers on stack
+        if ( 0 /*parentWindow*/)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
             ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; 
@@ -211,7 +217,8 @@ int wxFileDialog::ShowModal()
         [oPanel setCanChooseFiles:YES];
         [oPanel setMessage:cf.AsNSString()];
 
-        if (parentWindow)
+        // avoid multiple event handlers on stack
+        if ( 0 /*parentWindow*/)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
             ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];