missing commit

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

diff --git a/src/cocoa/dirdlg.mm b/src/cocoa/dirdlg.mm
index e434dc60edcaa1a0df758eb408ab87769c783cdc..2f2ce30012084ad87bda26c4663926c7dd8ca649 100644 (file)
--- a/src/cocoa/dirdlg.mm
+++ b/src/cocoa/dirdlg.mm
@@ -22,14 +22,16 @@
 
 #if wxUSE_DIRDLG
 
+#include "wx/dirdlg.h"
+
 #ifndef WX_PRECOMP
     #include "wx/msgdlg.h"
     #include "wx/filedlg.h"
-    #include "wx/dirdlg.h"
     #include "wx/app.h"
 #endif
 
 #include "wx/filename.h"
+#include "wx/modalhook.h"
 
 #include "wx/cocoa/autorelease.h"
 #include "wx/cocoa/string.h"
@@ -55,7 +57,8 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
     wxTopLevelWindows.Append(this);
 
     m_message = message;
-    m_dialogStyle = style;
+
+    SetWindowStyle(style);
     m_parent = parent;
     m_path = defaultPath;
 
@@ -69,7 +72,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
 
     //If the user requests to save - use a NSSavePanel
     //else use a NSOpenPanel
-    if (m_dialogStyle & wxFD_SAVE)
+    if (HasFlag(wxFD_SAVE))
     {
         SetNSPanel([NSSavePanel savePanel]);
 
@@ -90,7 +93,7 @@ wxDirDialog::wxDirDialog(wxWindow *parent, const wxString& message,
         [GetNSSavePanel() setPrompt:@"Open"];
     }
 
-    if (m_dialogStyle & wxDD_NEW_DIR_BUTTON) //m_dialogStyle & wxDD_NEW_DIR_BUTTON
+    if (HasFlag(wxDD_NEW_DIR_BUTTON)) //m_dialogStyle & wxDD_NEW_DIR_BUTTON
     {
         [(NSOpenPanel*)m_cocoaNSWindow setCanCreateDirectories:YES];
     }
@@ -102,13 +105,15 @@ wxDirDialog::~wxDirDialog()
 
 int wxDirDialog::ShowModal()
 {
+    WX_HOOK_MODAL_DIALOG();
+
     wxAutoNSAutoreleasePool thePool;
 
     m_fileNames.Empty();
 
     int nResult;
 
-    if (m_dialogStyle & wxFD_SAVE)
+    if (HasFlag(wxFD_SAVE))
     {
         nResult = [GetNSSavePanel()
                     runModalForDirectory:wxNSStringWithWxString(m_dir)