[dasher] Fix --without-cairo build. Reported by Francesco Fumanti.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] Fix --without-cairo build. Reported by Francesco Fumanti.
- Date: Wed, 30 Nov 2011 15:13:51 +0000 (UTC)
commit c45ac23ff62414b50c92d9ead0d49e69e4f5909c
Author: Patrick Welche <prlw1 cam ac uk>
Date: Wed Nov 30 16:13:09 2011 +0100
Fix --without-cairo build. Reported by Francesco Fumanti.
Src/Gtk2/Canvas.cpp | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/Src/Gtk2/Canvas.cpp b/Src/Gtk2/Canvas.cpp
index faefb57..3d85729 100644
--- a/Src/Gtk2/Canvas.cpp
+++ b/Src/Gtk2/Canvas.cpp
@@ -37,11 +37,11 @@ void CCanvas::InitSurfaces() {
#else
- //m_pDummyBuffer = gdk_pixmap_new(pCanvas->window, GetWidth(), GetHeight(), -1);
+ //m_pDummyBuffer = gdk_pixmap_new(m_pCanvas->window, GetWidth(), GetHeight(), -1);
- m_pDisplayBuffer = gdk_pixmap_new(pCanvas->window, GetWidth(), GetHeight(), -1);
- m_pDecorationBuffer = gdk_pixmap_new(pCanvas->window, GetWidth(), GetHeight(), -1);
- //m_pOnscreenBuffer = gdk_pixmap_new(pCanvas->window, GetWidth(), GetHeight(), -1);
+ m_pDisplayBuffer = gdk_pixmap_new(m_pCanvas->window, GetWidth(), GetHeight(), -1);
+ m_pDecorationBuffer = gdk_pixmap_new(m_pCanvas->window, GetWidth(), GetHeight(), -1);
+ //m_pOnscreenBuffer = gdk_pixmap_new(m_pCanvas->window, GetWidth(), GetHeight(), -1);
// Set the display buffer to be current
@@ -440,7 +440,7 @@ PangoLayout *CCanvas::GetLayout(CPangoLabel *label, unsigned int iFontSize) {
#if WITH_CAIRO
PangoLayout *pNewPangoLayout(pango_cairo_create_layout(cr));
#else
- PangoLayout *pNewPangoLayout(gtk_widget_create_pango_layout(pCanvas, ""));
+ PangoLayout *pNewPangoLayout(gtk_widget_create_pango_layout(m_pCanvas, ""));
#endif
label->m_mLayouts.insert(pair<unsigned int,PangoLayout *>(iFontSize, pNewPangoLayout));
if (label->m_iWrapSize) pango_layout_set_width(pNewPangoLayout, GetWidth() * PANGO_SCALE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]