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

streamlining code for extra controls

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64027 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-04-18 13:17:16 +00:00
parent d67e4ac4c2
commit 2f30930a09
3 changed files with 62 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ wxFileDialog::wxFileDialog(
bool wxFileDialog::SupportsExtraControl() const
{
return false;
return true;
}
NSArray* GetTypesFromFilter( const wxString filter )
@@ -167,6 +167,9 @@ void wxFileDialog::ShowWindowModal()
if (HasFlag(wxFD_SAVE))
{
NSSavePanel* sPanel = [NSSavePanel savePanel];
SetupExtraControls(sPanel);
// makes things more convenient:
[sPanel setCanCreateDirectories:YES];
[sPanel setMessage:cf.AsNSString()];
@@ -187,6 +190,9 @@ void wxFileDialog::ShowWindowModal()
{
NSArray* types = GetTypesFromFilter( m_wildCard ) ;
NSOpenPanel* oPanel = [NSOpenPanel openPanel];
SetupExtraControls(oPanel);
[oPanel setTreatsFilePackagesAsDirectories:NO];
[oPanel setCanChooseDirectories:NO];
[oPanel setResolvesAliases:YES];
@@ -204,10 +210,31 @@ void wxFileDialog::ShowWindowModal()
}
}
void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
{
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()
{
NSSavePanel *panel = nil;
wxCFStringRef cf( m_message );
wxCFStringRef dir( m_dir );
@@ -230,6 +257,9 @@ int wxFileDialog::ShowModal()
if (HasFlag(wxFD_SAVE))
{
NSSavePanel* sPanel = [NSSavePanel savePanel];
SetupExtraControls(sPanel);
// makes things more convenient:
[sPanel setCanCreateDirectories:YES];
[sPanel setMessage:cf.AsNSString()];
@@ -244,11 +274,16 @@ int wxFileDialog::ShowModal()
returnCode = [sPanel runModalForDirectory:dir.AsNSString() file:file.AsNSString() ];
ModalFinishedCallback(sPanel, returnCode);
[sPanel setAccessoryView:nil];
}
else
{
NSArray* types = GetTypesFromFilter( m_wildCard ) ;
NSOpenPanel* oPanel = [NSOpenPanel openPanel];
SetupExtraControls(oPanel);
[oPanel setTreatsFilePackagesAsDirectories:NO];
[oPanel setCanChooseDirectories:NO];
[oPanel setResolvesAliases:YES];
@@ -260,6 +295,8 @@ int wxFileDialog::ShowModal()
ModalFinishedCallback(oPanel, returnCode);
[oPanel setAccessoryView:nil];
if ( types != nil )
[types release];
}
@@ -308,6 +345,8 @@ void wxFileDialog::ModalFinishedCallback(void* panel, int returnCode)
if (GetModality() == wxDIALOG_MODALITY_WINDOW_MODAL)
SendWindowModalDialogEvent ( wxEVT_WINDOW_MODAL_DIALOG_CLOSED );
[(NSSavePanel*) panel setAccessoryView:nil];
}
#endif // wxUSE_FILEDLG