Correct format specifiers used to show wxIPV4address.

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

diff --git a/src/osx/carbon/dirdlg.cpp b/src/osx/carbon/dirdlg.cpp
index 6fc40059c7cc26e60d662efca1a3d2139430bb46..c8a97726f1a54ca3902d418c13ac0f14196f5c02 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"
 


@@ -25,12 +25,6 @@
 
 #include "wx/osx/private.h"
 
 
 #include "wx/osx/private.h"
 

-#ifdef __DARWIN__
-    #include <Carbon/Carbon.h>
-#else
-    #include <Navigation.h>
-#endif
-

 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
 static pascal void NavEventProc(
 IMPLEMENT_CLASS(wxDirDialog, wxDialog)
 
 static pascal void NavEventProc(


@@ -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()


@@ -92,7 +88,9 @@ int wxDirDialog::ShowModal()
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
         if (err == noErr)
         {
         err = NavCreateChooseFolderDialog(&options, sStandardNavEventFilter , NULL,  this , &dialog);
         if (err == noErr)
         {

+            wxDialog::OSXBeginModalDialog();

             err = NavDialogRun(dialog);
             err = NavDialogRun(dialog);

+            wxDialog::OSXEndModalDialog();

             if ( err == noErr )
             {
                 err = NavDialogGetReply(dialog, &reply);
             if ( err == noErr )
             {
                 err = NavDialogGetReply(dialog, &reply);


@@ -136,8 +134,8 @@ int wxDirDialog::ShowModal()
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
 
     if ( err != noErr && err != userCanceledErr )
         m_path = wxEmptyString ;
 

-       if ( dialog )
-       ::NavDialogDispose(dialog);
+    if ( dialog )
+        ::NavDialogDispose(dialog);

 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }
 
     return (err == noErr) ? wxID_OK : wxID_CANCEL ;
 }