removing code for pre 10.6 systems
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -346,14 +346,12 @@ void wxBell()
|
||||
ProcessSerialNumber psn = { 0, kCurrentProcess };
|
||||
TransformProcessType(&psn, kProcessTransformToForegroundApplication);
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
|
||||
if ( UMAGetSystemVersion() >= 0x1090 )
|
||||
{
|
||||
[[NSRunningApplication currentApplication] activateWithOptions:
|
||||
(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
[self deactivate];
|
||||
[self activateIgnoringOtherApps:YES];
|
||||
@@ -502,8 +500,6 @@ void wxGetMousePosition( int* x, int* y )
|
||||
*y = pt.y;
|
||||
};
|
||||
|
||||
#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
|
||||
|
||||
wxMouseState wxGetMouseState()
|
||||
{
|
||||
wxMouseState ms;
|
||||
@@ -527,9 +523,6 @@ wxMouseState wxGetMouseState()
|
||||
return ms;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
|
||||
{
|
||||
return new wxOSXTimerImpl(timer);
|
||||
|
@@ -1120,9 +1120,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
|
||||
|
||||
case NSURLErrorUserAuthenticationRequired:
|
||||
case NSURLErrorSecureConnectionFailed:
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
|
||||
case NSURLErrorClientCertificateRequired:
|
||||
#endif
|
||||
*out = wxWEBVIEW_NAV_ERR_AUTH;
|
||||
break;
|
||||
|
||||
|
Reference in New Issue
Block a user