Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-05-06 14:52:34 +02:00
Code Issues Releases Wiki Activity

Revert "fix mac build"

Browse Source 
This reverts commit 2910cc2a6f1ad91c0aa5c63fa6c5f9e940107bdd.
This commit is contained in:
Paul Licameli 2016-06-25 22:17:24 -04:00
parent 2910cc2a6f
commit 107507e125
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AudacityApp.cpp
View File

@ -1187,7 +1187,7 @@ bool AudacityApp::OnInit()
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Disable window animation // Disable window animation
wxSystemOptions::SetOption(wxMAC_WINDOW_PLAIN_TRANSITION, 0); wxSystemOptions::SetOption(wxMAC_WINDOW_PLAIN_TRANSITION, 1);
#endif #endif
#ifdef AUDACITY_NAME #ifdef AUDACITY_NAME

16
src/toolbars/ToolManager.cpp
View File

@ -666,7 +666,7 @@ void ToolManager::ReadConfig()
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Disable window animation // Disable window animation
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
#endif #endif
// Change to the bar root // Change to the bar root
@ -852,7 +852,7 @@ void ToolManager::ReadConfig()
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Reinstate original transition // Reinstate original transition
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
#endif #endif
if (!someFound) if (!someFound)
@ -1055,7 +1055,7 @@ void ToolManager::OnMouse( wxMouseEvent & event )
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Disable window animation // Disable window animation
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
#endif #endif
// Retrieve the event position // Retrieve the event position
@ -1189,7 +1189,7 @@ void ToolManager::OnMouse( wxMouseEvent & event )
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Reinstate original transition // Reinstate original transition
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
#endif #endif
} }
@ -1236,14 +1236,14 @@ void ToolManager::OnTimer( wxTimerEvent & event )
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Disable window animation // Disable window animation
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
#endif #endif
mIndicator->Show( !state ); mIndicator->Show( !state );
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Disable window animation // Disable window animation
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
#endif #endif
} }
@ -1313,7 +1313,7 @@ void ToolManager::OnGrabber( GrabberEvent & event )
{ {
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Disable window animation // Disable window animation
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, 1 );
#endif #endif
// Adjust the starting position // Adjust the starting position
@ -1334,7 +1334,7 @@ void ToolManager::OnGrabber( GrabberEvent & event )
#if defined(__WXMAC__) #if defined(__WXMAC__)
// Reinstate original transition // Reinstate original transition
//wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition ); wxSystemOptions::SetOption( wxMAC_WINDOW_PLAIN_TRANSITION, mTransition );
#endif #endif
} }
else else

2
src/widgets/wxPanelWrapper.cpp
View File

@ -20,7 +20,7 @@ wxPanelWrapper::wxPanelWrapper(wxWindow * parent, wxWindowID id,
void wxPanelWrapper::DoCharHook(wxKeyEvent &event) void wxPanelWrapper::DoCharHook(wxKeyEvent &event)
{ {
#ifdef __WXMAC__ #ifdef __WXMAC
// Compensate for the regressions in TAB key navigation // Compensate for the regressions in TAB key navigation
// due to the switch to wxWidgets 3.0.2 // due to the switch to wxWidgets 3.0.2
if (event.GetKeyCode() == WXK_TAB) { if (event.GetKeyCode() == WXK_TAB) {