fix incorrect application of styles (#10171)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59851 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h
index 32ea482d305a3ac55c63aaac4aed579e82255b60..ab4d4b44aa5a9d9b258cbc8d5331c992076ac9d3 100644 (file)
--- a/include/wx/aui/auibar.h
+++ b/include/wx/aui/auibar.h
@@ -427,6 +427,7 @@ public:
     virtual ~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 9906eb899720104ae4887deb5e4e13f21caeda71..cdce25ffef5a2f09362f47780376d92985cd0900 100644 (file)
--- 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)
 {
@@ -1344,6 +1348,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);
 }
@@ -1359,6 +1365,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);
 }