X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/681bf55c1c269d4abeca97ea4a1777718aa7fa63..5ecd98f17596ce1593741fb379e1ef813de41fcc:/include/wx/osx/dirdlg.h

diff --git a/include/wx/osx/dirdlg.h b/include/wx/osx/dirdlg.h
index 882b9beaab..f355f604e8 100644
--- a/include/wx/osx/dirdlg.h
+++ b/include/wx/osx/dirdlg.h
@@ -4,7 +4,6 @@
 // Author:      Stefan Csomor
 // Modified by:
 // Created:     1998-01-01
-// RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -12,10 +11,29 @@
 #ifndef _WX_DIRDLG_H_
 #define _WX_DIRDLG_H_
 
+#if wxOSX_USE_COCOA
+    DECLARE_WXCOCOA_OBJC_CLASS(NSOpenPanel);
+#endif
+
 class WXDLLIMPEXP_CORE wxDirDialog : public wxDirDialogBase
 {
 public:
+    wxDirDialog() { Init(); }
+
     wxDirDialog(wxWindow *parent,
+                const wxString& message = wxDirSelectorPromptStr,
+                const wxString& defaultPath = wxT(""),
+                long style = wxDD_DEFAULT_STYLE,
+                const wxPoint& pos = wxDefaultPosition,
+                const wxSize& size = wxDefaultSize,
+                const wxString& name = wxDirDialogNameStr)
+    {
+        Init();
+
+        Create(parent,message,defaultPath,style,pos,size,name);
+    }
+
+    void Create(wxWindow *parent,
                 const wxString& message = wxDirSelectorPromptStr,
                 const wxString& defaultPath = wxT(""),
                 long style = wxDD_DEFAULT_STYLE,
@@ -34,14 +52,19 @@ public:
     virtual void ModalFinishedCallback(void* panel, int returnCode);
 #endif
 
-protected:
-
-    DECLARE_DYNAMIC_CLASS(wxDirDialog)
-
+private:
 #if wxOSX_USE_COCOA
+    // Create and initialize NSOpenPanel that we use in both ShowModal() and
+    // ShowWindowModal().
+    WX_NSOpenPanel OSXCreatePanel() const;
+
     WX_NSObject m_sheetDelegate;
 #endif
+
+    // Common part of all ctors.
+    void Init();
+
+    DECLARE_DYNAMIC_CLASS(wxDirDialog)
 };
 
-#endif
-    // _WX_DIRDLG_H_
+#endif // _WX_DIRDLG_H_