Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

support for file types in save panel

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66901 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2011-02-16 07:38:48 +00:00
parent fd5907ffd9
commit 5411e35f7b
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/osx/cocoa/filedlg.mm
View File

@@ -164,6 +164,7 @@ void wxFileDialog::ShowWindowModal()
wxASSERT_MSG(parentWindow, "Window modal display requires parent."); wxASSERT_MSG(parentWindow, "Window modal display requires parent.");
NSArray* types = CopyTypesFromFilter( m_wildCard ) ;
if (HasFlag(wxFD_SAVE)) if (HasFlag(wxFD_SAVE))
{ {
NSSavePanel* sPanel = [NSSavePanel savePanel]; NSSavePanel* sPanel = [NSSavePanel savePanel];
@@ -177,6 +178,8 @@ void wxFileDialog::ShowWindowModal()
// be able to pass this in // be able to pass this in
[sPanel setTreatsFilePackagesAsDirectories:NO]; [sPanel setTreatsFilePackagesAsDirectories:NO];
[sPanel setCanSelectHiddenExtension:YES]; [sPanel setCanSelectHiddenExtension:YES];
[sPanel setAllowedFileTypes:types];
[sPanel setAllowsOtherFileTypes:NO];
NSWindow* nativeParent = parentWindow->GetWXWindow(); NSWindow* nativeParent = parentWindow->GetWXWindow();
ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init]; ModalDialogDelegate* sheetDelegate = [[ModalDialogDelegate alloc] init];
@@ -188,7 +191,6 @@ void wxFileDialog::ShowWindowModal()
} }
else else
{ {
NSArray* types = CopyTypesFromFilter( m_wildCard ) ;
NSOpenPanel* oPanel = [NSOpenPanel openPanel]; NSOpenPanel* oPanel = [NSOpenPanel openPanel];
SetupExtraControls(oPanel); SetupExtraControls(oPanel);
@@ -209,9 +211,9 @@ void wxFileDialog::ShowWindowModal()
modalDelegate: sheetDelegate modalDelegate: sheetDelegate
didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:) didEndSelector: @selector(sheetDidEnd:returnCode:contextInfo:)
contextInfo: nil]; contextInfo: nil];
[types release];
types = nil;
} }
[types release];
types = nil;
} }
void wxFileDialog::SetupExtraControls(WXWindow nativeWindow) void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
@@ -258,6 +260,7 @@ int wxFileDialog::ShowModal()
parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent())); parentWindow = dynamic_cast<wxNonOwnedWindow*>(wxGetTopLevelParent(GetParent()));
} }
NSArray* types = CopyTypesFromFilter( m_wildCard ) ;
if (HasFlag(wxFD_SAVE)) if (HasFlag(wxFD_SAVE))
{ {
NSSavePanel* sPanel = [NSSavePanel savePanel]; NSSavePanel* sPanel = [NSSavePanel savePanel];
@@ -271,6 +274,8 @@ int wxFileDialog::ShowModal()
// be able to pass this in // be able to pass this in
[sPanel setTreatsFilePackagesAsDirectories:NO]; [sPanel setTreatsFilePackagesAsDirectories:NO];
[sPanel setCanSelectHiddenExtension:YES]; [sPanel setCanSelectHiddenExtension:YES];
[sPanel setAllowedFileTypes:types];
[sPanel setAllowsOtherFileTypes:NO];
if ( HasFlag(wxFD_OVERWRITE_PROMPT) ) if ( HasFlag(wxFD_OVERWRITE_PROMPT) )
{ {
@@ -284,7 +289,6 @@ int wxFileDialog::ShowModal()
} }
else else
{ {
NSArray* types = CopyTypesFromFilter( m_wildCard ) ;
NSOpenPanel* oPanel = [NSOpenPanel openPanel]; NSOpenPanel* oPanel = [NSOpenPanel openPanel];
SetupExtraControls(oPanel); SetupExtraControls(oPanel);
@@ -305,9 +309,9 @@ int wxFileDialog::ShowModal()
UnsubclassWin(); UnsubclassWin();
[oPanel setAccessoryView:nil]; [oPanel setAccessoryView:nil];
[types release];
types = nil;
} }
[types release];
types = nil;
return GetReturnCode(); return GetReturnCode();
} }