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

moving launch methods to common code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57964 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor 2009-01-10 09:39:49 +00:00
parent 9c8fe27e0d
commit 2ae328d17f
2 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/osx/carbon/utils.cpp
View File

@ -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
// ----------------------------------------------------------------------------

43
src/osx/utils_osx.cpp
View File

@ -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)