bug fix & carbon support

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/filedlg.cpp b/src/mac/carbon/filedlg.cpp
index 7e5ba852f4db08ab220876ca4fd358c474d0b130..66a0c2fc79bc49fbd256b50693134c189225e739 100644 (file)
--- a/src/mac/carbon/filedlg.cpp
+++ b/src/mac/carbon/filedlg.cpp
@@ -81,7 +81,9 @@ NavEventProc(
 {
        OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
        if (inSelector == kNavCBEvent) {        
 {
        OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
        if (inSelector == kNavCBEvent) {        

+#if !TARGET_CARBON

          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);

+#endif

        } 
        else if ( inSelector == kNavCBStart )
        {
        } 
        else if ( inSelector == kNavCBStart )
        {


@@ -300,8 +302,7 @@ wxString wxFileSelector(const char *title,
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
         return wxGetEmptyString();
     }
     else
         return wxGetEmptyString();


@@ -324,8 +325,7 @@ WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
         return wxGetEmptyString();
     }
     else
         return wxGetEmptyString();


@@ -380,6 +380,15 @@ int wxFileDialog::ShowModal()
     AEDesc                    mDefaultLocation ;
     bool                      mSelectDefault = false ;
                
     AEDesc                    mDefaultLocation ;
     bool                      mSelectDefault = false ;
                

+       // zero all data
+       
+       m_path = wxEmptyString ;
+       m_fileName = wxEmptyString ;
+       m_paths.Empty();
+       m_fileNames.Empty();
+
+       // setup dialog
+               

     ::NavGetDefaultDialogOptions(&mNavOptions);
        
     mNavFilterUPP      = nil;
     ::NavGetDefaultDialogOptions(&mNavOptions);
        
     mNavFilterUPP      = nil;


@@ -495,7 +504,6 @@ int wxFileDialog::ShowModal()
     }
                
     if ( (err != noErr) && (err != userCanceledErr) ) {
     }
                
     if ( (err != noErr) && (err != userCanceledErr) ) {

-        m_path = "" ;

         return wxID_CANCEL ;
     }
 
         return wxID_CANCEL ;
     }
 

diff --git a/src/mac/filedlg.cpp b/src/mac/filedlg.cpp
index 7e5ba852f4db08ab220876ca4fd358c474d0b130..66a0c2fc79bc49fbd256b50693134c189225e739 100644 (file)
--- a/src/mac/filedlg.cpp
+++ b/src/mac/filedlg.cpp
@@ -81,7 +81,9 @@ NavEventProc(
 {
        OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
        if (inSelector == kNavCBEvent) {        
 {
        OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
        if (inSelector == kNavCBEvent) {        

+#if !TARGET_CARBON

          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);
          wxTheApp->MacHandleOneEvent(ioParams->eventData.eventDataParms.event);

+#endif

        } 
        else if ( inSelector == kNavCBStart )
        {
        } 
        else if ( inSelector == kNavCBStart )
        {


@@ -300,8 +302,7 @@ wxString wxFileSelector(const char *title,
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {
 
     if ( fileDialog.ShowModal() == wxID_OK )
     {

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
         return wxGetEmptyString();
     }
     else
         return wxGetEmptyString();


@@ -324,8 +325,7 @@ WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();
     if ( fileDialog.ShowModal() == wxID_OK )
     {
         *defaultFilterIndex = fileDialog.GetFilterIndex();

-        strcpy(wxBuffer, (const char *)fileDialog.GetPath());
-        return wxBuffer;
+        return fileDialog.GetPath();

     }
     else
         return wxGetEmptyString();
     }
     else
         return wxGetEmptyString();


@@ -380,6 +380,15 @@ int wxFileDialog::ShowModal()
     AEDesc                    mDefaultLocation ;
     bool                      mSelectDefault = false ;
                
     AEDesc                    mDefaultLocation ;
     bool                      mSelectDefault = false ;
                

+       // zero all data
+       
+       m_path = wxEmptyString ;
+       m_fileName = wxEmptyString ;
+       m_paths.Empty();
+       m_fileNames.Empty();
+
+       // setup dialog
+               

     ::NavGetDefaultDialogOptions(&mNavOptions);
        
     mNavFilterUPP      = nil;
     ::NavGetDefaultDialogOptions(&mNavOptions);
        
     mNavFilterUPP      = nil;


@@ -495,7 +504,6 @@ int wxFileDialog::ShowModal()
     }
                
     if ( (err != noErr) && (err != userCanceledErr) ) {
     }
                
     if ( (err != noErr) && (err != userCanceledErr) ) {

-        m_path = "" ;

         return wxID_CANCEL ;
     }
 
         return wxID_CANCEL ;
     }