From 6d63dc0dcb9fb3826d5c852cc8ab7aed77ec4ae8 Mon Sep 17 00:00:00 2001 From: cxl Date: Sun, 2 Sep 2012 14:52:34 +0000 Subject: [PATCH] *CtrlCore: Fixed popup focus issue in X11 git-svn-id: svn://ultimatepp.org/upp/trunk@5307 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Core/src.tpp/TcpSocket$en-us.tpp | 2 +- uppsrc/CtrlCore/CtrlKbd.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/uppsrc/Core/src.tpp/TcpSocket$en-us.tpp b/uppsrc/Core/src.tpp/TcpSocket$en-us.tpp index c8e8e019d..89c70e0c3 100644 --- a/uppsrc/Core/src.tpp/TcpSocket$en-us.tpp +++ b/uppsrc/Core/src.tpp/TcpSocket$en-us.tpp @@ -343,4 +343,4 @@ SSL connection.&] [s4; &] [s5;:SSLInfo`:`:cert`_serial: [_^String^ String]_[* cert`_serial]&] [s2;%% Serial number of certificate.&] -[s3; ] \ No newline at end of file +[s3; ]] \ No newline at end of file diff --git a/uppsrc/CtrlCore/CtrlKbd.cpp b/uppsrc/CtrlCore/CtrlKbd.cpp index 88ab16c9c..175223b87 100644 --- a/uppsrc/CtrlCore/CtrlKbd.cpp +++ b/uppsrc/CtrlCore/CtrlKbd.cpp @@ -236,7 +236,9 @@ bool Ctrl::SetFocus0(bool activate) if(!topwindow) topwindow = topctrl; LLOG("SetFocus -> SetWndFocus: topwindow = " << UPP::Name(topwindow) << ", focusCtrlWnd = " << UPP::Name(focusCtrlWnd)); if(!topwindow->HasWndFocus() && !topwindow->SetWndFocus()) return false;// cxl 31.1.2004 -#ifdef GUI_X11 // ugly temporary hack - popups not behaving right in MacOS +#ifdef PLATFORM_OSX11 // ugly temporary hack - popups not behaving right in MacOS + // before 2012-9-2 was #ifdef GUI_X11, but that caused issues in most linux distros (cxl) + // as parent window of popup always manages focus/keyboard for popup in X11 if(activate) // Dolik/fudadmin 2011-5-1 topctrl->SetWndForeground(); #else