Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/cocoa/filedlg.mm b/src/osx/cocoa/filedlg.mm
index b4decc5dcd16a48ec2d467141ec57f5c90067b73..4d5aaad01fcae3e5b3352ea9241c3b9f5f224ed7 100644 (file)
--- a/src/osx/cocoa/filedlg.mm
+++ b/src/osx/cocoa/filedlg.mm
@@ -52,6 +52,11 @@ wxFileDialog::wxFileDialog(
 {
 }
 
 {
 }
 

+bool wxFileDialog::SupportsExtraControl() const
+{
+    return true;
+}
+

 NSArray* GetTypesFromFilter( const wxString filter )
 {
     NSMutableArray* types = nil;
 NSArray* GetTypesFromFilter( const wxString filter )
 {
     NSMutableArray* types = nil;


@@ -116,6 +121,10 @@ NSArray* GetTypesFromFilter( const wxString filter )
                 if (extension.length() && (extension.GetChar(0) == '.'))
                     extension = extension.Mid( 1 );
 
                 if (extension.length() && (extension.GetChar(0) == '.'))
                     extension = extension.Mid( 1 );
 

+                // Remove leading '*', this is for handling *.*
+                if (extension.length() && (extension.GetChar(0) == '*'))
+                    extension = extension.Mid( 1 );
+

                 if ( extension.IsEmpty() )
                 {
                     if ( types != nil )
                 if ( extension.IsEmpty() )
                 {
                     if ( types != nil )


@@ -158,6 +167,9 @@ void wxFileDialog::ShowWindowModal()
     if (HasFlag(wxFD_SAVE))
     {
         NSSavePanel* sPanel = [NSSavePanel savePanel];
     if (HasFlag(wxFD_SAVE))
     {
         NSSavePanel* sPanel = [NSSavePanel savePanel];

+
+        SetupExtraControls(sPanel);
+

         // makes things more convenient:
         [sPanel setCanCreateDirectories:YES];
         [sPanel setMessage:cf.AsNSString()];
         // makes things more convenient:
         [sPanel setCanCreateDirectories:YES];
         [sPanel setMessage:cf.AsNSString()];


@@ -178,6 +190,9 @@ void wxFileDialog::ShowWindowModal()
     {
         NSArray* types = GetTypesFromFilter( m_wildCard ) ;
         NSOpenPanel* oPanel = [NSOpenPanel openPanel];
     {
         NSArray* types = GetTypesFromFilter( m_wildCard ) ;
         NSOpenPanel* oPanel = [NSOpenPanel openPanel];

+        
+        SetupExtraControls(oPanel);
+

         [oPanel setTreatsFilePackagesAsDirectories:NO];
         [oPanel setCanChooseDirectories:NO];
         [oPanel setResolvesAliases:YES];
         [oPanel setTreatsFilePackagesAsDirectories:NO];
         [oPanel setCanChooseDirectories:NO];
         [oPanel setResolvesAliases:YES];


@@ -195,10 +210,31 @@ void wxFileDialog::ShowWindowModal()
     }
 }
 
     }
 }
 

-int wxFileDialog::ShowModal()
+void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)

 {
 {

-    NSSavePanel *panel = nil;
+    NSSavePanel* panel = (NSSavePanel*) nativeWindow;
+    
+    wxNonOwnedWindow::Create( GetParent(), nativeWindow );
+    
+    if (HasExtraControlCreator())
+    {
+        CreateExtraControl();
+        wxWindow* control = GetExtraControl();
+        if ( control )
+        {
+            NSView* accView = control->GetHandle();
+            [accView removeFromSuperview];
+            [panel setAccessoryView:accView];
+        }
+        else
+        {
+            [panel setAccessoryView:nil];
+        }
+    }
+}

 
 

+int wxFileDialog::ShowModal()
+{

     wxCFStringRef cf( m_message );
 
     wxCFStringRef dir( m_dir );
     wxCFStringRef cf( m_message );
 
     wxCFStringRef dir( m_dir );


@@ -221,6 +257,9 @@ int wxFileDialog::ShowModal()
     if (HasFlag(wxFD_SAVE))
     {
         NSSavePanel* sPanel = [NSSavePanel savePanel];
     if (HasFlag(wxFD_SAVE))
     {
         NSSavePanel* sPanel = [NSSavePanel savePanel];

+
+        SetupExtraControls(sPanel);
+

         // makes things more convenient:
         [sPanel setCanCreateDirectories:YES];
         [sPanel setMessage:cf.AsNSString()];
         // makes things more convenient:
         [sPanel setCanCreateDirectories:YES];
         [sPanel setMessage:cf.AsNSString()];


@@ -235,11 +274,16 @@ int wxFileDialog::ShowModal()
 
         returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         ModalFinishedCallback(sPanel, returnCode);
 
         returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
         ModalFinishedCallback(sPanel, returnCode);

+
+        [sPanel setAccessoryView:nil];

     }
     else
     {
         NSArray* types = GetTypesFromFilter( m_wildCard ) ;
         NSOpenPanel* oPanel = [NSOpenPanel openPanel];
     }
     else
     {
         NSArray* types = GetTypesFromFilter( m_wildCard ) ;
         NSOpenPanel* oPanel = [NSOpenPanel openPanel];

+        
+        SetupExtraControls(oPanel);
+                

         [oPanel setTreatsFilePackagesAsDirectories:NO];
         [oPanel setCanChooseDirectories:NO];
         [oPanel setResolvesAliases:YES];
         [oPanel setTreatsFilePackagesAsDirectories:NO];
         [oPanel setCanChooseDirectories:NO];
         [oPanel setResolvesAliases:YES];


@@ -251,6 +295,8 @@ int wxFileDialog::ShowModal()
 
         ModalFinishedCallback(oPanel, returnCode);
         
 
         ModalFinishedCallback(oPanel, returnCode);
         

+        [oPanel setAccessoryView:nil];
+        

         if ( types != nil )
             [types release];
     }
         if ( types != nil )
             [types release];
     }


@@ -299,6 +345,8 @@ void wxFileDialog::ModalFinishedCallback(void* panel, int returnCode)
     
     if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL)
         SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );
     
     if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL)
         SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED  );

+    
+    [(NSSavePanel*) panel setAccessoryView:nil];

 }
 
 #endif // wxUSE_FILEDLG
 }
 
 #endif // wxUSE_FILEDLG