diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-23 14:10:31 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-27 05:16:59 +0000 |
| commit | 1ac18c60bb280855cfcc8d92886709cd6db35118 (patch) | |
| tree | 0f81560261212c485a7f4ab6b5844a6e1f5c7aaa /vcl/unx/gtk | |
| parent | 3f22898c157995eecf5dbd610591d378820cf992 (diff) | |
loplugin:singlevalfields in vcl(part2)
Change-Id: I4782c6f6d3d090ba0f9e29af8afdd7d88aa2d382
Reviewed-on: https://gerrit.libreoffice.org/26598
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/unx/gtk')
| -rw-r--r-- | vcl/unx/gtk/gtksalframe.cxx | 19 | ||||
| -rw-r--r-- | vcl/unx/gtk/salnativewidgets-gtk.cxx | 4 |
2 files changed, 2 insertions, 21 deletions
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx index a2918997bbe3..e0134acd1c2b 100644 --- a/vcl/unx/gtk/gtksalframe.cxx +++ b/vcl/unx/gtk/gtksalframe.cxx @@ -784,14 +784,6 @@ GtkSalFrame::~GtkSalFrame() gdk_region_destroy( m_pRegion ); } - if( m_hBackgroundPixmap ) - { - XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(), - widget_get_xid(m_pWindow), - None ); - XFreePixmap( getDisplay()->GetDisplay(), m_hBackgroundPixmap ); - } - delete m_pIMHandler; GtkWidget *pEventWidget = getMouseEventWidget(); @@ -972,7 +964,6 @@ void GtkSalFrame::InitCommon() m_nVisibility = GDK_VISIBILITY_FULLY_OBSCURED; m_bSendModChangeOnRelease = false; m_pIMHandler = nullptr; - m_hBackgroundPixmap = None; m_nExtStyle = 0; m_pRegion = nullptr; m_ePointerStyle = static_cast<PointerStyle>(0xffff); @@ -1057,7 +1048,7 @@ void GtkSalFrame::InitCommon() */ XSetWindowBackgroundPixmap( getDisplay()->GetDisplay(), widget_get_xid(m_pWindow), - m_hBackgroundPixmap ); + None ); } /* Sadly gtk_window_set_accept_focus exists only since gtk 2.4 @@ -3289,7 +3280,7 @@ void GtkSalFrame::signalStyleSet( GtkWidget*, GtkStyle* pPrevious, gpointer fram if( aWin != None ) XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), aWin, - pThis->m_hBackgroundPixmap ); + None ); } if( ! pThis->m_pParent ) { @@ -3433,12 +3424,10 @@ void GtkSalFrame::IMHandler::sendEmptyCommit() vcl::DeletionListener aDel( m_pFrame ); SalExtTextInputEvent aEmptyEv; - aEmptyEv.mnTime = 0; aEmptyEv.mpTextAttr = nullptr; aEmptyEv.maText.clear(); aEmptyEv.mnCursorPos = 0; aEmptyEv.mnCursorFlags = 0; - aEmptyEv.mbOnlyCursor = False; m_pFrame->CallCallback( SalEvent::ExtTextInput, static_cast<void*>(&aEmptyEv) ); if( ! aDel.isDeleted() ) m_pFrame->CallCallback( SalEvent::EndExtTextInput, nullptr ); @@ -3620,12 +3609,10 @@ void GtkSalFrame::IMHandler::signalIMCommit( GtkIMContext* pContext, gchar* pTex (pThis->m_aInputEvent.mpTextAttr != nullptr) || pThis->m_bPreeditJustChanged; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.mpTextAttr = nullptr; pThis->m_aInputEvent.maText = OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ); pThis->m_aInputEvent.mnCursorPos = pThis->m_aInputEvent.maText.getLength(); pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags.clear(); @@ -3709,11 +3696,9 @@ void GtkSalFrame::IMHandler::signalIMPreeditChanged( GtkIMContext*, gpointer im_ pThis->m_bPreeditJustChanged = true; bool bEndPreedit = (!pText || !*pText) && pThis->m_aInputEvent.mpTextAttr != nullptr; - pThis->m_aInputEvent.mnTime = 0; pThis->m_aInputEvent.maText = pText ? OUString( pText, strlen(pText), RTL_TEXTENCODING_UTF8 ) : OUString(); pThis->m_aInputEvent.mnCursorPos = nCursorPos; pThis->m_aInputEvent.mnCursorFlags = 0; - pThis->m_aInputEvent.mbOnlyCursor = False; pThis->m_aInputFlags = std::vector<ExtTextInputAttr>( std::max( 1, (int)pThis->m_aInputEvent.maText.getLength() ), ExtTextInputAttr::NONE ); diff --git a/vcl/unx/gtk/salnativewidgets-gtk.cxx b/vcl/unx/gtk/salnativewidgets-gtk.cxx index 8ae0d49d2f89..c6b83804ab46 100644 --- a/vcl/unx/gtk/salnativewidgets-gtk.cxx +++ b/vcl/unx/gtk/salnativewidgets-gtk.cxx @@ -630,10 +630,6 @@ void GtkSalGraphics::copyBits( const SalTwoRect& rPosAry, } } X11SalGraphics::copyBits( rPosAry, pSrcGraphics ); - if( pFrame && pFrame->getBackgroundPixmap() != None ) - XSetWindowBackgroundPixmap( GtkSalFrame::getDisplay()->GetDisplay(), - aWin, - pFrame->getBackgroundPixmap() ); } /* |