cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed a problem in the aui toolbar flags

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55435 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Benjamin Williams 2008-09-03 14:45:47 +00:00
parent e42f2c165f
commit 9578058d4e
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/wx/aui/auibar.h
View File

@ -26,7 +26,8 @@ enum wxAuiToolBarStyle
wxAUI_TB_GRIPPER = 1 << 3, wxAUI_TB_GRIPPER = 1 << 3,
wxAUI_TB_OVERFLOW = 1 << 4, wxAUI_TB_OVERFLOW = 1 << 4,
wxAUI_TB_VERTICAL = 1 << 5, 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 wxAUI_TB_DEFAULT_STYLE = 0
}; };

4
src/aui/auibar.cpp
View File

@ -824,7 +824,7 @@ wxAuiToolBar::wxAuiToolBar(wxWindow* parent,
SetFont(*wxNORMAL_FONT); SetFont(*wxNORMAL_FONT);
m_art->SetFlags((unsigned int)m_style); m_art->SetFlags((unsigned int)m_style);
SetExtraStyle(wxWS_EX_PROCESS_IDLE); SetExtraStyle(wxWS_EX_PROCESS_IDLE);
if (style & wxAUI_TB_HORZ_TEXT) if (style & wxAUI_TB_HORZ_LAYOUT)
SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
} }
@ -857,7 +857,7 @@ void wxAuiToolBar::SetWindowStyleFlag(long style)
else else
m_overflow_visible = false; m_overflow_visible = false;
if (style & wxAUI_TB_HORZ_TEXT) if (style & wxAUI_TB_HORZ_LAYOUT)
SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT); SetToolTextOrientation(wxAUI_TBTOOL_TEXT_RIGHT);
else else
SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM); SetToolTextOrientation(wxAUI_TBTOOL_TEXT_BOTTOM);