diff options
author | rathnor <rathnor> | 2004-09-11 12:33:14 (GMT) |
---|---|---|
committer | rathnor <rathnor> | 2004-09-11 12:33:14 (GMT) |
commit | 7d793fc6a8d7aa07a7636df2e96054c4a8e2c6a8 (patch) | |
tree | ad753983b54d61f8a01fb32794d67bf50585789e /src/FbTk/FbWindow.cc | |
parent | c8f9cf1177b6de1cc210f0706dae302b9aa4f7b5 (diff) | |
download | fluxbox-7d793fc6a8d7aa07a7636df2e96054c4a8e2c6a8.zip fluxbox-7d793fc6a8d7aa07a7636df2e96054c4a8e2c6a8.tar.bz2 |
fix issues that resulted in unnecessary X errors
Diffstat (limited to 'src/FbTk/FbWindow.cc')
-rw-r--r-- | src/FbTk/FbWindow.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/FbTk/FbWindow.cc b/src/FbTk/FbWindow.cc index ea84701..2a4aafa 100644 --- a/src/FbTk/FbWindow.cc +++ b/src/FbTk/FbWindow.cc | |||
@@ -19,7 +19,7 @@ | |||
19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 19 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
20 | // DEALINGS IN THE SOFTWARE. | 20 | // DEALINGS IN THE SOFTWARE. |
21 | 21 | ||
22 | // $Id: FbWindow.cc,v 1.39 2004/09/10 15:46:08 akir Exp $ | 22 | // $Id: FbWindow.cc,v 1.40 2004/09/11 12:33:14 rathnor Exp $ |
23 | 23 | ||
24 | #include "FbWindow.hh" | 24 | #include "FbWindow.hh" |
25 | #include "FbPixmap.hh" | 25 | #include "FbPixmap.hh" |
@@ -315,10 +315,11 @@ void FbWindow::unsetCursor() { | |||
315 | XUndefineCursor(s_display, window()); | 315 | XUndefineCursor(s_display, window()); |
316 | } | 316 | } |
317 | 317 | ||
318 | void FbWindow::reparent(const FbWindow &parent, int x, int y) { | 318 | void FbWindow::reparent(const FbWindow &parent, int x, int y, bool continuing) { |
319 | XReparentWindow(s_display, window(), parent.window(), x, y); | 319 | XReparentWindow(s_display, window(), parent.window(), x, y); |
320 | m_parent = &parent; | 320 | m_parent = &parent; |
321 | updateGeometry(); | 321 | if (continuing) // we will continue managing this window after reparent |
322 | updateGeometry(); | ||
322 | } | 323 | } |
323 | 324 | ||
324 | std::string FbWindow::textProperty(Atom property) const { | 325 | std::string FbWindow::textProperty(Atom property) const { |