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

Removed run-time dependency on libpangocairo

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48593 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2007-09-06 17:56:09 +00:00
parent fd220f13d4
commit cf509a9038
3 changed files with 66 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/cairo.cpp
View File

@@ -35,9 +35,15 @@ wxCairoLibrary *wxCairoLibrary::s_lib = NULL;
wxCairoLibrary::wxCairoLibrary()
{
m_cairo_lib = NULL;
m_pango_cairo_lib = NULL;
wxLogNull log;
m_cairo_lib = new wxDynamicLibrary( wxT("libcairo.so") );
m_cairo_lib = new wxDynamicLibrary( wxT("libcairo.so.2") );
m_ok = m_cairo_lib->IsLoaded();
if (!m_ok) return;
m_pango_cairo_lib = new wxDynamicLibrary( wxT("libpangocairo-1.0.so.0") );
m_ok = m_cairo_lib->IsLoaded();
if (!m_ok) return;
@@ -126,6 +132,9 @@ void wxCairoLibrary::InitializeMethods()
wxDL_METHOD_LOAD( m_cairo_lib, cairo_surface_destroy, success )
wxDL_METHOD_LOAD( m_cairo_lib, cairo_translate, success )
wxDL_METHOD_LOAD( m_pango_cairo_lib, pango_cairo_update_layout, success )
wxDL_METHOD_LOAD( m_pango_cairo_lib, pango_cairo_show_layout, success )
m_ok = true;
}