Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace accessor with an older version

Browse Source
This commit is contained in:
Cătălin Răceanu
2019-02-27 17:46:02 +02:00
parent 1578240b6e
commit 66f6559a58
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/qt/window.cpp
View File

@@ -1001,8 +1001,8 @@ void wxWindowQt::SetAcceleratorTable( const wxAcceleratorTable& accel )
for ( wxVector<QShortcut*>::const_iterator it = m_qtShortcuts.begin(); for ( wxVector<QShortcut*>::const_iterator it = m_qtShortcuts.begin();
it != m_qtShortcuts.end(); ++it ) it != m_qtShortcuts.end(); ++it )
{ {
QObject::connect( *it, &QShortcut::activated, m_qtShortcutHandler.get(), &wxQtShortcutHandler::activated ); QObject::connect( *it, &QShortcut::activated, m_qtShortcutHandler.data(), &wxQtShortcutHandler::activated );
QObject::connect( *it, &QShortcut::activatedAmbiguously, m_qtShortcutHandler.get(), &wxQtShortcutHandler::activated ); QObject::connect( *it, &QShortcut::activatedAmbiguously, m_qtShortcutHandler.data(), &wxQtShortcutHandler::activated );
} }
} }
#endif // wxUSE_ACCEL #endif // wxUSE_ACCEL
@@ -1168,7 +1168,7 @@ bool wxWindowQt::QtHandlePaintEvent ( QWidget *handler, QPaintEvent *event )
else else
{ {
// Data from wxClientDC, paint it // Data from wxClientDC, paint it
m_qtPicture->play( m_qtPainter.get() ); m_qtPicture->play( m_qtPainter.data() );
// Reset picture // Reset picture
m_qtPicture->setData( NULL, 0 ); m_qtPicture->setData( NULL, 0 );
handled = true; handled = true;
@@ -1549,5 +1549,5 @@ void wxWindowQt::QtSetPicture( QPicture* pict )
QPainter *wxWindowQt::QtGetPainter() QPainter *wxWindowQt::QtGetPainter()
{ {
return m_qtPainter.get(); return m_qtPainter.data();
} }