Fix typo in last commit

[wxWidgets.git] / src / common / cairo.cpp

diff --git a/src/common/cairo.cpp b/src/common/cairo.cpp
index 474a05899b9bb397d618e63429c8827387bad7a4..ad2ae52e1af5a252ff4eaeaada97e650cbfed371 100644 (file)
--- a/src/common/cairo.cpp
+++ b/src/common/cairo.cpp
@@ -3,7 +3,7 @@
 // Purpose:     Cairo library
 // Author:      Anthony Betaudeau
 // Created:     2007-08-25
 // Purpose:     Cairo library
 // Author:      Anthony Betaudeau
 // Created:     2007-08-25

-// RCS-ID:      $Id: cairo.cpp 44625 2007-08-25 11:35:04Z VZ $
+// RCS-ID:      $Id$

 // Copyright:   (c) Anthony Bretaudeau
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) Anthony Bretaudeau
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -35,12 +35,13 @@ wxCairoLibrary *wxCairoLibrary::ms_lib = NULL;
 wxCairoLibrary::wxCairoLibrary()
 {
     wxLogNull log;
 wxCairoLibrary::wxCairoLibrary()
 {
     wxLogNull log;

-    
+

     m_libCairo.Load("libcairo.so.2");
     m_ok = m_libCairo.IsLoaded();
     if ( !m_ok )
         return;
 
     m_libCairo.Load("libcairo.so.2");
     m_ok = m_libCairo.IsLoaded();
     if ( !m_ok )
         return;
 

+#if wxUSE_PANGO

     m_libPangoCairo.Load("libpangocairo-1.0.so.0");
     m_ok = m_libPangoCairo.IsLoaded();
     if ( !m_ok )
     m_libPangoCairo.Load("libpangocairo-1.0.so.0");
     m_ok = m_libPangoCairo.IsLoaded();
     if ( !m_ok )


@@ -48,6 +49,7 @@ wxCairoLibrary::wxCairoLibrary()
         m_libCairo.Unload();
         return;
     }
         m_libCairo.Unload();
         return;
     }

+#endif

 
     m_ok = InitializeMethods();
 }
 
     m_ok = InitializeMethods();
 }


@@ -67,7 +69,7 @@ wxCairoLibrary::~wxCairoLibrary()
             ms_lib = NULL;
         }
     }
             ms_lib = NULL;
         }
     }

-    
+

     return ms_lib;
 }
 
     return ms_lib;
 }
 


@@ -129,8 +131,10 @@ bool wxCairoLibrary::InitializeMethods()
     wxDL_METHOD_LOAD(m_libCairo, cairo_surface_destroy);
     wxDL_METHOD_LOAD(m_libCairo, cairo_translate);
 
     wxDL_METHOD_LOAD(m_libCairo, cairo_surface_destroy);
     wxDL_METHOD_LOAD(m_libCairo, cairo_translate);
 

+#if wxUSE_PANGO

     wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_update_layout);
     wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_show_layout);
     wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_update_layout);
     wxDL_METHOD_LOAD(m_libPangoCairo, pango_cairo_show_layout);

+#endif

 
     return true;
 }
 
     return true;
 }