From 2ae328d17faaae564da1b8d082313c4a52856e62 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Sat, 10 Jan 2009 09:39:49 +0000 Subject: [PATCH] moving launch methods to common code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/carbon/utils.cpp | 38 ----------------------------------- src/osx/utils_osx.cpp | 43 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/src/osx/carbon/utils.cpp b/src/osx/carbon/utils.cpp index a878933818..867ee80336 100644 --- a/src/osx/carbon/utils.cpp +++ b/src/osx/carbon/utils.cpp @@ -151,44 +151,6 @@ wxString wxMacFindFolder( short vol, #if wxUSE_GUI -// ---------------------------------------------------------------------------- -// Launch document with default app -// ---------------------------------------------------------------------------- - -bool wxLaunchDefaultApplication(const wxString& document, int flags) -{ - wxUnusedVar(flags); - - static const char * const OPEN_CMD = "/usr/bin/open"; - if ( wxFileExists(OPEN_CMD) && - wxExecute(wxString(OPEN_CMD) + " " + document) ) - return true; - - return false; -} - -// ---------------------------------------------------------------------------- -// Launch default browser -// ---------------------------------------------------------------------------- - -bool wxDoLaunchDefaultBrowser(const wxString& url, int flags) -{ - wxUnusedVar(flags); - wxCFRef< CFURLRef > curl( CFURLCreateWithString( kCFAllocatorDefault, - wxCFStringRef( url ), NULL ) ); - OSStatus err = LSOpenCFURLRef( curl , NULL ); - - if (err == noErr) - { - return true; - } - else - { - wxLogDebug(wxT("Browser Launch error %d"), (int) err); - return false; - } -} - // ---------------------------------------------------------------------------- // Miscellaneous functions // ---------------------------------------------------------------------------- diff --git a/src/osx/utils_osx.cpp b/src/osx/utils_osx.cpp index 8bd06e843e..e044f1a54d 100644 --- a/src/osx/utils_osx.cpp +++ b/src/osx/utils_osx.cpp @@ -87,6 +87,49 @@ void wxDisplaySize(int *width, int *height) if ( height ) *height = (int)bounds.size.height; } + +#if wxUSE_GUI + +// ---------------------------------------------------------------------------- +// Launch document with default app +// ---------------------------------------------------------------------------- + +bool wxLaunchDefaultApplication(const wxString& document, int flags) +{ + wxUnusedVar(flags); + + static const char * const OPEN_CMD = "/usr/bin/open"; + if ( wxFileExists(OPEN_CMD) && + wxExecute(wxString(OPEN_CMD) + " " + document) ) + return true; + + return false; +} + +// ---------------------------------------------------------------------------- +// Launch default browser +// ---------------------------------------------------------------------------- + +bool wxDoLaunchDefaultBrowser(const wxString& url, int flags) +{ + wxUnusedVar(flags); + wxCFRef< CFURLRef > curl( CFURLCreateWithString( kCFAllocatorDefault, + wxCFStringRef( url ), NULL ) ); + OSStatus err = LSOpenCFURLRef( curl , NULL ); + + if (err == noErr) + { + return true; + } + else + { + wxLogDebug(wxT("Browser Launch error %d"), (int) err); + return false; + } +} + +#endif // wxUSE_GUI + #endif void wxDisplaySizeMM(int *width, int *height)