nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed auto_ptr assignment

Browse source
This commit is contained in:
fluxgen 2002-10-23 22:00:46 +00:00
parent a1a01de8f9
commit 7934b75a9d
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Window.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: Window.cc,v 1.93 2002/10/23 17:31:23 fluxgen Exp $ // $Id: Window.cc,v 1.94 2002/10/23 21:59:37 fluxgen Exp $
#include "Window.hh" #include "Window.hh"
@ -299,8 +299,10 @@ tab(0) {
XMapSubwindows(display, frame.window); XMapSubwindows(display, frame.window);
if (decorations.menu) if (decorations.menu) {
m_windowmenu = std::auto_ptr<Windowmenu>(new Windowmenu(*this)); std::auto_ptr<Windowmenu> tmp(new Windowmenu(*this));
m_windowmenu = tmp;
}
if (workspace_number < 0 || workspace_number >= screen->getCount()) if (workspace_number < 0 || workspace_number >= screen->getCount())
screen->getCurrentWorkspace()->addWindow(this, place_window); screen->getCurrentWorkspace()->addWindow(this, place_window);
@ -435,7 +437,7 @@ FluxboxWindow::~FluxboxWindow() {
} }
bool FluxboxWindow::isGroupable() const { bool FluxboxWindow::isGroupable() const {
if (isResizable() && isMaximizable() && ! isTransient()) if (isResizable() && isMaximizable() && !isTransient())
return true; return true;
return false; return false;
} }

5
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.78 2002/10/16 20:02:00 fluxgen Exp $ // $Id: fluxbox.cc,v 1.79 2002/10/23 22:00:46 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -425,7 +425,8 @@ key(0)
timer.fireOnce(True); timer.fireOnce(True);
//create keybindings handler and load keys file //create keybindings handler and load keys file
key = auto_ptr<Keys>(new Keys(getXDisplay(), StringUtil::expandFilename(*m_rc_keyfile).c_str())); auto_ptr<Keys> tmp(new Keys(getXDisplay(), StringUtil::expandFilename(*m_rc_keyfile).c_str()));
key = tmp;
ungrab(); ungrab();
} }