aboutsummaryrefslogtreecommitdiff
path: root/util/fbcompose/OpenGLWindow.cc
diff options
context:
space:
mode:
authorPaul Tagliamonte <paultag@fluxbox.org>2011-12-08 14:50:56 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2011-12-08 14:51:41 (GMT)
commit1311440217ca494aa2201f405745eb804a7f3112 (patch)
treeb50753ed1e30b23ab14e9e00b479fe8309bb4df7 /util/fbcompose/OpenGLWindow.cc
parentd619086b577c7b2a50db00a8cb3dd79a6d33d86b (diff)
downloadfluxbox_paul-1311440217ca494aa2201f405745eb804a7f3112.zip
fluxbox_paul-1311440217ca494aa2201f405745eb804a7f3112.tar.bz2
Fixing up the branch to use some of the changes that were made since the fork.
The operator "=" was ditched in favor of .reset( because (I'm quoting here): "it was an accident waiting to happen". Well. It builds now.
Diffstat (limited to 'util/fbcompose/OpenGLWindow.cc')
-rw-r--r--util/fbcompose/OpenGLWindow.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/fbcompose/OpenGLWindow.cc b/util/fbcompose/OpenGLWindow.cc
index a0977af..070a9b8 100644
--- a/util/fbcompose/OpenGLWindow.cc
+++ b/util/fbcompose/OpenGLWindow.cc
@@ -43,8 +43,8 @@ using namespace FbCompositor;
43OpenGLWindow::OpenGLWindow(const OpenGLScreen &screen, Window window_xid) : 43OpenGLWindow::OpenGLWindow(const OpenGLScreen &screen, Window window_xid) :
44 BaseCompWindow(static_cast<const BaseScreen&>(screen), window_xid, false) { 44 BaseCompWindow(static_cast<const BaseScreen&>(screen), window_xid, false) {
45 45
46 m_content_tex_partition = new OpenGL2DTexturePartition(screen, true); 46 m_content_tex_partition.reset( new OpenGL2DTexturePartition(screen, true) );
47 m_shape_tex_partition = new OpenGL2DTexturePartition(screen, false); 47 m_shape_tex_partition.reset( new OpenGL2DTexturePartition(screen, false) );
48 48
49 updateWindowPos(); 49 updateWindowPos();
50} 50}