diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-09 16:40:12 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-10 08:42:17 +0200 |
| commit | c748debd8f1c6a8c0cd202013edebd74d608ada1 (patch) | |
| tree | c23fa49f1d1041407711f64667a3f6eb9e9c289c /vcl/unx/gtk | |
| parent | 9c7222c11c331ecd1562e963e78ab85be75b8e49 (diff) | |
convert WINDOWSTATE_STATE to scoped enum
Change-Id: I5448c7e46042850f18970c7613ec5a37df57bce7
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index fae99b769bd4..3a8014c41948 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -1836,7 +1836,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) if( (pState->mnMask & WindowStateMask::State) && ! ( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) && - (pState->mnState & WINDOWSTATE_STATE_MAXIMIZED) && + (pState->mnState & WindowStateState::Maximized) && (pState->mnMask & nMaxGeometryMask) == nMaxGeometryMask ) { resizeWindow( pState->mnWidth, pState->mnHeight ); @@ -1876,7 +1876,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) } if( pState->mnMask & WindowStateMask::State && ! isChild() ) { - if( pState->mnState & WINDOWSTATE_STATE_MAXIMIZED ) + if( pState->mnState & WindowStateState::Maximized ) gtk_window_maximize( GTK_WINDOW(m_pWindow) ); else gtk_window_unmaximize( GTK_WINDOW(m_pWindow) ); @@ -1888,7 +1888,7 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) * on windows with a parent (that is transient frames) since these tend * to not be represented in an icon task list. */ - if( (pState->mnState & WINDOWSTATE_STATE_MINIMIZED) + if( (pState->mnState & WindowStateState::Minimized) && ! m_pParent ) gtk_window_iconify( GTK_WINDOW(m_pWindow) ); else @@ -1899,14 +1899,14 @@ void GtkSalFrame::SetWindowState( const SalFrameState* pState ) bool GtkSalFrame::GetWindowState( SalFrameState* pState ) { - pState->mnState = WINDOWSTATE_STATE_NORMAL; + pState->mnState = WindowStateState::Normal; pState->mnMask = WindowStateMask::State; // rollup ? gtk 2.2 does not seem to support the shaded state if( (m_nState & GDK_WINDOW_STATE_ICONIFIED) ) - pState->mnState |= WINDOWSTATE_STATE_MINIMIZED; + pState->mnState |= WindowStateState::Minimized; if( m_nState & GDK_WINDOW_STATE_MAXIMIZED ) { - pState->mnState |= WINDOWSTATE_STATE_MAXIMIZED; + pState->mnState |= WindowStateState::Maximized; pState->mnX = m_aRestorePosSize.Left(); pState->mnY = m_aRestorePosSize.Top(); pState->mnWidth = m_aRestorePosSize.GetWidth(); |