Include wx/combobox.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/cocoa/filedlg.mm b/src/cocoa/filedlg.mm
index 3df7bc908432c131f0081576f5579793c632a67b..42e88594d6f189282c7a8472b50bfb494cae229e 100644 (file)
--- a/src/cocoa/filedlg.mm
+++ b/src/cocoa/filedlg.mm
@@ -27,6 +27,7 @@
     #include "wx/filedlg.h"
     #include "wx/app.h"
 #endif
     #include "wx/filedlg.h"
     #include "wx/app.h"
 #endif

+

 #include "wx/filename.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/filename.h"
 
 #include "wx/cocoa/autorelease.h"


@@ -67,7 +68,7 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
 
     //If the user requests to save - use a NSSavePanel
     //else use a NSOpenPanel
 
     //If the user requests to save - use a NSSavePanel
     //else use a NSOpenPanel

-    if (m_dialogStyle & wxSAVE)
+    if (m_dialogStyle & wxFD_SAVE)

     {
         SetNSPanel([NSSavePanel savePanel]);
 
     {
         SetNSPanel([NSSavePanel savePanel]);
 


@@ -86,12 +87,12 @@ wxFileDialog::wxFileDialog(wxWindow *parent, const wxString& message,
         // dialogs are all that useful, anyway :)
         //
     }
         // dialogs are all that useful, anyway :)
         //
     }

-    else //m_dialogStyle & wxOPEN
+    else //m_dialogStyle & wxFD_OPEN

     {
         SetNSPanel([NSOpenPanel openPanel]);
         [m_cocoaNSWindow setTitle:wxNSStringWithWxString(message)];
 
     {
         SetNSPanel([NSOpenPanel openPanel]);
         [m_cocoaNSWindow setTitle:wxNSStringWithWxString(message)];
 

-        [(NSOpenPanel*)m_cocoaNSWindow setAllowsMultipleSelection:(m_dialogStyle & wxMULTIPLE)];
+        [(NSOpenPanel*)m_cocoaNSWindow setAllowsMultipleSelection:(m_dialogStyle & wxFD_MULTIPLE)];

         [(NSOpenPanel*)m_cocoaNSWindow setResolvesAliases:YES];
         [(NSOpenPanel*)m_cocoaNSWindow setCanChooseFiles:YES];
         [(NSOpenPanel*)m_cocoaNSWindow setCanChooseDirectories:NO];
         [(NSOpenPanel*)m_cocoaNSWindow setResolvesAliases:YES];
         [(NSOpenPanel*)m_cocoaNSWindow setCanChooseFiles:YES];
         [(NSOpenPanel*)m_cocoaNSWindow setCanChooseDirectories:NO];


@@ -194,7 +195,7 @@ int wxFileDialog::ShowModal()
 
     int nResult;
 
 
     int nResult;
 

-    if (m_dialogStyle & wxSAVE)
+    if (m_dialogStyle & wxFD_SAVE)

     {
         nResult = [GetNSSavePanel()
                     runModalForDirectory:wxNSStringWithWxString(m_dir)
     {
         nResult = [GetNSSavePanel()
                     runModalForDirectory:wxNSStringWithWxString(m_dir)


@@ -206,7 +207,7 @@ int wxFileDialog::ShowModal()
             m_path = m_fileNames[0];
         }
     }
             m_path = m_fileNames[0];
         }
     }

-    else //m_dialogStyle & wxOPEN
+    else //m_dialogStyle & wxFD_OPEN

     {
         nResult = [(NSOpenPanel*)m_cocoaNSWindow
                     runModalForDirectory:wxNSStringWithWxString(m_dir)
     {
         nResult = [(NSOpenPanel*)m_cocoaNSWindow
                     runModalForDirectory:wxNSStringWithWxString(m_dir)


@@ -228,4 +229,3 @@ int wxFileDialog::ShowModal()
 }
 
 #endif // wxUSE_FILEDLG
 }
 
 #endif // wxUSE_FILEDLG

-