diff options
author | fluxgen <fluxgen> | 2004-06-07 21:48:14 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2004-06-07 21:48:14 (GMT) |
commit | 0fba4bfafec41e585a42e9668f5921b091e267db (patch) | |
tree | dde57ac19d8dea23541ab5e92875413d64c7b99d /src | |
parent | 5f84132c197f4f43895063c6b2d72828ce016578 (diff) | |
download | fluxbox_paul-0fba4bfafec41e585a42e9668f5921b091e267db.zip fluxbox_paul-0fba4bfafec41e585a42e9668f5921b091e267db.tar.bz2 |
minor stuff
Diffstat (limited to 'src')
-rw-r--r-- | src/Window.cc | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/Window.cc b/src/Window.cc index a70dad3..3b45e2e 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.288 2004/06/07 11:46:04 rathnor Exp $ | 25 | // $Id: Window.cc,v 1.289 2004/06/07 21:48:14 fluxgen Exp $ |
26 | 26 | ||
27 | #include "Window.hh" | 27 | #include "Window.hh" |
28 | 28 | ||
@@ -560,27 +560,13 @@ void FluxboxWindow::init() { | |||
560 | 560 | ||
561 | setState(m_current_state); | 561 | setState(m_current_state); |
562 | 562 | ||
563 | // add extra menus | ||
564 | /* addExtraMenu("Send To...", new SendToMenu(*this)); | ||
565 | addExtraMenu("Layer...", | ||
566 | new LayerMenu<FluxboxWindow>(screen().menuTheme(), | ||
567 | screen().imageControl(), | ||
568 | *screen().layerManager().getLayer(Fluxbox::instance()->getMenuLayer()), | ||
569 | this, | ||
570 | false)); | ||
571 | */ | ||
572 | // the layermenu will get deleted as an extra menu | ||
573 | // don't call setupWindow here as the addExtraMenu call should | ||
574 | |||
575 | sendConfigureNotify(); | 563 | sendConfigureNotify(); |
576 | // no focus default | 564 | // no focus default |
577 | setFocusFlag(false); | 565 | setFocusFlag(false); |
578 | 566 | ||
579 | if (m_shaped) | 567 | if (m_shaped) |
580 | shape(); | 568 | shape(); |
581 | 569 | FbTk::App::instance()->sync(false); | |
582 | FbTk::App::instance()->sync(false); | ||
583 | |||
584 | } | 570 | } |
585 | 571 | ||
586 | /// apply shape to this window | 572 | /// apply shape to this window |
@@ -2573,7 +2559,6 @@ void FluxboxWindow::motionNotifyEvent(XMotionEvent &me) { | |||
2573 | grabPointer(me.window, False, ButtonMotionMask | | 2559 | grabPointer(me.window, False, ButtonMotionMask | |
2574 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, | 2560 | ButtonReleaseMask, GrabModeAsync, GrabModeAsync, |
2575 | None, frame(). theme().moveCursor(), CurrentTime); | 2561 | None, frame(). theme().moveCursor(), CurrentTime); |
2576 | int borderw = active_button.borderWidth(); | ||
2577 | // relative position on button | 2562 | // relative position on button |
2578 | m_button_grab_x = me.x; | 2563 | m_button_grab_x = me.x; |
2579 | m_button_grab_y = me.y; | 2564 | m_button_grab_y = me.y; |