diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-06-13 13:21:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-06-13 13:22:36 +0100 |
| commit | e11f90fb28487503ffda1880857036f50430ef79 (patch) | |
| tree | 09124c84f3287d1c8ad03d1d9c1b466fd4f91170 /vcl | |
| parent | 46e372a6015033fabf1b2ac1bb46dec993b25178 (diff) | |
gtk3: m_bSetFocusOnMap is only used on gtk3
Change-Id: I3cf9e13dafb59031ab8dc4e678de9d502a376d52
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 14 |
2 files changed, 3 insertions, 13 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 355910ca4f3e..8d48824a5eed 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -201,7 +201,6 @@ class GtkSalFrame : public SalFrame bool m_bDefaultSize; bool m_bSendModChangeOnRelease; bool m_bWindowIsGtkPlug; - bool m_bSetFocusOnMap; OUString m_aTitle; OUString m_sWMClass; @@ -223,6 +222,7 @@ class GtkSalFrame : public SalFrame GtkDnDTransferable* m_pFormatConversionRequest; #else GdkRegion* m_pRegion; + bool m_bSetFocusOnMap; #endif SalMenu* m_pSalMenu; diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index 35522dd8283b..640db4e7e20a 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -1061,7 +1061,6 @@ void GtkSalFrame::InitCommon() m_bInDrag = false; m_pFormatConversionRequest = nullptr; m_ePointerStyle = static_cast<PointerStyle>(0xffff); - m_bSetFocusOnMap = false; m_pSalMenu = nullptr; m_nWatcherId = 0; m_nMenuExportId = 0; @@ -1416,7 +1415,7 @@ void GtkSalFrame::SetDefaultSize() gtk_window_maximize( GTK_WINDOW(m_pWindow) ); } -void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) +void GtkSalFrame::Show( bool bVisible, bool /*bNoActivate*/ ) { if( m_pWindow ) { @@ -1430,9 +1429,6 @@ void GtkSalFrame::Show( bool bVisible, bool bNoActivate ) SetDefaultSize(); setMinMaxSize(); - if( ! bNoActivate && (m_nStyle & SalFrameStyleFlags::TOOLWINDOW) ) - m_bSetFocusOnMap = true; - gtk_widget_show( m_pWindow ); if( isFloatGrabWindow() ) @@ -2936,16 +2932,10 @@ gboolean GtkSalFrame::signalFocus( GtkWidget*, GdkEventFocus* pEvent, gpointer f return false; } -gboolean GtkSalFrame::signalMap( GtkWidget *pWidget, GdkEvent*, gpointer frame ) +gboolean GtkSalFrame::signalMap(GtkWidget *, GdkEvent*, gpointer frame) { GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - bool bSetFocus = pThis->m_bSetFocusOnMap; - pThis->m_bSetFocusOnMap = false; - - (void)pWidget; (void)bSetFocus; - //FIXME: no set input focus ... - pThis->CallCallback( SalEvent::Resize, nullptr ); pThis->TriggerPaintEvent(); |