diff options
author | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-10 16:43:24 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2011-12-10 16:43:24 (GMT) |
commit | 5e75c312050185267b05388a3991b932b447a75f (patch) | |
tree | b7b39d55993e612f7bfb373a161f6f5cb4a1f81f /util/fbcompose/OpenGLWindow.cc | |
parent | 596c283553fb2da7e9204621347462bb46b83c4d (diff) | |
download | fluxbox_paul-5e75c312050185267b05388a3991b932b447a75f.zip fluxbox_paul-5e75c312050185267b05388a3991b932b447a75f.tar.bz2 |
Fixing up the branch to use some of the changes that were made since the fork.fluxbox-gsoc-2011-integration
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.cc | 4 |
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; | |||
43 | OpenGLWindow::OpenGLWindow(const OpenGLScreen &screen, Window window_xid) : | 43 | OpenGLWindow::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 | } |