audacity/wxWidgets
1
0
Fork 0
mirror of https://github.com/audacity/wxWidgets.git synced 2025-12-10 21:09:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

picking the selected font before closing the panel, fixes #16538

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77569 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2014-09-10 07:17:31 +00:00
parent 3ade92601d
commit d00d130ebd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osx/carbon/fontdlgosx.mm
View File

@ -198,14 +198,14 @@ int RunMixedFontDialog(wxFontDialog* dialog)
if( FPIsFontPanelVisible()) if( FPIsFontPanelVisible())
FPShowHideFontPanel() ; FPShowHideFontPanel() ;
#else #else
// we must pick the selection before closing, otherwise a native textcontrol interferes
NSFont* theFont = [fontPanel panelConvertFont:[NSFont userFontOfSize:0]];
[fontPanel close]; [fontPanel close];
#endif #endif
if ( [accessoryView closedWithOk]) if ( [accessoryView closedWithOk])
{ {
#if wxOSX_USE_COCOA #if wxOSX_USE_COCOA
NSFont* theFont = [fontPanel panelConvertFont:[NSFont userFontOfSize:0]];
fontdata.m_chosenFont = wxFont( theFont ); fontdata.m_chosenFont = wxFont( theFont );
//Get the shared color panel along with the chosen color and set the chosen color //Get the shared color panel along with the chosen color and set the chosen color