Get the OS X Cocoa native combobox building by having the native code compile if...

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

diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index 83f341d0053015c5b08884f0ea8a09ca7d62cf66..727e9fe1a3e635273fc8fd0c1fd398104d441a18 100644 (file)
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -30,6 +30,7 @@
 #endif
 
 #include "wx/filename.h"
 #endif
 
 #include "wx/filename.h"

+#include "wx/tokenzr.h"

 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 


@@ -102,34 +103,38 @@ NSArray* GetTypesFromFilter( const wxString filter )
         const size_t extCount = extensions.GetCount();
         for ( size_t i = 0 ; i < extCount; i++ )
         {
         const size_t extCount = extensions.GetCount();
         for ( size_t i = 0 ; i < extCount; i++ )
         {

-            wxString extension = extensions[i];
-
-            // Remove leading '*'
-            if (extension.length() && (extension.GetChar(0) == '*'))
-                extension = extension.Mid( 1 );
-
-            // Remove leading '.'
-            if (extension.length() && (extension.GetChar(0) == '.'))
-                extension = extension.Mid( 1 );
-
-            if ( extension.IsEmpty() )
+            wxString extensiongroup = extensions[i];
+            wxStringTokenizer tokenizer( extensiongroup , wxT(";") ) ;
+            while ( tokenizer.HasMoreTokens() )

             {
             {

-                if ( types != nil )
-                    [types release];
-                return nil;
-            }
+                wxString extension = tokenizer.GetNextToken() ;
+                // Remove leading '*'
+                if (extension.length() && (extension.GetChar(0) == '*'))
+                    extension = extension.Mid( 1 );

 
 

+                // Remove leading '.'
+                if (extension.length() && (extension.GetChar(0) == '.'))
+                    extension = extension.Mid( 1 );
+
+                if ( extension.IsEmpty() )
+                {
+                    if ( types != nil )
+                        [types release];
+                    return nil;
+                }

 
 

-            if ( types == nil )
-                types = [[NSMutableArray alloc] init];
+                if ( types == nil )
+                    types = [[NSMutableArray alloc] init];

 
 

-            wxCFStringRef cfext(extension);
-            [types addObject: (NSString*)cfext.AsNSString()  ];
+                wxCFStringRef cfext(extension);
+                [types addObject: (NSString*)cfext.AsNSString()  ];

 #if 0
 #if 0

-            // add support for classic fileType / creator here
-            wxUint32 fileType, creator;
-            // extension -> mactypes
+                // add support for classic fileType / creator here
+                wxUint32 fileType, creator;
+                // extension -> mactypes

 #endif
 #endif

+            }
+

         }
     }
     return types;
         }
     }
     return types;


@@ -148,11 +153,12 @@ int wxFileDialog::ShowModal()
 
     m_path = wxEmptyString;
     m_fileNames.Clear();
 
     m_path = wxEmptyString;
     m_fileNames.Clear();

-    
+    m_paths.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()));
     }


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

-    
+
+/*

         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         if (parentWindow)
         {
             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 );
         }


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

+/*

         if (parentWindow)
         {
             NSWindow* nativeParent = parentWindow->GetWXWindow();
         if (parentWindow)
         {
             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 )


@@ -236,8 +244,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 )