solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Get rid of wxAuiToolBar::m_style and just use base class m_windowStyle.

Browse source 
This fixes an assert exposed by the addition of wxAuiToolBar::Create() in
r72785: as m_style was not initialized before, calling GetWindowStyle() from
wxControl::Create() returned wrong flags.

Fix this by just removing m_style completely, there doesn't seem to be any
need for it nor for overriding GetWindowStyleFlag().

See #13520.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72816 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-10-29 14:50:42 +00:00
parent b61c03cad3
commit a69b365fbb
2 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/wx/aui/auibar.h
View file

@ -459,8 +459,7 @@ public:
const wxSize& size = wxDefaultSize,
long style = 0);
void SetWindowStyleFlag(long style);
long GetWindowStyleFlag() const;
virtual void SetWindowStyleFlag(long style);
void SetArtProvider(wxAuiToolBarArt* art);
wxAuiToolBarArt* GetArtProvider() const;
@ -664,7 +663,6 @@ protected:
bool m_dragging;
bool m_gripperVisible;
bool m_overflowVisible;
long m_style;
bool RealizeHelper(wxClientDC& dc, bool horizontal);
static bool IsPaneValid(long style, const wxAuiPaneInfo& pane);