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

removing code for pre 10.6 systems

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77036 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2014-08-09 17:27:19 +00:00
parent b79595df2d
commit 0094b93dc6
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osx/cocoa/utils.mm
View File

@@ -346,14 +346,12 @@ void wxBell()
ProcessSerialNumber psn = { 0, kCurrentProcess }; ProcessSerialNumber psn = { 0, kCurrentProcess };
TransformProcessType(&psn, kProcessTransformToForegroundApplication); TransformProcessType(&psn, kProcessTransformToForegroundApplication);
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
if ( UMAGetSystemVersion() >= 0x1090 ) if ( UMAGetSystemVersion() >= 0x1090 )
{ {
[[NSRunningApplication currentApplication] activateWithOptions: [[NSRunningApplication currentApplication] activateWithOptions:
(NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)]; (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
} }
else else
#endif
{ {
[self deactivate]; [self deactivate];
[self activateIgnoringOtherApps:YES]; [self activateIgnoringOtherApps:YES];
@@ -502,8 +500,6 @@ void wxGetMousePosition( int* x, int* y )
*y = pt.y; *y = pt.y;
}; };
#if wxOSX_USE_COCOA && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6
wxMouseState wxGetMouseState() wxMouseState wxGetMouseState()
{ {
wxMouseState ms; wxMouseState ms;
@@ -527,9 +523,6 @@ wxMouseState wxGetMouseState()
return ms; return ms;
} }
#endif
wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer) wxTimerImpl* wxGUIAppTraits::CreateTimerImpl(wxTimer *timer)
{ {
return new wxOSXTimerImpl(timer); return new wxOSXTimerImpl(timer);

2
src/osx/webview_webkit.mm
View File

@@ -1120,9 +1120,7 @@ wxString nsErrorToWxHtmlError(NSError* error, wxWebViewNavigationError* out)
case NSURLErrorUserAuthenticationRequired: case NSURLErrorUserAuthenticationRequired:
case NSURLErrorSecureConnectionFailed: case NSURLErrorSecureConnectionFailed:
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6
case NSURLErrorClientCertificateRequired: case NSURLErrorClientCertificateRequired:
#endif
*out = wxWEBVIEW_NAV_ERR_AUTH; *out = wxWEBVIEW_NAV_ERR_AUTH;
break; break;