Added ability to switch off more components of the size page UI

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

diff --git a/src/cocoa/filedlg.mm b/src/cocoa/filedlg.mm
index 57a8a2fbaf90153760f3593cfdd21f5b873155a0..613f75bfeab2b521314ac61297a1ad60d902bee6 100644 (file)
--- a/src/cocoa/filedlg.mm
+++ b/src/cocoa/filedlg.mm
@@ -33,6 +33,7 @@
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"

+#include "wx/testing.h"

 
 #import <AppKit/NSOpenPanel.h>
 #import <AppKit/NSSavePanel.h>
 
 #import <AppKit/NSOpenPanel.h>
 #import <AppKit/NSSavePanel.h>


@@ -168,8 +169,8 @@ void wxFileDialog::GetPaths(wxArrayString& paths) const
     paths.Empty();
 
     wxString dir(m_dir);
     paths.Empty();
 
     wxString dir(m_dir);

-    if ( m_dir.Last() != _T('\\') )
-        dir += _T('\\');
+    if ( m_dir.Last() != wxT('\\') )
+        dir += wxT('\\');

 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )
 
     size_t count = m_fileNames.GetCount();
     for ( size_t n = 0; n < count; n++ )


@@ -189,13 +190,15 @@ void wxFileDialog::GetFilenames(wxArrayString& files) const
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;
 void wxFileDialog::SetPath(const wxString& path)
 {
     wxString ext;

-    wxSplitPath(path, &m_dir, &m_fileName, &ext);
+    wxFileName::SplitPath(path, &m_dir, &m_fileName, &ext);

     if ( !ext.empty() )
     if ( !ext.empty() )

-        m_fileName << _T('.') << ext;
+        m_fileName << wxT('.') << ext;

 }
 
 int wxFileDialog::ShowModal()
 {
 }
 
 int wxFileDialog::ShowModal()
 {

+    WX_TESTING_SHOW_MODAL_HOOK();
+

     wxAutoNSAutoreleasePool thePool;
 
     m_fileNames.Empty();
     wxAutoNSAutoreleasePool thePool;
 
     m_fileNames.Empty();