From 9578058d4e0d08f0f08b3d76bc2cfa2effc7e3b4 Mon Sep 17 00:00:00 2001 From: Benjamin Williams Date: Wed, 3 Sep 2008 14:45:47 +0000 Subject: [PATCH] fixed a problem in the aui toolbar flags git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/aui/auibar.h | 3 ++- src/aui/auibar.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index bbf77674a3..658fc7b324 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -26,7 +26,8 @@ enum wxAuiToolBarStyle wxAUI_TB_GRIPPER = 1 << 3, wxAUI_TB_OVERFLOW = 1 << 4, wxAUI_TB_VERTICAL = 1 << 5, - wxAUI_TB_HORZ_TEXT = ((1 << 6) | wxAUI_TB_TEXT), + wxAUI_TB_HORZ_LAYOUT = 1 << 6, + wxAUI_TB_HORZ_TEXT = (wxAUI_TB_HORZ_LAYOUT | wxAUI_TB_TEXT), wxAUI_TB_DEFAULT_STYLE = 0 }; diff --git a/src/aui/auibar.cpp b/src/aui/auibar.cpp index 9fb1f57e76..49e1bf8f41 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -824,7 +824,7 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent, SetFont(*wxNORMAL_FONT); m_art->SetFlags((unsigned int)m_style); SetExtraStyle(wxWS_EX_PROCESS_IDLE); - if (style & wxAUI_TB_HORZ_TEXT) + if (style & wxAUI_TB_HORZ_LAYOUT) SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); } @@ -857,7 +857,7 @@ void wxAuiToolBar::SetWindowStyleFlag(long style) else m_overflow_visible = false; - if (style & wxAUI_TB_HORZ_TEXT) + if (style & wxAUI_TB_HORZ_LAYOUT) SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); else SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);