From 5c892e9a01ad2a681097bbbcb053af6298049166 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Wed, 25 Mar 2009 13:41:38 +0000 Subject: [PATCH] fix incorrect application of styles (#10171) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@59850 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/auibar.h | 1 + src/aui/auibar.cpp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index 8159713989..13edfc6279 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -427,6 +427,7 @@ public: ~wxAuiToolBar(); void SetWindowStyleFlag(long style); + long GetWindowStyleFlag() const; void SetArtProvider(wxAuiToolBarArt* art); wxAuiToolBarArt* GetArtProvider() const; diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index 2d520b88f5..abad944171 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -865,6 +865,10 @@ void wxAuiToolBar::SetWindowStyleFlag(long style) SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM); } +long wxAuiToolBar::GetWindowStyleFlag() const +{ + return m_style; +} void wxAuiToolBar::SetArtProvider(wxAuiToolBarArt* art) { @@ -1339,6 +1343,8 @@ void wxAuiToolBar::SetGripperVisible(bool visible) m_gripper_visible = visible; if (visible) m_style |= wxAUI_TB_GRIPPER; + else + m_style &= ~wxAUI_TB_GRIPPER; Realize(); Refresh(false); } @@ -1354,6 +1360,8 @@ void wxAuiToolBar::SetOverflowVisible(bool visible) m_overflow_visible = visible; if (visible) m_style |= wxAUI_TB_OVERFLOW; + else + m_style &= ~wxAUI_TB_OVERFLOW; Refresh(false); }