fix wxDataObjectComposite::GetFormatCount and add some comments to explain the reason...

[wxWidgets.git] / src / osx / carbon / dirdlg.cpp

diff --git a/src/osx/carbon/dirdlg.cpp b/src/osx/carbon/dirdlg.cpp
index 5caa7f6b4bb218fc37308e82dfdbe19e22f721e5..157e07845d3dd2340de948527264266d3cf6d47e 100644 (file)
--- a/src/osx/carbon/dirdlg.cpp
+++ b/src/osx/carbon/dirdlg.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        src/mac/carbon/dirdlg.cpp
+// Name:        src/osx/carbon/dirdlg.cpp

 // Purpose:     wxDirDialog
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxDirDialog
 // Author:      Stefan Csomor
 // Modified by:


@@ -11,7 +11,7 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#if wxUSE_DIRDLG
+#if wxUSE_DIRDLG && !defined(__WXUNIVERSAL__)

 
 #include "wx/dirdlg.h"
 
 
 #include "wx/dirdlg.h"
 


@@ -23,13 +23,7 @@
 
 #include "wx/filename.h"
 
 
 #include "wx/filename.h"
 

-#include "wx/mac/private.h"
-
-#ifdef __DARWIN__
-    #include <Carbon/Carbon.h>
-#else
-    #include <Navigation.h>
-#endif
+#include "wx/osx/private.h"

 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
 
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 


@@ -64,15 +58,17 @@ static pascal void NavEventProc(
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,
 wxDirDialog::wxDirDialog(wxWindow *parent,
                          const wxString& message,
                          const wxString& defaultPath,

-                         long WXUNUSED(style),
+                         long style,

                          const wxPoint& WXUNUSED(pos),
                          const wxSize& WXUNUSED(size),
                          const wxString& WXUNUSED(name))
 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
                          const wxPoint& WXUNUSED(pos),
                          const wxSize& WXUNUSED(size),
                          const wxString& WXUNUSED(name))
 {
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;

-    m_message = message;

     m_parent = parent;
     m_parent = parent;

-    m_path = defaultPath;
+
+    SetMessage( message );
+    SetWindowStyle(style);
+    SetPath(defaultPath);

 }
 
 int wxDirDialog::ShowModal()
 }
 
 int wxDirDialog::ShowModal()