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

Make scrollbar private to wxWindow under wxQt

Browse Source 
Use QScrollbar directly instead of wxScrollbar for the window scrollbars
to ensure that wxWindow::GetChildren() doesn't return these scrollbars.

Closes https://github.com/wxWidgets/wxWidgets/pull/1124
This commit is contained in:
Graham Dawes
2019-01-08 11:48:45 +00:00
committed by Vadim Zeitlin
parent 34ecc6efc4
commit aa422c6be2
2 changed files with 97 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/wx/qt/window.h
View File

@@ -15,9 +15,8 @@ class QShortcut;
template < class T > class QList;
class QWidget;
class QScrollWindow;
class QAbstractScrollArea;
class QScrollArea;
class QScrollBar;
class QPicture;
class QPainter;
@@ -215,12 +214,11 @@ private:
void Init();
QScrollArea *m_qtContainer;
wxScrollBar *m_horzScrollBar;
wxScrollBar *m_vertScrollBar;
void QtOnScrollBarEvent( wxScrollEvent& event );
wxScrollBar *QtGetScrollBar( int orientation ) const;
wxScrollBar *QtSetScrollBar( int orientation, wxScrollBar *scrollBar=NULL );
QScrollBar *m_horzScrollBar;
QScrollBar *m_vertScrollBar;
QScrollBar *QtGetScrollBar( int orientation ) const;
QScrollBar *QtSetScrollBar( int orientation, QScrollBar *scrollBar=NULL );
bool QtSetBackgroundStyle();