diff options
author | fluxgen <fluxgen> | 2002-10-23 22:00:46 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2002-10-23 22:00:46 (GMT) |
commit | 7934b75a9d13ea6bb100595d1a2c4d81c75b4144 (patch) | |
tree | c14a285ad9844dbf8054fc7f52eed1a37d0dcbce /src/Window.cc | |
parent | a1a01de8f92098ec1cc23f46188a4c4c9b752200 (diff) | |
download | fluxbox-7934b75a9d13ea6bb100595d1a2c4d81c75b4144.zip fluxbox-7934b75a9d13ea6bb100595d1a2c4d81c75b4144.tar.bz2 |
fixed auto_ptr assignment
Diffstat (limited to 'src/Window.cc')
-rw-r--r-- | src/Window.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/Window.cc b/src/Window.cc index 7401358..8f6e8d6 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Window.cc,v 1.93 2002/10/23 17:31:23 fluxgen Exp $ | 25 | // $Id: Window.cc,v 1.94 2002/10/23 21:59:37 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -299,8 +299,10 @@ tab(0) { | |||
299 | 299 | ||
300 | XMapSubwindows(display, frame.window); | 300 | XMapSubwindows(display, frame.window); |
301 | 301 | ||
302 | if (decorations.menu) | 302 | if (decorations.menu) { |
303 | m_windowmenu = std::auto_ptr<Windowmenu>(new Windowmenu(*this)); | 303 | std::auto_ptr<Windowmenu> tmp(new Windowmenu(*this)); |
304 | m_windowmenu = tmp; | ||
305 | } | ||
304 | 306 | ||
305 | if (workspace_number < 0 || workspace_number >= screen->getCount()) | 307 | if (workspace_number < 0 || workspace_number >= screen->getCount()) |
306 | screen->getCurrentWorkspace()->addWindow(this, place_window); | 308 | screen->getCurrentWorkspace()->addWindow(this, place_window); |
@@ -435,7 +437,7 @@ FluxboxWindow::~FluxboxWindow() { | |||
435 | } | 437 | } |
436 | 438 | ||
437 | bool FluxboxWindow::isGroupable() const { | 439 | bool FluxboxWindow::isGroupable() const { |
438 | if (isResizable() && isMaximizable() && ! isTransient()) | 440 | if (isResizable() && isMaximizable() && !isTransient()) |
439 | return true; | 441 | return true; |
440 | return false; | 442 | return false; |
441 | } | 443 | } |