aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-04-25 16:08:45 (GMT)
committerfluxgen <fluxgen>2003-04-25 16:08:45 (GMT)
commitac6650454b256cc6b3c50dc3fe243c0b4e265a73 (patch)
tree08018c69ab64328ac4b7d2b05fca89db0f4802b3 /src
parent8832a07533a12e404bd9ee7370388157a19bd4d5 (diff)
downloadfluxbox-ac6650454b256cc6b3c50dc3fe243c0b4e265a73.zip
fluxbox-ac6650454b256cc6b3c50dc3fe243c0b4e265a73.tar.bz2
removed setNoFocus in class Fluxbox
Diffstat (limited to 'src')
-rw-r--r--src/Toolbar.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index d3d393e..39c7f6d 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.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: Toolbar.cc,v 1.74 2003/04/25 11:19:45 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.75 2003/04/25 16:08:45 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -840,7 +840,6 @@ void Toolbar::edit() {
840 840
841 frame.workspace_label.clear(); 841 frame.workspace_label.clear();
842 Fluxbox * const fluxbox = Fluxbox::instance(); 842 Fluxbox * const fluxbox = Fluxbox::instance();
843 fluxbox->setNoFocus(true);
844 if (fluxbox->getFocusedWindow()) //disable focus on current focused window 843 if (fluxbox->getFocusedWindow()) //disable focus on current focused window
845 fluxbox->getFocusedWindow()->setFocusFlag(false); 844 fluxbox->getFocusedWindow()->setFocusFlag(false);
846 845
@@ -993,7 +992,7 @@ void Toolbar::keyPressEvent(XKeyEvent &ke) {
993 if (ks == XK_Return || ks == XK_Escape) { 992 if (ks == XK_Return || ks == XK_Escape) {
994 editing = false; 993 editing = false;
995 Fluxbox * const fluxbox = Fluxbox::instance(); 994 Fluxbox * const fluxbox = Fluxbox::instance();
996 fluxbox->setNoFocus(false); 995
997 if (fluxbox->getFocusedWindow()) { 996 if (fluxbox->getFocusedWindow()) {
998 fluxbox->getFocusedWindow()->setInputFocus(); 997 fluxbox->getFocusedWindow()->setInputFocus();
999 fluxbox->getFocusedWindow()->setFocusFlag(true); 998 fluxbox->getFocusedWindow()->setFocusFlag(true);