Update version to 2.9.4 in version.bkl too and rebake everything.

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

diff --git a/src/osx/carbon/filedlg.cpp b/src/osx/carbon/filedlg.cpp
index 9af70922a44385df51decf31bc2e3956b090d274..9592010d29a745d114973d963cbf30ef7a4d8a8b 100644 (file)
--- a/src/osx/carbon/filedlg.cpp
+++ b/src/osx/carbon/filedlg.cpp
@@ -44,14 +44,14 @@ class OpenUserDataRec
 {
 public:
     OpenUserDataRec( wxFileDialog* dialog );
 {
 public:
     OpenUserDataRec( wxFileDialog* dialog );

-    
+

     bool FilterCallback( AEDesc *theItem, void *info, NavFilterModes filterMode );
     void EventProc( NavEventCallbackMessage inSelector, NavCBRecPtr ioParams );
 
     bool FilterCallback( AEDesc *theItem, void *info, NavFilterModes filterMode );
     void EventProc( NavEventCallbackMessage inSelector, NavCBRecPtr ioParams );
 

-    int GetCurrentFilter() const {return currentfilter;}
-    CFArrayRef GetMenuItems() const { return menuitems;}
-    
-     
+    int GetCurrentFilter() const {return m_currentfilter;}
+    CFArrayRef GetMenuItems() const { return m_menuitems;}
+
+

 private:
     void EventProcCBEvent( NavCBRecPtr ioParams );
     void EventProcCBEventMouseDown( NavCBRecPtr ioParams);
 private:
     void EventProcCBEvent( NavCBRecPtr ioParams );
     void EventProcCBEventMouseDown( NavCBRecPtr ioParams);


@@ -61,39 +61,43 @@ private:
     void EventProcCBAdjustRect( NavCBRecPtr ioParams );
     bool CheckFile( const wxString &filename , OSType type);
     void MakeUserDataRec( const wxString& filter);
     void EventProcCBAdjustRect( NavCBRecPtr ioParams );
     bool CheckFile( const wxString &filename , OSType type);
     void MakeUserDataRec( const wxString& filter);

-    
-    wxFileDialog*      dialog;
-    int                currentfilter ;
-    wxString           defaultLocation;
-    wxArrayString      extensions ;
-    wxArrayLong        filtermactypes ;
-    CFMutableArrayRef         menuitems ;
-    wxArrayString      name ;
-    bool               saveMode ;
+
+    wxFileDialog*       m_dialog;
+    int                 m_currentfilter;
+    wxString            m_defaultLocation;
+    wxArrayString       m_extensions;
+    wxArrayLong         m_filtermactypes;
+    CFMutableArrayRef   m_menuitems;
+    wxArrayString       m_name;
+    bool                m_saveMode;
+    SInt16              m_lastRight;
+    SInt16              m_lastBottom;
+    bool                m_controlAdded;

 };
 
 OpenUserDataRec::OpenUserDataRec( wxFileDialog* d)
 {
 };
 
 OpenUserDataRec::OpenUserDataRec( wxFileDialog* d)
 {

-    dialog = d;
-    saveMode = dialog->HasFdFlag(wxFD_SAVE);
-    
-    defaultLocation = dialog->GetDirectory();
-    MakeUserDataRec(dialog->GetWildcard());
-    currentfilter = dialog->GetFilterIndex();
-    
-    menuitems = NULL;
-    
-    size_t numFilters = extensions.GetCount();
+    m_dialog = d;
+    m_controlAdded = false;
+    m_saveMode = m_dialog->HasFdFlag(wxFD_SAVE);
+
+    m_defaultLocation = m_dialog->GetDirectory();
+    MakeUserDataRec(m_dialog->GetWildcard());
+    m_currentfilter = m_dialog->GetFilterIndex();
+
+    m_menuitems = NULL;
+
+    size_t numFilters = m_extensions.GetCount();

     if (numFilters)
     {
     if (numFilters)
     {

-        menuitems = CFArrayCreateMutable( kCFAllocatorDefault ,
+        m_menuitems = CFArrayCreateMutable( kCFAllocatorDefault ,

                                          numFilters , &kCFTypeArrayCallBacks ) ;
         for ( size_t i = 0 ; i < numFilters ; ++i )
         {
                                          numFilters , &kCFTypeArrayCallBacks ) ;
         for ( size_t i = 0 ; i < numFilters ; ++i )
         {

-            CFArrayAppendValue( menuitems , (CFStringRef) wxCFStringRef( name[i] ) ) ;
+            CFArrayAppendValue( m_menuitems , (CFStringRef) wxCFStringRef( m_name[i] ) ) ;

         }
     }
         }
     }

-    
+    m_lastRight = m_lastBottom = 0;

 }
 
 void OpenUserDataRec::EventProc(NavEventCallbackMessage inSelector,NavCBRecPtr ioParams)
 }
 
 void OpenUserDataRec::EventProc(NavEventCallbackMessage inSelector,NavCBRecPtr ioParams)


