diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-16 21:30:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-01-28 10:41:46 +0000 |
| commit | b0b8b419b249860617b12bf3e7dd233ba4f71e04 (patch) | |
| tree | ac7405bd9453ce9afd968afdd40b1197a2f1b5d1 /vcl/unx/gtk/gtksalframe.cxx | |
| parent | 3aa8c1663da6315878cf0c58ef9c19d13e2f8b06 (diff) | |
remove newly unused WB_NEEDSFOCUS and fragile FLOAT_FOCUSABLE
Change-Id: Idce03318fbc01039a6c0638879785607970993c0
Reviewed-on: https://gerrit.libreoffice.org/20746
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 016730421e5e58415170b464bf9d9ca47d6c3b4e)
Diffstat (limited to 'vcl/unx/gtk/gtksalframe.cxx')
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index 2ca581c19b7d..3b6caa6b3fd6 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1201,8 +1201,7 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) m_nStyle = nStyle; GtkWindowType eWinType = ( (nStyle & SalFrameStyleFlags::FLOAT) && - ! (nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION| - SalFrameStyleFlags::FLOAT_FOCUSABLE)) + ! (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) ) ? GTK_WINDOW_POPUP : GTK_WINDOW_TOPLEVEL; @@ -1238,7 +1237,7 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) bool bDecoHandling = ! isChild() && ( ! (nStyle & SalFrameStyleFlags::FLOAT) || - (nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION|SalFrameStyleFlags::FLOAT_FOCUSABLE) ) ); + (nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) ); if( bDecoHandling ) { @@ -1260,10 +1259,6 @@ void GtkSalFrame::Init( SalFrame* pParent, SalFrameStyleFlags nStyle ) eType = GDK_WINDOW_TYPE_HINT_TOOLBAR; lcl_set_accept_focus( GTK_WINDOW(m_pWindow), false, true ); } - else if( (nStyle & SalFrameStyleFlags::FLOAT_FOCUSABLE) ) - { - eType = GDK_WINDOW_TYPE_HINT_UTILITY; - } if( (nStyle & SalFrameStyleFlags::PARTIAL_FULLSCREEN ) && getDisplay()->getWMAdaptor()->isLegacyPartialFullscreen() ) { @@ -2196,7 +2191,7 @@ void GtkSalFrame::ToTop( sal_uInt16 nFlags ) * to our window - which it of course won't since our input hint * is set to false. */ - if( (m_nStyle & (SalFrameStyleFlags::OWNERDRAWDECORATION|SalFrameStyleFlags::FLOAT_FOCUSABLE)) ) + if (m_nStyle & SalFrameStyleFlags::OWNERDRAWDECORATION) { // sad but true: this can cause an XError, we need to catch that // to do this we need to synchronize with the XServer |