Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fix & carbon support

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19015 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-01-29 15:21:58 +00:00
parent 233d603a09
commit ac9b5f9889
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mac/carbon/filedlg.cpp
View File

@@ -81,7 +81,9 @@ NavEventProc(
{ {
OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ; OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
if (inSelector == kNavCBEvent) { 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 fileDialog.GetPath();
return wxBuffer;
} }
else else
return wxGetEmptyString(); return wxGetEmptyString();
@@ -324,8 +325,7 @@ WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
if ( fileDialog.ShowModal() == wxID_OK ) if ( fileDialog.ShowModal() == wxID_OK )
{ {
*defaultFilterIndex = fileDialog.GetFilterIndex(); *defaultFilterIndex = fileDialog.GetFilterIndex();
strcpy(wxBuffer, (const char *)fileDialog.GetPath()); return fileDialog.GetPath();
return wxBuffer;
} }
else else
return wxGetEmptyString(); return wxGetEmptyString();
@@ -380,6 +380,15 @@ int wxFileDialog::ShowModal()
AEDesc mDefaultLocation ; AEDesc mDefaultLocation ;
bool mSelectDefault = false ; bool mSelectDefault = false ;
// zero all data
m_path = wxEmptyString ;
m_fileName = wxEmptyString ;
m_paths.Empty();
m_fileNames.Empty();
// setup dialog
::NavGetDefaultDialogOptions(&mNavOptions); ::NavGetDefaultDialogOptions(&mNavOptions);
mNavFilterUPP = nil; 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 ;
} }

18
src/mac/filedlg.cpp
View File

@@ -81,7 +81,9 @@ NavEventProc(
{ {
OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ; OpenUserDataRec * data = ( OpenUserDataRec *) ioUserData ;
if (inSelector == kNavCBEvent) { 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 fileDialog.GetPath();
return wxBuffer;
} }
else else
return wxGetEmptyString(); return wxGetEmptyString();
@@ -324,8 +325,7 @@ WXDLLEXPORT wxString wxFileSelectorEx(const char *title,
if ( fileDialog.ShowModal() == wxID_OK ) if ( fileDialog.ShowModal() == wxID_OK )
{ {
*defaultFilterIndex = fileDialog.GetFilterIndex(); *defaultFilterIndex = fileDialog.GetFilterIndex();
strcpy(wxBuffer, (const char *)fileDialog.GetPath()); return fileDialog.GetPath();
return wxBuffer;
} }
else else
return wxGetEmptyString(); return wxGetEmptyString();
@@ -380,6 +380,15 @@ int wxFileDialog::ShowModal()
AEDesc mDefaultLocation ; AEDesc mDefaultLocation ;
bool mSelectDefault = false ; bool mSelectDefault = false ;
// zero all data
m_path = wxEmptyString ;
m_fileName = wxEmptyString ;
m_paths.Empty();
m_fileNames.Empty();
// setup dialog
::NavGetDefaultDialogOptions(&mNavOptions); ::NavGetDefaultDialogOptions(&mNavOptions);
mNavFilterUPP = nil; 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 ;
} }