indentation and the frame.handle destroy
This commit is contained in:
parent
2652479b7c
commit
76a38e466c
1 changed files with 26 additions and 20 deletions
|
@ -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.22 2002/01/20 02:14:20 fluxgen Exp $
|
// $Id: Window.cc,v 1.23 2002/01/27 13:13:33 fluxgen Exp $
|
||||||
|
|
||||||
// stupid macros needed to access some functions in version 2 of the GNU C
|
// stupid macros needed to access some functions in version 2 of the GNU C
|
||||||
// library
|
// library
|
||||||
|
@ -495,12 +495,13 @@ FluxboxWindow::~FluxboxWindow(void) {
|
||||||
if (frame.ugrip)
|
if (frame.ugrip)
|
||||||
image_ctrl->removeImage(frame.ugrip);
|
image_ctrl->removeImage(frame.ugrip);
|
||||||
|
|
||||||
fluxbox->removeWindowSearch(frame.handle);
|
|
||||||
fluxbox->removeWindowSearch(frame.right_grip);
|
fluxbox->removeWindowSearch(frame.right_grip);
|
||||||
fluxbox->removeWindowSearch(frame.left_grip);
|
fluxbox->removeWindowSearch(frame.left_grip);
|
||||||
XDestroyWindow(display, frame.handle);
|
fluxbox->removeWindowSearch(frame.handle);
|
||||||
|
|
||||||
XDestroyWindow(display, frame.right_grip);
|
XDestroyWindow(display, frame.right_grip);
|
||||||
XDestroyWindow(display, frame.left_grip);
|
XDestroyWindow(display, frame.left_grip);
|
||||||
|
XDestroyWindow(display, frame.handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (frame.fbutton)
|
if (frame.fbutton)
|
||||||
|
@ -528,8 +529,9 @@ FluxboxWindow::~FluxboxWindow(void) {
|
||||||
screen->removeNetizen(client.window);
|
screen->removeNetizen(client.window);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
fprintf(stderr, "%s(%d): ~FluxboxWindow(this=%p) done\n", __FILE__, __LINE__, this);
|
cerr<<__FILE__<<"("<<__LINE__<<"): ~FluxboxWindow(this="<<this<<") done"<<endl;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2582,7 +2584,11 @@ void FluxboxWindow::unmapNotifyEvent(XUnmapEvent *ue) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//----------- destroyNotifyEvent -------------
|
||||||
|
// Checks if event is for client.window.
|
||||||
|
// Unmaps frame.window and returns true for destroy
|
||||||
|
// of this FluxboxWindow else returns false.
|
||||||
|
//--------------------------------------------
|
||||||
bool FluxboxWindow::destroyNotifyEvent(XDestroyWindowEvent *de) {
|
bool FluxboxWindow::destroyNotifyEvent(XDestroyWindowEvent *de) {
|
||||||
if (de->window == client.window) {
|
if (de->window == client.window) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
Loading…
Reference in a new issue