@@ -129,24 +133,26 @@ void OpenUserDataRec::EventProcCBEvent(NavCBRecPtr callBackParms)
             EventProcCBEventMouseDown(callBackParms);
             break;
         }
             EventProcCBEventMouseDown(callBackParms);
             break;
         }

-    }            
+    }

 }
 
 void OpenUserDataRec::EventProcCBEventMouseDown(NavCBRecPtr callBackParms)
 {
     EventRecord *evt = callBackParms->eventData.eventDataParms.event;
     Point where = evt->where;
 }
 
 void OpenUserDataRec::EventProcCBEventMouseDown(NavCBRecPtr callBackParms)
 {
     EventRecord *evt = callBackParms->eventData.eventDataParms.event;
     Point where = evt->where;

-    GlobalToLocal(&where);
-    
+    QDGlobalToLocalPoint(GetWindowPort(callBackParms->window), &where);
+

     ControlRef whichControl = FindControlUnderMouse(where, callBackParms->window, NULL);
     if (whichControl != NULL)
     {
         ControlKind theKind;
         GetControlKind(whichControl, &theKind);
     ControlRef whichControl = FindControlUnderMouse(where, callBackParms->window, NULL);
     if (whichControl != NULL)
     {
         ControlKind theKind;
         GetControlKind(whichControl, &theKind);

-        
-        // Moving the focus if we clicked in an editable text control
-        // In this sample, we only have a Clock and an Unicode Edit controls
-        if ((theKind.kind == kControlKindEditUnicodeText) || (theKind.kind == kControlKindClock))
+
+        // Moving the focus if we clicked in an focusable control
+        if ((theKind.kind == kControlKindEditUnicodeText) ||
+            (theKind.kind == kControlKindEditText) ||
+            (theKind.kind == kControlKindDataBrowser) ||
+            (theKind.kind == kControlKindListBox))

         {
             ControlRef currentlyFocusedControl;
             GetKeyboardFocus(callBackParms->window, &currentlyFocusedControl);
         {
             ControlRef currentlyFocusedControl;
             GetKeyboardFocus(callBackParms->window, &currentlyFocusedControl);


@@ -159,55 +165,56 @@ void OpenUserDataRec::EventProcCBEventMouseDown(NavCBRecPtr callBackParms)
 
 void OpenUserDataRec::EventProcCBStart(NavCBRecPtr ioParams)
 {
 
 void OpenUserDataRec::EventProcCBStart(NavCBRecPtr ioParams)
 {

-    if (!defaultLocation.empty())
+    if (!m_defaultLocation.empty())

     {
         // Set default location for the modern Navigation APIs
         // Apple Technical Q&A 1151
         FSRef theFile;
     {
         // Set default location for the modern Navigation APIs
         // Apple Technical Q&A 1151
         FSRef theFile;

-        wxMacPathToFSRef(defaultLocation, &theFile);
+        wxMacPathToFSRef(m_defaultLocation, &theFile);

         AEDesc theLocation = { typeNull, NULL };
         if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
             ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
     }
         AEDesc theLocation = { typeNull, NULL };
         if (noErr == ::AECreateDesc(typeFSRef, &theFile, sizeof(FSRef), &theLocation))
             ::NavCustomControl(ioParams->context, kNavCtlSetLocation, (void *) &theLocation);
     }

-    
-    if( extensions.GetCount() > 0 )
+
+    if( m_extensions.GetCount() > 0 )

     {
         NavMenuItemSpec  menuItem;
         memset( &menuItem, 0, sizeof(menuItem) );
         menuItem.version = kNavMenuItemSpecVersion;
     {
         NavMenuItemSpec  menuItem;
         memset( &menuItem, 0, sizeof(menuItem) );
         menuItem.version = kNavMenuItemSpecVersion;

-        menuItem.menuType = currentfilter;
+        menuItem.menuType = m_currentfilter;

         ::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);
     }
         ::NavCustomControl(ioParams->context, kNavCtlSelectCustomType, &menuItem);
     }

-    
-    if (dialog->GetExtraControl())
+
+    if (m_dialog->GetExtraControl())

     {
     {

-        ControlRef ref = dialog->GetExtraControl()->GetPeer()->GetControlRef();
+        m_controlAdded = true;
+        ControlRef ref = m_dialog->GetExtraControl()->GetPeer()->GetControlRef();

         NavCustomControl(ioParams->context, kNavCtlAddControl, ref);
     }
         NavCustomControl(ioParams->context, kNavCtlAddControl, ref);
     }

-    
+

 }
 
 void OpenUserDataRec::EventProcCBPopupMenuSelect(NavCBRecPtr ioParams)
 {
     NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;
 }
 
 void OpenUserDataRec::EventProcCBPopupMenuSelect(NavCBRecPtr ioParams)
 {
     NavMenuItemSpec * menu = (NavMenuItemSpec *) ioParams->eventData.eventDataParms.param ;

-    const size_t numFilters = extensions.GetCount();
-    
+    const size_t numFilters = m_extensions.GetCount();
+

     if ( menu->menuType < numFilters )
     {
     if ( menu->menuType < numFilters )
     {

-        currentfilter = menu->menuType ;
-        if ( saveMode )
+        m_currentfilter = menu->menuType ;
+        if ( m_saveMode )

         {
             int i = menu->menuType ;
         {
             int i = menu->menuType ;

-            
+

             // isolate the first extension string
             // isolate the first extension string

-            wxString firstExtension = extensions[i].BeforeFirst('|').BeforeFirst(';');
-            
+            wxString firstExtension = m_extensions[i].BeforeFirst('|').BeforeFirst(';');
+

             wxString extension = firstExtension.AfterLast('.') ;
             wxString sfilename ;
             wxString extension = firstExtension.AfterLast('.') ;
             wxString sfilename ;

-            
+

             wxCFStringRef cfString( wxCFRetain( NavDialogGetSaveFileName( ioParams->context ) ) );
             sfilename = cfString.AsString() ;
             wxCFStringRef cfString( wxCFRetain( NavDialogGetSaveFileName( ioParams->context ) ) );
             sfilename = cfString.AsString() ;

-            
+

             int pos = sfilename.Find('.', true) ;
             if ( pos != wxNOT_FOUND && extension != wxT("*") )
             {
             int pos = sfilename.Find('.', true) ;
             if ( pos != wxNOT_FOUND && extension != wxT("*") )
             {


@@ -221,24 +228,53 @@ void OpenUserDataRec::EventProcCBPopupMenuSelect(NavCBRecPtr ioParams)
 
 void OpenUserDataRec::EventProcCBCustomize(NavCBRecPtr ioParams)
 {
 
 void OpenUserDataRec::EventProcCBCustomize(NavCBRecPtr ioParams)
 {

-    if (ioParams->customRect.right == 0 && ioParams->customRect.bottom == 0 && dialog->GetExtraControl())
+    wxWindow* control = m_dialog->GetExtraControl();
+
+    if ( control )

     {
     {

-        wxSize size = dialog->GetExtraControl()->GetSize();
-        ioParams->customRect.right = size.x;
-        ioParams->customRect.bottom = size.y;
+        SInt16 neededRight, neededBottom;
+
+        wxSize size = m_dialog->GetExtraControl()->GetSize();
+        neededRight = ioParams->customRect.left + size.x;
+        neededBottom = ioParams->customRect.top + size.y;
+
+        if (ioParams->customRect.right == 0 && ioParams->customRect.bottom == 0)
+        {
+            ioParams->customRect.right = neededRight;
+            ioParams->customRect.bottom = neededBottom;
+        }
+        else
+        {
+            if ( ioParams->customRect.right != m_lastRight )
+            {
+                if ( ioParams->customRect.right < neededRight )
+                    ioParams->customRect.right = neededRight;
+            }
+            if ( ioParams->customRect.bottom != m_lastBottom )
+            {
+                if ( ioParams->customRect.bottom < neededBottom )
+                    ioParams->customRect.bottom = neededBottom;
+            }
+        }
+        m_lastRight = ioParams->customRect.right;
+        m_lastBottom = ioParams->customRect.bottom;

     }
 }
 
 void OpenUserDataRec::EventProcCBAdjustRect(NavCBRecPtr ioParams)
 {
     }
 }
 
 void OpenUserDataRec::EventProcCBAdjustRect(NavCBRecPtr ioParams)
 {

+    wxWindow* control = m_dialog->GetExtraControl();
+
+    if ( control && m_controlAdded)
+    {
+        control->SetSize(ioParams->customRect.left , ioParams->customRect.top,
+                         ioParams->customRect.right - ioParams->customRect.left,
+                         ioParams->customRect.bottom - ioParams->customRect.top);
+    }

 }
 
 void OpenUserDataRec::MakeUserDataRec( const wxString& filter )
 {
 }
 
 void OpenUserDataRec::MakeUserDataRec( const wxString& filter )
 {

-    menuitems = NULL ;
-    currentfilter = 0 ;
-    saveMode = false ;
-

     if ( !filter.empty() )
     {
         wxString filter2(filter) ;
     if ( !filter.empty() )
     {
         wxString filter2(filter) ;


@@ -252,11 +288,11 @@ void OpenUserDataRec::MakeUserDataRec( const wxString& filter )
             {
                 if ( isName )
                 {
             {
                 if ( isName )
                 {

-                    name.Add( current ) ;
+                    m_name.Add( current ) ;

                 }
                 else
                 {
                 }
                 else
                 {

-                    extensions.Add( current ) ;
+                    m_extensions.Add( current ) ;

                     ++filterIndex ;
                 }
 
                     ++filterIndex ;
                 }
 


@@ -273,32 +309,32 @@ void OpenUserDataRec::MakeUserDataRec( const wxString& filter )
 
         wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;
         if ( current.empty() )
 
         wxASSERT_MSG( filterIndex == 0 || !isName , wxT("incorrect format of format string") ) ;
         if ( current.empty() )

-            extensions.Add( name[filterIndex] ) ;
+            m_extensions.Add( m_name[filterIndex] ) ;

         else
         else

-            extensions.Add( current ) ;
+            m_extensions.Add( current ) ;

         if ( filterIndex == 0 || isName )
         if ( filterIndex == 0 || isName )

-            name.Add( current ) ;
+            m_name.Add( current ) ;

 
         ++filterIndex ;
 
 
         ++filterIndex ;
 

-        const size_t extCount = extensions.GetCount();
+        const size_t extCount = m_extensions.GetCount();

         for ( size_t i = 0 ; i < extCount; i++ )
         {
             wxUint32 fileType, creator;
         for ( size_t i = 0 ; i < extCount; i++ )
         {
             wxUint32 fileType, creator;

-            wxString extension = extensions[i];
+            wxString extension = m_extensions[i];

 
             // Remove leading '*'
 
             // Remove leading '*'

-            if (extension.length() && (extension.GetChar(0) == '*'))
+            if ( !extension.empty() && (extension.GetChar(0) == '*') )

                 extension = extension.Mid( 1 );
 
             // Remove leading '.'
                 extension = extension.Mid( 1 );
 
             // Remove leading '.'

-            if (extension.length() && (extension.GetChar(0) == '.'))
+            if ( !extension.empty() && (extension.GetChar(0) == '.') )

                 extension = extension.Mid( 1 );
 
             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))
                 extension = extension.Mid( 1 );
 
             if (wxFileName::MacFindDefaultTypeAndCreator( extension, &fileType, &creator ))

-                filtermactypes.Add( (OSType)fileType );
+                m_filtermactypes.Add( (OSType)fileType );

             else
             else

-                filtermactypes.Add( '****' ); // We'll fail safe if it's not recognized
+                m_filtermactypes.Add( '****' ); // We'll fail safe if it's not recognized

         }
     }
 }
         }
     }
 }


@@ -308,18 +344,18 @@ bool OpenUserDataRec::CheckFile( const wxString &filename , OSType type)
     wxString file(filename) ;
     file.MakeUpper() ;
 
     wxString file(filename) ;
     file.MakeUpper() ;
 

-    if ( extensions.GetCount() > 0 )
+    if ( m_extensions.GetCount() > 0 )

     {
         //for ( int i = 0 ; i < data->numfilters ; ++i )
     {
         //for ( int i = 0 ; i < data->numfilters ; ++i )

-        int i = currentfilter ;
-        if ( extensions[i].Right(2) == wxT(".*") )
+        int i = m_currentfilter ;
+        if ( m_extensions[i].Right(2) == wxT(".*") )

             return true ;
 
         {
             return true ;
 
         {

-            if ( type == (OSType)filtermactypes[i] )
+            if ( type == (OSType)m_filtermactypes[i] )

                 return true ;
 
                 return true ;
 

-            wxStringTokenizer tokenizer( extensions[i] , wxT(";") ) ;
+            wxStringTokenizer tokenizer( m_extensions[i] , wxT(";") ) ;

             while ( tokenizer.HasMoreTokens() )
             {
                 wxString extension = tokenizer.GetNextToken() ;
             while ( tokenizer.HasMoreTokens() )
             {
                 wxString extension = tokenizer.GetNextToken() ;


@@ -351,19 +387,19 @@ bool OpenUserDataRec::FilterCallback(
         // check if a folder is a package before deciding what to do.
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         FSRef fsref;
         // check if a folder is a package before deciding what to do.
         NavFileOrFolderInfo* theInfo = (NavFileOrFolderInfo*) info ;
         FSRef fsref;

-        
+

         if ( theInfo->isFolder )
         {
             // check bundle bit (using Finder Services - used by OS9 on some bundles)
             FSCatalogInfo catalogInfo;
             if (FSGetCatalogInfo (&fsref, kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL) != noErr)
                 return true;
         if ( theInfo->isFolder )
         {
             // check bundle bit (using Finder Services - used by OS9 on some bundles)
             FSCatalogInfo catalogInfo;
             if (FSGetCatalogInfo (&fsref, kFSCatInfoFinderInfo, &catalogInfo, NULL, NULL, NULL) != noErr)
                 return true;

-            
+

             // Check bundle item (using Launch Services - used by OS-X through info.plist or APP)
             LSItemInfoRecord lsInfo;
             if (LSCopyItemInfoForRef(&fsref, kLSRequestBasicFlagsOnly, &lsInfo ) != noErr)
                 return true;
             // Check bundle item (using Launch Services - used by OS-X through info.plist or APP)
             LSItemInfoRecord lsInfo;
             if (LSCopyItemInfoForRef(&fsref, kLSRequestBasicFlagsOnly, &lsInfo ) != noErr)
                 return true;

-            
+

             // If it's not a bundle, then it's a normal folder and it passes our filter
             FileInfo *fileInfo = (FileInfo *) catalogInfo.finderInfo;
             if ( !(fileInfo->finderFlags & kHasBundle) &&
             // If it's not a bundle, then it's a normal folder and it passes our filter
             FileInfo *fileInfo = (FileInfo *) catalogInfo.finderInfo;
             if ( !(fileInfo->finderFlags & kHasBundle) &&


@@ -380,7 +416,7 @@ bool OpenUserDataRec::FilterCallback(
             }
         }
     }
             }
         }
     }

-    
+

     return true;
 }
 
     return true;
 }
 


@@ -428,11 +464,21 @@ wxFileDialog::wxFileDialog(
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }
 
     wxASSERT_MSG( NavServicesAvailable() , wxT("Navigation Services are not running") ) ;
 }
 

+void wxFileDialog::SetupExtraControls(WXWindow nativeWindow)
+{
+    wxTopLevelWindow::Create( GetParent(), nativeWindow );
+
+    if (HasExtraControlCreator())
+    {
+        CreateExtraControl();
+    }
+}
+

 int wxFileDialog::ShowModal()
 {
     m_paths.Empty();
     m_fileNames.Empty();
 int wxFileDialog::ShowModal()
 {
     m_paths.Empty();
     m_fileNames.Empty();

-    
+

     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
 
     OSErr err;
     NavDialogCreationOptions dialogCreateOptions;
 


@@ -451,9 +497,9 @@ int wxFileDialog::ShowModal()
     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;
     OpenUserDataRec myData( this );
     NavDialogRef dialog;
     NavObjectFilterUPP navFilterUPP = NULL;
     OpenUserDataRec myData( this );

-            
+

     dialogCreateOptions.popupExtension = myData.GetMenuItems();
     dialogCreateOptions.popupExtension = myData.GetMenuItems();

-    
+

     if (HasFdFlag(wxFD_SAVE))
     {
         dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;
     if (HasFdFlag(wxFD_SAVE))
     {
         dialogCreateOptions.optionFlags |= kNavDontAutoTranslate;


@@ -491,16 +537,15 @@ int wxFileDialog::ShowModal()
             (void *) &myData, // inClientData
             &dialog );
     }
             (void *) &myData, // inClientData
             &dialog );
     }

-    
-    wxNonOwnedWindow::Create( GetParent(), NavDialogGetWindow(dialog) );

 
 

-    if (HasExtraControlCreator())
-    {
-        CreateExtraControl();
-    }
-    
+    SetupExtraControls(NavDialogGetWindow(dialog));
+

     if (err == noErr)
     if (err == noErr)

+    {
+        wxDialog::OSXBeginModalDialog();

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

+        wxDialog::OSXEndModalDialog();
+    }

 
     // clean up filter related data, etc.
     if (navFilterUPP)
 
     // clean up filter related data, etc.
     if (navFilterUPP)


@@ -557,6 +602,7 @@ int wxFileDialog::ShowModal()
         m_dir = wxPathOnly(m_path);
     }
 
         m_dir = wxPathOnly(m_path);
     }
 

+    UnsubclassWin();

     ::NavDisposeReply(&navReply);
     ::NavDialogDispose(dialog);
 
     ::NavDisposeReply(&navReply);
     ::NavDialogDispose(dialog);