diff --git a/include/wx/aui/auibar.h b/include/wx/aui/auibar.h index d8fea4ec91..6ee4a4df4b 100644 --- a/include/wx/aui/auibar.h +++ b/include/wx/aui/auibar.h @@ -28,7 +28,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 42942cf4ae..cfc471e2e3 100644 --- a/src/aui/auibar.cpp +++ b/src/aui/auibar.cpp @@ -830,7 +830,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); } @@ -863,7 +863,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);